- Welcome X.org 7.2 \o/.

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

8407 files changed, 24636 insertions, 19428 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index 3992649..109cbc2 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -447,6 +447,7 @@ apinger		ports/net/apinger
 apollon		ports/net-p2p/apollon
 apoolGL		ports/games/apoolGL
 apparix		ports/misc/apparix
+appres		ports/x11/appres
 appwrapper	ports/deskutils/appwrapper
 apr		ports/devel/apr
 apr-svn		ports/devel/apr-svn
@@ -761,6 +762,7 @@ bdc		ports/security/bdc
 bdelta		ports/misc/bdelta
 bdesktopclock	ports/x11-clocks/bdesktopclock
 bdfresize	ports/x11-fonts/bdfresize
+bdftopcf	ports/x11-fonts/bdftopcf
 be-aspell	ports/textproc/be-aspell
 be_agent	ports/sysutils/be_agent
 beacon		ports/net/beacon
@@ -774,9 +776,16 @@ bedic-data	ports/textproc/bedic-data
 beecrypt	ports/security/beecrypt
 beep		ports/audio/beep
 beep-media-player	ports/multimedia/beep-media-player
+beforelight	ports/x11/beforelight
 belote		ports/french/belote
 belvu		ports/biology/belvu
 berkeley-db	ports/java/berkeley-db
+beryl		ports/x11-wm/beryl
+beryl-core	ports/x11-wm/beryl-core
+beryl-manager	ports/x11-wm/beryl-manager
+beryl-plugins	ports/x11-wm/beryl-plugins
+beryl-settings	ports/x11-wm/beryl-settings
+beryl-settings-bindings	ports/x11-wm/beryl-settings-bindings
 bestfit		ports/misc/bestfit
 bf2c		ports/lang/bf2c
 bfbtester	ports/security/bfbtester
@@ -809,6 +818,7 @@ biew		ports/editors/biew
 biffer		ports/mail/biffer
 biggles		ports/math/biggles
 bigloo		ports/lang/bigloo
+bigreqsproto	ports/x11/bigreqsproto
 bigsister	ports/net-mgmt/bigsister
 bigyear		ports/deskutils/bigyear
 bihar		ports/math/bihar
@@ -848,6 +858,7 @@ bitefusion	ports/games/bitefusion
 bitflu		ports/net-p2p/bitflu
 bitlbee		ports/irc/bitlbee
 bitmap		ports/editors/bitmap
+bitmap		ports/x11/bitmap
 bitmap-emacs20	ports/editors/bitmap-emacs20
 bitmap-fonts	ports/x11-fonts/bitmap-fonts
 bitstream-vera	ports/x11-fonts/bitstream-vera
@@ -1434,7 +1445,9 @@ compaq-cc	ports/lang/compaq-cc
 compat3x	ports/misc/compat3x
 compat4x	ports/misc/compat4x
 compat5x	ports/misc/compat5x
+compiz		ports/x11-wm/compiz
 compositeext	ports/x11/compositeext
+compositeproto	ports/x11/compositeproto
 compupic	ports/graphics/compupic
 comserv		ports/comms/comserv
 concentration	ports/games/concentration
@@ -1694,6 +1707,7 @@ dailystrips	ports/deskutils/dailystrips
 daimonin-client	ports/games/daimonin-client
 dalbum		ports/www/dalbum
 damageext	ports/x11/damageext
+damageproto	ports/x11/damageproto
 danamics	ports/net/danamics
 dancer		ports/irc/dancer
 dangen		ports/games/dangen
@@ -1972,6 +1986,7 @@ dmenu		ports/x11/dmenu
 dmidecode	ports/sysutils/dmidecode
 dmitry		ports/security/dmitry
 dmjava		ports/games/dmjava
+dmxproto	ports/x11/dmxproto
 dna-qc		ports/biology/dna-qc
 dnetc		ports/misc/dnetc
 dnews		ports/news/dnews
@@ -2287,6 +2302,7 @@ edb		ports/databases/edb
 ede		ports/x11-wm/ede
 edenmath	ports/math/edenmath
 edith		ports/editors/edith
+editres		ports/x11/editres
 editss		ports/games/editss
 edje		ports/graphics/edje
 edje_viewer	ports/graphics/edje_viewer
@@ -2376,6 +2392,8 @@ emboss		ports/biology/emboss
 embryo		ports/lang/embryo
 emc2		ports/math/emc2
 emelfm2		ports/x11-fm/emelfm2
+emerald		ports/x11-wm/emerald
+emerald-themes	ports/x11-themes/emerald-themes
 emh		ports/mail/emh
 emh-emacs20	ports/mail/emh-emacs20
 emh-xemacs21-mule	ports/mail/emh-xemacs21-mule
@@ -2395,6 +2413,7 @@ en-aspell	ports/textproc/en-aspell
 enblend		ports/graphics/enblend
 enca		ports/converters/enca
 enchant		ports/textproc/enchant
+encodings	ports/x11-fonts/encodings
 endeavour	ports/x11-fm/endeavour
 endian		ports/sysutils/endian
 enet		ports/net/enet
@@ -2552,6 +2571,7 @@ eventxx		ports/devel/eventxx
 everygui	ports/deskutils/everygui
 evfs		ports/devel/evfs
 evidence	ports/x11-fm/evidence
+evieext		ports/x11/evieext
 evilfinder	ports/games/evilfinder
 evilwm		ports/x11-wm/evilwm
 evince		ports/graphics/evince
@@ -2815,6 +2835,7 @@ fistgen		ports/devel/fistgen
 fityk		ports/math/fityk
 fix-mime-charset	ports/converters/fix-mime-charset
 fixesext	ports/x11/fixesext
+fixesproto	ports/x11/fixesproto
 fixrtf		ports/textproc/fixrtf
 fkiss		ports/games/fkiss
 fl0p		ports/security/fl0p
@@ -2898,13 +2919,53 @@ fnord		ports/www/fnord
 fntsample	ports/x11-fonts/fntsample
 fo-aspell	ports/textproc/fo-aspell
 foiltex		ports/textproc/foiltex
+font-adobe-100dpi	ports/x11-fonts/font-adobe-100dpi
+font-adobe-75dpi	ports/x11-fonts/font-adobe-75dpi
+font-adobe-utopia-100dpi	ports/x11-fonts/font-adobe-utopia-100dpi
+font-adobe-utopia-75dpi	ports/x11-fonts/font-adobe-utopia-75dpi
+font-adobe-utopia-type1	ports/x11-fonts/font-adobe-utopia-type1
+font-alias	ports/x11-fonts/font-alias
+font-arabic-misc	ports/x11-fonts/font-arabic-misc
+font-bh-100dpi	ports/x11-fonts/font-bh-100dpi
+font-bh-75dpi	ports/x11-fonts/font-bh-75dpi
+font-bh-lucidatypewriter-100dpi	ports/x11-fonts/font-bh-lucidatypewriter-100dpi
+font-bh-lucidatypewriter-75dpi	ports/x11-fonts/font-bh-lucidatypewriter-75dpi
+font-bh-ttf	ports/x11-fonts/font-bh-ttf
+font-bh-type1	ports/x11-fonts/font-bh-type1
+font-bitstream-100dpi	ports/x11-fonts/font-bitstream-100dpi
+font-bitstream-75dpi	ports/x11-fonts/font-bitstream-75dpi
+font-bitstream-speedo	ports/x11-fonts/font-bitstream-speedo
+font-bitstream-type1	ports/x11-fonts/font-bitstream-type1
+font-cronyx-cyrillic	ports/x11-fonts/font-cronyx-cyrillic
+font-cursor-misc	ports/x11-fonts/font-cursor-misc
+font-daewoo-misc	ports/x11-fonts/font-daewoo-misc
+font-dec-misc	ports/x11-fonts/font-dec-misc
+font-ibm-type1	ports/x11-fonts/font-ibm-type1
+font-isas-misc	ports/x11-fonts/font-isas-misc
+font-jis-misc	ports/x11-fonts/font-jis-misc
+font-micro-misc	ports/x11-fonts/font-micro-misc
+font-misc-cyrillic	ports/x11-fonts/font-misc-cyrillic
+font-misc-ethiopic	ports/x11-fonts/font-misc-ethiopic
+font-misc-meltho	ports/x11-fonts/font-misc-meltho
+font-misc-misc	ports/x11-fonts/font-misc-misc
+font-mutt-misc	ports/x11-fonts/font-mutt-misc
+font-schumacher-misc	ports/x11-fonts/font-schumacher-misc
+font-screen-cyrillic	ports/x11-fonts/font-screen-cyrillic
+font-sony-misc	ports/x11-fonts/font-sony-misc
+font-sun-misc	ports/x11-fonts/font-sun-misc
+font-util	ports/x11-fonts/font-util
+font-winitzki-cyrillic	ports/x11-fonts/font-winitzki-cyrillic
+font-xfree86-type1	ports/x11-fonts/font-xfree86-type1
 font2svg	ports/print/font2svg
+fontcacheproto	ports/x11-fonts/fontcacheproto
 fontconfig	ports/x11-fonts/fontconfig
 fontconfig-reference	ports/x11-fonts/fontconfig-reference
 fontedit	ports/sysutils/fontedit
 fonteditfs	ports/sysutils/fonteditfs
 fontforge	ports/print/fontforge
 fonts-te	ports/x11-fonts/fonts-te
+fontsproto	ports/x11-fonts/fontsproto
+fonttosfnt	ports/x11-fonts/fonttosfnt
 foo2zjs		ports/print/foo2zjs
 foobillard	ports/games/foobillard
 foomatic-db	ports/print/foomatic-db
@@ -3095,10 +3156,12 @@ frozenbubble	ports/games/frozenbubble
 fruity		ports/net-mgmt/fruity
 fsbackup	ports/sysutils/fsbackup
 fsh		ports/security/fsh
+fslsfonts	ports/x11-fonts/fslsfonts
 fsmgenerator	ports/devel/fsmgenerator
 fspclient	ports/net/fspclient
 fspd		ports/net/fspd
 fsplib		ports/net/fsplib
+fstobdf		ports/x11/fstobdf
 fsv		ports/x11-fm/fsv
 fswatch		ports/security/fswatch
 fswiki		ports/www/fswiki
@@ -3287,6 +3350,7 @@ gcc41-withgcjawt	ports/lang/gcc41-withgcjawt
 gcc42		ports/lang/gcc42
 gcc42-withgcjawt	ports/lang/gcc42-withgcjawt
 gcc43		ports/lang/gcc43
+gccmakedep	ports/devel/gccmakedep
 gccxml		ports/devel/gccxml
 gcdmaster	ports/sysutils/gcdmaster
 gcfilms		ports/multimedia/gcfilms
@@ -3595,6 +3659,7 @@ gloox		ports/net-im/gloox
 glpi		ports/www/glpi
 glpk		ports/math/glpk
 glpng		ports/graphics/glpng
+glproto		ports/x11/glproto
 glpuzzle	ports/games/glpuzzle
 glrparser	ports/devel/glrparser
 gltk		ports/graphics/gltk
@@ -4384,6 +4449,7 @@ heimdal		ports/security/heimdal
 heirloom	ports/sysutils/heirloom
 heirloom-doctools	ports/textproc/heirloom-doctools
 heirloom-mailx	ports/mail/heirloom-mailx
+heliodor	ports/x11-wm/heliodor
 helixplayer	ports/multimedia/helixplayer
 helixplugin	ports/www/helixplugin
 hellanzb	ports/news/hellanzb
@@ -4614,6 +4680,7 @@ icbm3d		ports/games/icbm3d
 icc		ports/lang/icc
 icc7		ports/lang/icc7
 ice		ports/devel/ice
+iceauth		ports/x11/iceauth
 icebreaker	ports/games/icebreaker
 icecast		ports/audio/icecast
 icecast2	ports/audio/icecast2
@@ -4628,6 +4695,7 @@ icmpchat	ports/net-im/icmpchat
 icmpinfo	ports/net/icmpinfo
 icmpmonitor	ports/net-mgmt/icmpmonitor
 icmpquery	ports/net-mgmt/icmpquery
+ico		ports/x11/ico
 icoconvert	ports/graphics/icoconvert
 icod		ports/graphics/icod
 icon		ports/lang/icon
@@ -4707,8 +4775,8 @@ im-ja		ports/japanese/im-ja
 imageindex	ports/graphics/imageindex
 imagesort	ports/graphics/imagesort
 imageviewer	ports/graphics/imageviewer
+imake		ports/devel/imake
 imake-4		ports/devel/imake-4
-imake-6		ports/devel/imake-6
 imap-uw		ports/mail/imap-uw
 imapfilter	ports/mail/imapfilter
 imapproxy	ports/net/imapproxy
@@ -4750,6 +4818,7 @@ inn-current	ports/news/inn-current
 innerspace	ports/x11/innerspace
 innotop		ports/databases/innotop
 inplace		ports/misc/inplace
+inputproto	ports/x11/inputproto
 inspircd	ports/irc/inspircd
 installwatch	ports/sysutils/installwatch
 instant-server	ports/misc/instant-server
@@ -5629,6 +5698,7 @@ kbiff		ports/mail/kbiff
 kbilliards	ports/games/kbilliards
 kbirthday	ports/deskutils/kbirthday
 kblticker	ports/deskutils/kblticker
+kbproto		ports/x11/kbproto
 kbtv		ports/multimedia/kbtv
 kcachegrind	ports/devel/kcachegrind
 kcd		ports/misc/kcd
@@ -6159,8 +6229,10 @@ lhs2TeX		ports/devel/lhs2TeX
 lianliankan	ports/games/lianliankan
 lib3ds		ports/graphics/lib3ds
 lib765		ports/emulators/lib765
-libGL		ports/x11/libGL
+libFS		ports/x11-fonts/libFS
+libGL		ports/graphics/libGL
 libGLU		ports/graphics/libGLU
+libGLw		ports/graphics/libGLw
 libICE		ports/x11/libICE
 libIDL		ports/devel/libIDL
 libPropList	ports/devel/libPropList
@@ -6169,28 +6241,39 @@ libSM		ports/x11/libSM
 libU77		ports/devel/libU77
 libX11		ports/x11/libX11
 libXGP		ports/devel/libXGP
+libXScrnSaver	ports/x11/libXScrnSaver
+libXTrap	ports/x11/libXTrap
 libXau		ports/x11/libXau
 libXaw		ports/x11-toolkits/libXaw
 libXcomposite	ports/x11/libXcomposite
 libXcursor	ports/x11/libXcursor
 libXdamage	ports/x11/libXdamage
 libXdmcp	ports/x11/libXdmcp
+libXevie	ports/x11/libXevie
 libXext		ports/x11/libXext
 libXfixes	ports/x11/libXfixes
-libXfont	ports/x11/libXfont
+libXfont	ports/x11-fonts/libXfont
+libXfontcache	ports/x11-fonts/libXfontcache
 libXft		ports/x11-fonts/libXft
 libXi		ports/x11/libXi
 libXinerama	ports/x11/libXinerama
 libXmu		ports/x11-toolkits/libXmu
 libXp		ports/x11/libXp
 libXpm		ports/x11/libXpm
+libXprintAppUtil	ports/x11/libXprintAppUtil
+libXprintUtil	ports/x11/libXprintUtil
 libXrandr	ports/x11/libXrandr
 libXrender	ports/x11/libXrender
 libXres		ports/x11/libXres
 libXt		ports/x11-toolkits/libXt
 libXtrans	ports/x11/libXtrans
+libXtst		ports/x11/libXtst
 libXv		ports/x11/libXv
+libXvMC		ports/x11/libXvMC
 libXxf86	ports/x11/libXxf86
+libXxf86dga	ports/x11/libXxf86dga
+libXxf86misc	ports/x11/libXxf86misc
+libXxf86vm	ports/x11/libXxf86vm
 libYGP		ports/devel/libYGP
 liba52		ports/audio/liba52
 liba52-devel	ports/audio/liba52-devel
@@ -6263,6 +6346,7 @@ libdivxdecore-devel	ports/multimedia/libdivxdecore-devel
 libdivxencore	ports/multimedia/libdivxencore
 libdjbdns	ports/dns/libdjbdns
 libdlmalloc	ports/devel/libdlmalloc
+libdmx		ports/x11/libdmx
 libdnd		ports/x11/libdnd
 libdnet		ports/net/libdnet
 libdnsres	ports/devel/libdnsres
@@ -6301,6 +6385,7 @@ libfame		ports/multimedia/libfame
 libfec		ports/comms/libfec
 libffi		ports/devel/libffi
 libflash	ports/graphics/libflash
+libfontenc	ports/x11-fonts/libfontenc
 libfov		ports/games/libfov
 libfpx		ports/graphics/libfpx
 libfreenet	ports/net-p2p/libfreenet
@@ -6476,6 +6561,7 @@ libogg		ports/audio/libogg
 liboggz		ports/audio/liboggz
 liboil		ports/devel/liboil
 libol		ports/devel/libol
+liboldX		ports/x11/liboldX
 libole2		ports/devel/libole2
 liboobs		ports/devel/liboobs
 liboop		ports/devel/liboop
@@ -6650,6 +6736,7 @@ libxfce4mcs	ports/x11/libxfce4mcs
 libxfce4util	ports/x11/libxfce4util
 libxine		ports/multimedia/libxine
 libxkbfile	ports/x11/libxkbfile
+libxkbui	ports/x11/libxkbui
 libxklavier	ports/x11/libxklavier
 libxml		ports/textproc/libxml
 libxml++	ports/textproc/libxml++
@@ -6875,6 +6962,7 @@ lirc		ports/comms/lirc
 lire		ports/sysutils/lire
 listener	ports/audio/listener
 listmanager	ports/mail/listmanager
+listres		ports/x11/listres
 liteamp		ports/audio/liteamp
 liveMedia	ports/net/liveMedia
 livecd		ports/sysutils/livecd
@@ -6976,6 +7064,7 @@ lua50-posix	ports/devel/lua50-posix
 lua50-pty	ports/devel/lua50-pty
 luasocket	ports/net/luasocket
 lucidlife	ports/games/lucidlife
+luit		ports/x11/luit
 luma		ports/sysutils/luma
 luna		ports/astro/luna
 luola		ports/games/luola
@@ -7342,7 +7431,10 @@ mkbold		ports/x11-fonts/mkbold
 mkbold-mkitalic	ports/x11-fonts/mkbold-mkitalic
 mkcatalog	ports/textproc/mkcatalog
 mkcmd		ports/devel/mkcmd
+mkcomposecache	ports/x11/mkcomposecache
 mkfile		ports/sysutils/mkfile
+mkfontdir	ports/x11-fonts/mkfontdir
+mkfontscale	ports/x11-fonts/mkfontscale
 mkhexgrid	ports/games/mkhexgrid
 mkitalic	ports/x11-fonts/mkitalic
 mkmf		ports/devel/mkmf
@@ -8214,6 +8306,7 @@ ocaml-yaxpo	ports/textproc/ocaml-yaxpo
 ocaml-zip	ports/archivers/ocaml-zip
 ocamlduce	ports/lang/ocamlduce
 ocamlweb	ports/devel/ocamlweb
+oclock		ports/x11/oclock
 ocp		ports/audio/ocp
 ocrad		ports/graphics/ocrad
 ocsigen		ports/www/ocsigen
@@ -12401,6 +12494,7 @@ primer3		ports/biology/primer3
 print-n-times	ports/textproc/print-n-times
 print_pmw	ports/print/pmw
 printext	ports/x11/printext
+printproto	ports/x11/printproto
 prips		ports/sysutils/prips
 privman		ports/devel/privman
 privoxy		ports/www/privoxy
@@ -13347,6 +13441,7 @@ rancid		ports/net-mgmt/rancid
 rancid-devel		ports/net-mgmt/rancid-devel
 rand		ports/textproc/rand
 randrext	ports/x11/randrext
+randrproto	ports/x11/randrproto
 raop_play	ports/audio/raop_play
 rapidsvn	ports/devel/rapidsvn
 raproxy		ports/audio/raproxy
@@ -13407,6 +13502,7 @@ recmpeg		ports/multimedia/recmpeg
 recode		ports/converters/recode
 recoll		ports/deskutils/recoll
 recombine	ports/biology/recombine
+recordproto	ports/x11/recordproto
 recoverdm	ports/sysutils/recoverdm
 recoverjpeg	ports/graphics/recoverjpeg
 recvnet		ports/net/recvnet
@@ -13442,6 +13538,7 @@ renattach	ports/mail/renattach
 rendercheck	ports/x11/rendercheck
 renderext	ports/x11/renderext
 renderpark	ports/graphics/renderpark
+renderproto	ports/x11/renderproto
 reoback		ports/sysutils/reoback
 rep-gtk		ports/x11-toolkits/rep-gtk
 rep-gtk2	ports/x11-toolkits/rep-gtk2
@@ -13454,6 +13551,7 @@ resid		ports/audio/resid
 resin2		ports/www/resin2
 resin3		ports/www/resin3
 resourceext	ports/x11/resourceext
+resourceproto	ports/x11/resourceproto
 resume		ports/textproc/resume
 resume-extensions	ports/textproc/resume-extensions
 retawq		ports/www/retawq
@@ -13472,6 +13570,7 @@ rfcdiff		ports/textproc/rfcdiff
 rfksay		ports/games/rfksay
 rfstool		ports/sysutils/rfstool
 rftp		ports/mail/rftp
+rgb		ports/x11/rgb
 rgbpaint	ports/graphics/rgbpaint
 rhtvision	ports/devel/rhtvision
 rhythmbox	ports/audio/rhythmbox
@@ -13570,6 +13669,7 @@ rsnapshot	ports/sysutils/rsnapshot
 rssh		ports/shells/rssh
 rssowl		ports/www/rssowl
 rst.el		ports/textproc/rst.el
+rstart		ports/x11/rstart
 rsync		ports/net/rsync
 rsyncmanager	ports/sysutils/rsyncmanager
 rsynth		ports/audio/rsynth
@@ -14089,6 +14189,8 @@ scriba		ports/lang/scriba
 scribes		ports/editors/scribes
 scribus		ports/print/scribus
 script4rss	ports/www/script4rss
+scripts		ports/x11/scripts
+scrnsaverproto	ports/x11/scrnsaverproto
 scrobbler	ports/audio/scrobbler
 scrollkeeper	ports/textproc/scrollkeeper
 scrollz		ports/irc/scrollz
@@ -14187,10 +14289,12 @@ service-discovery-applet	ports/net/service-discovery-applet
 servlet-api	ports/www/servlet-api
 ses		ports/math/ses
 session2	ports/www/session2
+sessreg		ports/x11/sessreg
 setcdboot	ports/sysutils/setcdboot
 setedit		ports/editors/setedit
 setquota	ports/sysutils/setquota
 settitle	ports/x11/settitle
+setxkbmap	ports/x11/setxkbmap
 sex		ports/games/sex
 seyon		ports/comms/seyon
 sfbol		ports/games/sfbol
@@ -14248,6 +14352,7 @@ shorten		ports/audio/shorten
 shout		ports/audio/shout
 shoutcast	ports/audio/shoutcast
 show		ports/graphics/show
+showfont	ports/x11-fonts/showfont
 showgrammar	ports/devel/showgrammar
 showimg		ports/graphics/showimg
 showkey		ports/converters/showkey
@@ -14418,6 +14523,7 @@ smm++		ports/net/smm++
 smokeping	ports/net/smokeping
 smpeg		ports/multimedia/smpeg
 smpeg-xmms	ports/multimedia/smpeg-xmms
+smproxy		ports/x11/smproxy
 sms_client	ports/comms/sms_client
 smssend		ports/misc/smssend
 smstools	ports/comms/smstools
@@ -15287,6 +15393,7 @@ transmission	ports/net-p2p/transmission
 transmission-gtk2	ports/net-p2p/transmission-gtk2
 transproxy	ports/www/transproxy
 transset-df	ports/x11-wm/transset-df
+trapproto	ports/x11/trapproto
 trayer		ports/x11/trayer
 tree		ports/sysutils/tree
 tree-widget	ports/editors/tree-widget
@@ -15386,6 +15493,7 @@ twiki		ports/www/twiki
 twin		ports/emulators/twin
 twinkle		ports/net/twinkle
 twitch		ports/games/twitch
+twm		ports/x11-wm/twm
 twoftpd		ports/ftp/twoftpd
 twolame		ports/audio/twolame
 twpsk		ports/comms/twpsk
@@ -15638,12 +15746,14 @@ vid		ports/graphics/vid
 vida		ports/security/vida
 vidalia		ports/net-mgmt/vidalia
 videogen	ports/sysutils/videogen
+videoproto	ports/x11/videoproto
 videotext	ports/misc/videotext
 view3ds		ports/graphics/view3ds
 viewfax		ports/comms/viewfax
 viewglob	ports/shells/viewglob
 viewkit		ports/x11-toolkits/viewkit
 viewklass	ports/x11-toolkits/viewklass
+viewres		ports/x11/viewres
 viewvc		ports/devel/viewvc
 vifm		ports/misc/vifm
 vigor		ports/editors/vigor
@@ -16084,6 +16194,7 @@ x-files		ports/x11-fm/x-files
 x11-chameleon	ports/x11/chameleon
 x11amp		ports/audio/x11amp
 x11iraf		ports/science/x11iraf
+x11perf		ports/x11/x11perf
 x11vnc		ports/net/x11vnc
 x264		ports/multimedia/x264
 x2vnc		ports/x11-servers/x2vnc
@@ -16114,6 +16225,7 @@ xaric		ports/irc/xaric
 xasteroids	ports/games/xasteroids
 xastir		ports/comms/xastir
 xataxx		ports/games/xataxx
+xauth		ports/x11/xauth
 xautolock	ports/x11/xautolock
 xautomation	ports/x11/xautomation
 xawtv		ports/multimedia/xawtv
@@ -16128,10 +16240,12 @@ xbatt		ports/sysutils/xbatt
 xbattbar	ports/sysutils/xbattbar
 xbattle		ports/games/xbattle
 xbelld		ports/x11/xbelld
+xbiff		ports/x11/xbiff
 xbill		ports/games/xbill
 xbindkeys	ports/x11/xbindkeys
 xbindkeys_config	ports/x11/xbindkeys_config
 xbiso		ports/misc/xbiso
+xbitmaps	ports/x11/xbitmaps
 xbl		ports/games/xbl
 xblackjack	ports/games/xblackjack
 xblast		ports/games/xblast
@@ -16152,6 +16266,7 @@ xbuffy		ports/mail/xbuffy
 xc-mail		ports/mail/xc-mail
 xca		ports/security/xca
 xcache		ports/www/xcache
+xcalc		ports/x11/xcalc
 xcalendar	ports/deskutils/xcalendar
 xcalib		ports/x11/xcalib
 xcb		ports/x11/xcb
@@ -16173,7 +16288,11 @@ xcircuit	ports/cad/xcircuit
 xclasses	ports/x11-toolkits/xclasses
 xclick		ports/x11/xclick
 xclip		ports/x11/xclip
+xclipboard	ports/x11/xclipboard
+xclock		ports/x11/xclock
 xcmd		ports/x11/xcmd
+xcmiscproto	ports/x11/xcmiscproto
+xcmsdb		ports/x11/xcmsdb
 xco		ports/x11/xco
 xcogitate	ports/games/xcogitate
 xcoloredit	ports/x11/xcoloredit
@@ -16181,15 +16300,19 @@ xcolors		ports/x11/xcolors
 xcolorsel	ports/x11/xcolorsel
 xcompmgr	ports/x11-wm/xcompmgr
 xconq		ports/games/xconq
+xconsole	ports/x11/xconsole
 xcoral		ports/editors/xcoral
 xcpustate	ports/sysutils/xcpustate
 xcruise		ports/x11-fm/xcruise
 xcubes		ports/games/xcubes
 xcurs		ports/x11/xcurs
+xcursor-themes	ports/x11-themes/xcursor-themes
+xcursorgen	ports/x11/xcursorgen
 xcut		ports/x11/xcut
 xd		ports/misc/xd
 xd3d		ports/graphics/xd3d
 xdaliclock	ports/x11-clocks/xdaliclock
+xdbedizzy	ports/x11/xdbedizzy
 xdd		ports/sysutils/xdd
 xdeblock	ports/games/xdeblock
 xdelta		ports/misc/xdelta
@@ -16203,10 +16326,14 @@ xdialog		ports/x11/xdialog
 xdigger		ports/games/xdigger
 xdino		ports/games/xdino
 xdiskusage	ports/x11-fm/xdiskusage
+xditview	ports/x11/xditview
 xdl		ports/graphics/xdl
+xdm		ports/x11/xdm
 xdms		ports/archivers/xdms
 xdoclet		ports/java/xdoclet
+xdpyinfo	ports/x11/xdpyinfo
 xdrawchem	ports/biology/xdrawchem
+xdriinfo	ports/x11/xdriinfo
 xds		ports/lang/xds
 xds-c		ports/lang/xds-c
 xdtm		ports/x11/xdtm
@@ -16218,6 +16345,7 @@ xdx		ports/comms/xdx
 xearth		ports/astro/xearth
 xeartk		ports/astro/xeartk
 xed		ports/editors/xed
+xedit		ports/x11/xedit
 xemacs		ports/editors/xemacs
 xemacs-devel	ports/editors/xemacs-devel
 xemacs-devel-mule	ports/editors/xemacs-devel-mule
@@ -16235,10 +16363,78 @@ xephem		ports/astro/xephem
 xerces-c	ports/textproc/xerces-c
 xerces-c2	ports/textproc/xerces-c2
 xerces-j	ports/textproc/xerces-j
+xev		ports/x11/xev
 xevil		ports/games/xevil
 xextensions	ports/x11/xextensions
+xextproto	ports/x11/xextproto
+xeyes		ports/x11/xeyes
 xeyesplus	ports/games/xeyesplus
+xf86-input-acecad	ports/x11-drivers/xf86-input-acecad
+xf86-input-calcomp	ports/x11-drivers/xf86-input-calcomp
+xf86-input-citron	ports/x11-drivers/xf86-input-citron
+xf86-input-digitaledge	ports/x11-drivers/xf86-input-digitaledge
+xf86-input-dmc	ports/x11-drivers/xf86-input-dmc
+xf86-input-dynapro	ports/x11-drivers/xf86-input-dynapro
+xf86-input-elo2300	ports/x11-drivers/xf86-input-elo2300
+xf86-input-elographics	ports/x11-drivers/xf86-input-elographics
+xf86-input-fpit	ports/x11-drivers/xf86-input-fpit
+xf86-input-hyperpen	ports/x11-drivers/xf86-input-hyperpen
+xf86-input-jamstudio	ports/x11-drivers/xf86-input-jamstudio
+xf86-input-joystick	ports/x11-drivers/xf86-input-joystick
+xf86-input-keyboard	ports/x11-drivers/xf86-input-keyboard
+xf86-input-magellan	ports/x11-drivers/xf86-input-magellan
+xf86-input-magictouch	ports/x11-drivers/xf86-input-magictouch
+xf86-input-microtouch	ports/x11-drivers/xf86-input-microtouch
+xf86-input-mouse	ports/x11-drivers/xf86-input-mouse
+xf86-input-mutouch	ports/x11-drivers/xf86-input-mutouch
+xf86-input-palmax	ports/x11-drivers/xf86-input-palmax
+xf86-input-penmount	ports/x11-drivers/xf86-input-penmount
+xf86-input-spaceorb	ports/x11-drivers/xf86-input-spaceorb
+xf86-input-summa	ports/x11-drivers/xf86-input-summa
+xf86-input-tek4957	ports/x11-drivers/xf86-input-tek4957
+xf86-input-void	ports/x11-drivers/xf86-input-void
+xf86-video-apm	ports/x11-drivers/xf86-video-apm
+xf86-video-ark	ports/x11-drivers/xf86-video-ark
+xf86-video-ati	ports/x11-drivers/xf86-video-ati
+xf86-video-chips	ports/x11-drivers/xf86-video-chips
+xf86-video-cirrus	ports/x11-drivers/xf86-video-cirrus
+xf86-video-cyrix	ports/x11-drivers/xf86-video-cyrix
+xf86-video-dummy	ports/x11-drivers/xf86-video-dummy
+xf86-video-fbdev	ports/x11-drivers/xf86-video-fbdev
+xf86-video-glint	ports/x11-drivers/xf86-video-glint
+xf86-video-i128	ports/x11-drivers/xf86-video-i128
+xf86-video-i740	ports/x11-drivers/xf86-video-i740
+xf86-video-i810	ports/x11-drivers/xf86-video-i810
+xf86-video-imstt	ports/x11-drivers/xf86-video-imstt
+xf86-video-mga	ports/x11-drivers/xf86-video-mga
+xf86-video-neomagic	ports/x11-drivers/xf86-video-neomagic
+xf86-video-newport	ports/x11-drivers/xf86-video-newport
+xf86-video-nsc	ports/x11-drivers/xf86-video-nsc
+xf86-video-nv	ports/x11-drivers/xf86-video-nv
+xf86-video-rendition	ports/x11-drivers/xf86-video-rendition
+xf86-video-s3	ports/x11-drivers/xf86-video-s3
+xf86-video-s3virge	ports/x11-drivers/xf86-video-s3virge
+xf86-video-savage	ports/x11-drivers/xf86-video-savage
+xf86-video-siliconmotion	ports/x11-drivers/xf86-video-siliconmotion
+xf86-video-sis	ports/x11-drivers/xf86-video-sis
+xf86-video-sunffb	ports/x11-drivers/xf86-video-sunffb
+xf86-video-tdfx	ports/x11-drivers/xf86-video-tdfx
+xf86-video-tga	ports/x11-drivers/xf86-video-tga
+xf86-video-trident	ports/x11-drivers/xf86-video-trident
+xf86-video-tseng	ports/x11-drivers/xf86-video-tseng
+xf86-video-vesa	ports/x11-drivers/xf86-video-vesa
+xf86-video-vga	ports/x11-drivers/xf86-video-vga
+xf86-video-via	ports/x11-drivers/xf86-video-via
+xf86-video-vmware	ports/x11-drivers/xf86-video-vmware
+xf86-video-voodoo	ports/x11-drivers/xf86-video-voodoo
+xf86bigfontproto	ports/x11-fonts/xf86bigfontproto
+xf86dga		ports/x11/xf86dga
+xf86dgaproto	ports/x11/xf86dgaproto
+xf86driproto	ports/x11/xf86driproto
 xf86ext		ports/x11/xf86ext
+xf86miscproto	ports/x11/xf86miscproto
+xf86rushproto	ports/x11/xf86rushproto
+xf86vidmodeproto	ports/x11/xf86vidmodeproto
 xface.el	ports/graphics/xface.el
 xfaces		ports/mail/xfaces
 xfc		ports/devel/xfc
@@ -16285,16 +16481,19 @@ xfce4-xfapplet-plugin	ports/x11/xfce4-xfapplet-plugin
 xfce4-xkb-plugin	ports/deskutils/xfce4-xkb-plugin
 xfce4-xmms-controller-plugin	ports/multimedia/xfce4-xmms-controller-plugin
 xfce4-xmms-plugin	ports/multimedia/xfce4-xmms-plugin
+xfd		ports/x11/xfd
 xfe		ports/x11-fm/xfe
 xfed		ports/x11-fonts/xfed
 xferstats	ports/net/xferstats
 xfig		ports/graphics/xfig
 xfig-devel	ports/graphics/xfig-devel
+xfindproxy	ports/x11/xfindproxy
 xfireworks	ports/games/xfireworks
 xfishtank	ports/x11/xfishtank
 xflame		ports/games/xflame
 xfm		ports/x11-fm/xfm
 xfmail		ports/mail/xfmail
+xfontsel	ports/x11-fonts/xfontsel
 xforms		ports/x11-toolkits/xforms
 xforms-i18n	ports/x11-toolkits/xforms-i18n
 xfpovray	ports/graphics/xfpovray
@@ -16302,13 +16501,18 @@ xfractint	ports/graphics/xfractint
 xfree86-dri	ports/graphics/xfree86-dri
 xfree86_xkb_xml	ports/x11/xfree86_xkb_xml
 xfrisk		ports/games/xfrisk
+xfs		ports/x11-fonts/xfs
+xfsinfo		ports/x11-fonts/xfsinfo
 xfsm		ports/sysutils/xfsm
 xfsprogs	ports/sysutils/xfsprogs
+xfwp		ports/x11/xfwp
 xg		ports/x11-toolkits/xg
 xgalaga		ports/games/xgalaga
 xgame		ports/games/xgame
+xgamma		ports/x11/xgamma
 xgammon		ports/games/xgammon
 xgas		ports/misc/xgas
+xgc		ports/x11/xgc
 xgfe		ports/math/xgfe
 xglk		ports/games/xglk
 xglobe		ports/astro/xglobe
@@ -16324,6 +16528,7 @@ xhexagons	ports/games/xhexagons
 xhime		ports/games/xhime
 xhippo		ports/audio/xhippo
 xhomer		ports/emulators/xhomer
+xhost		ports/x11/xhost
 xhtml		ports/textproc/xhtml
 xhtml-11	ports/textproc/xhtml-11
 xhtml-basic	ports/textproc/xhtml-basic
@@ -16335,8 +16540,10 @@ xin		ports/sysutils/xin
 xincluder	ports/textproc/xincluder
 xine		ports/multimedia/xine
 xine_artsplugin	ports/multimedia/xine_artsplugin
+xineramaproto	ports/x11/xineramaproto
 xinetd		ports/security/xinetd
 xinfocom	ports/games/xinfocom
+xinit		ports/x11/xinit
 xinput		ports/x11/xinput
 xinvaders	ports/games/xinvaders
 xinvaders3d	ports/games/xinvaders3d
@@ -16351,10 +16558,16 @@ xjewel		ports/games/xjewel
 xjig		ports/games/xjig
 xjump		ports/games/xjump
 xjumpx		ports/games/xjumpx
+xkbcomp		ports/x11/xkbcomp
 xkbctrl		ports/x11/xkbctrl
+xkbevd		ports/x11/xkbevd
+xkbprint	ports/x11/xkbprint
 xkbset		ports/x11/xkbset
+xkbutils	ports/x11/xkbutils
+xkeyboard-config	ports/x11/xkeyboard-config
 xkeycaps	ports/x11/xkeycaps
 xkeywrap	ports/x11/xkeywrap
+xkill		ports/x11/xkill
 xkobo		ports/games/xkobo
 xkoules		ports/games/xkoules
 xlaby		ports/games/xlaby
@@ -16367,18 +16580,24 @@ xlibs		ports/x11/xlibs
 xlife		ports/games/xlife
 xlines		ports/games/xlines
 xlispstat	ports/math/xlispstat
+xload		ports/x11/xload
 xloadface	ports/sysutils/xloadface
 xloadimage	ports/x11/xloadimage
 xlockmore	ports/x11/xlockmore
 xlog		ports/comms/xlog
 xlogmaster	ports/sysutils/xlogmaster
+xlogo		ports/x11/xlogo
 xlogout		ports/x11/xlogout
 xloops-ginac	ports/science/xloops-ginac
 xlreader	ports/textproc/xlreader
 xls2xml		ports/textproc/xls2xml
+xlsatoms	ports/x11/xlsatoms
+xlsclients	ports/x11/xlsclients
+xlsfonts	ports/x11-fonts/xlsfonts
 xlslib		ports/devel/xlslib
 xlupe		ports/x11/xlupe
 xmaddressbook	ports/deskutils/xmaddressbook
+xmag		ports/x11/xmag
 xmagv		ports/graphics/xmagv
 xmahjongg	ports/games/xmahjongg
 xmail		ports/mail/xmail
@@ -16388,6 +16607,7 @@ xmake		ports/devel/xmake
 xmakemol	ports/science/xmakemol
 xmame		ports/emulators/xmame
 xmamegui	ports/emulators/xmamegui
+xman		ports/x11/xman
 xmandel		ports/graphics/xmandel
 xmangekyou	ports/x11/xmangekyou
 xmascot		ports/x11/xmascot
@@ -16403,7 +16623,9 @@ xmds		ports/science/xmds
 xmedcon		ports/graphics/xmedcon
 xmemory		ports/games/xmemory
 xmess		ports/emulators/xmess
+xmessage	ports/x11/xmessage
 xmfract		ports/graphics/xmfract
+xmh		ports/x11/xmh
 xmhtml		ports/x11-toolkits/xmhtml
 xmill		ports/archivers/xmill
 xmille		ports/games/xmille
@@ -16528,10 +16750,12 @@ xmms-xymms	ports/audio/xmms-xymms
 xmms2		ports/audio/xmms2
 xmms2-scrobbler	ports/audio/xmms2-scrobbler
 xmmsctrl	ports/audio/xmmsctrl
+xmodmap		ports/x11/xmodmap
 xmold		ports/x11/xmold
 xmolwt		ports/biology/xmolwt
 xmon		ports/x11/xmon
 xmoontool	ports/astro/xmoontool
+xmore		ports/x11/xmore
 xmorph		ports/graphics/xmorph
 xmotd		ports/x11/xmotd
 xmoto		ports/games/xmoto
@@ -16563,22 +16787,24 @@ xom		ports/textproc/xom
 xonix		ports/games/xonix
 xopps		ports/deskutils/xopps
 xorg		ports/x11/xorg
-xorg-clients	ports/x11/xorg-clients
+xorg-apps	ports/x11/xorg-apps
+xorg-cf-files	ports/x11/xorg-cf-files
 xorg-dmx	ports/x11-servers/xorg-dmx
-xorg-documents	ports/x11/xorg-documents
+xorg-docs	ports/x11/xorg-docs
+xorg-drivers	ports/x11-drivers/xorg-drivers
 xorg-edit	ports/x11/xorg-edit
+xorg-fonts	ports/x11-fonts/xorg-fonts
 xorg-fonts-100dpi	ports/x11-fonts/xorg-fonts-100dpi
 xorg-fonts-75dpi	ports/x11-fonts/xorg-fonts-75dpi
 xorg-fonts-cyrillic	ports/x11-fonts/xorg-fonts-cyrillic
-xorg-fonts-encodings	ports/x11-fonts/xorg-fonts-encodings
 xorg-fonts-miscbitmaps	ports/x11-fonts/xorg-fonts-miscbitmaps
 xorg-fonts-truetype	ports/x11-fonts/xorg-fonts-truetype
 xorg-fonts-type1	ports/x11-fonts/xorg-fonts-type1
-xorg-fontserver	ports/x11-servers/xorg-fontserver
 xorg-libraries	ports/x11/xorg-libraries
-xorg-manpages	ports/x11/xorg-manpages
+xorg-macros	ports/devel/xorg-macros
 xorg-nestserver	ports/x11-servers/xorg-nestserver
 xorg-printserver	ports/x11-servers/xorg-printserver
+xorg-protos	ports/x11/xorg-protos
 xorg-server	ports/x11-servers/xorg-server
 xorg-server-snap	ports/x11-servers/xorg-server-snap
 xorg-vfbserver	ports/x11-servers/xorg-vfbserver
@@ -16601,6 +16827,7 @@ xpcd		ports/graphics/xpcd
 xpdf		ports/graphics/xpdf
 xpenguins	ports/games/xpenguins
 xperfmon	ports/sysutils/xperfmon
+xphelloworld	ports/x11/xphelloworld
 xphoon		ports/astro/xphoon
 xphotohunter	ports/games/xphotohunter
 xpi-adblock	ports/www/xpi-adblock
@@ -16679,6 +16906,7 @@ xpk		ports/archivers/xpk
 xplanet		ports/astro/xplanet
 xplore		ports/x11-fm/xplore
 xplot		ports/math/xplot
+xplsprinters	ports/x11/xplsprinters
 xpn		ports/news/xpn
 xpns		ports/misc/xpns
 xpostit		ports/deskutils/xpostit
@@ -16686,9 +16914,13 @@ xpostitPlus	ports/deskutils/xpostitPlus
 xpp		ports/print/xpp
 xpp3		ports/textproc/xpp3
 xppaut		ports/math/xppaut
+xpr		ports/x11/xpr
+xprehashprinterlist	ports/x11/xprehashprinterlist
 xprobe		ports/net/xprobe
 xprompt		ports/x11/xprompt
+xprop		ports/x11/xprop
 xproto		ports/x11/xproto
+xproxymanagementprotocol	ports/x11/xproxymanagementprotocol
 xpuyopuyo	ports/games/xpuyopuyo
 xpuzzletama	ports/games/xpuzzletama
 xpvm		ports/net/xpvm
@@ -16699,8 +16931,11 @@ xquarto		ports/games/xquarto
 xquote		ports/finance/xquote
 xracer		ports/games/xracer
 xrally		ports/games/xrally
+xrandr		ports/x11/xrandr
+xrdb		ports/x11/xrdb
 xrdesktop	ports/net/xrdesktop
 xrdp		ports/net/xrdp
+xrefresh	ports/x11/xrefresh
 xrestop		ports/x11/xrestop
 xrick		ports/games/xrick
 xripple		ports/games/xripple
@@ -16718,6 +16953,7 @@ xrot		ports/games/xrot
 xrsh		ports/x11/xrsh
 xrsi		ports/x11/xrsi
 xrubik		ports/games/xrubik
+xrx		ports/x11/xrx
 xsane		ports/graphics/xsane
 xsb		ports/lang/xsb
 xsc		ports/games/xsc
@@ -16731,6 +16967,10 @@ xscreensaver-gnome-hacks	ports/x11/xscreensaver-gnome-hacks
 xscreensaver-kde	ports/x11/xscreensaver-kde
 xscreensaver.app	ports/x11/xscreensaver.app
 xsel		ports/x11/xsel
+xset		ports/x11/xset
+xsetmode	ports/x11/xsetmode
+xsetpointer	ports/x11/xsetpointer
+xsetroot	ports/x11/xsetroot
 xshisen		ports/games/xshisen
 xshogi		ports/games/xshogi
 xshttpd		ports/www/xshttpd
@@ -16742,6 +16982,7 @@ xskewb		ports/games/xskewb
 xskyroot	ports/x11/xskyroot
 xslide.el	ports/textproc/xslide.el
 xslint		ports/textproc/xslint
+xsm		ports/x11/xsm
 xsmbrowser	ports/net/xsmbrowser
 xsnow		ports/x11/xsnow
 xsokoban	ports/games/xsokoban
@@ -16752,6 +16993,7 @@ xspread		ports/math/xspread
 xspringies	ports/games/xspringies
 xspy		ports/security/xspy
 xstarroll	ports/x11/xstarroll
+xstdcmap	ports/x11/xstdcmap
 xstow		ports/sysutils/xstow
 xstream		ports/textproc/xstream
 xstroke		ports/x11/xstroke
@@ -16782,6 +17024,8 @@ xtla		ports/devel/xtla
 xtoolwait	ports/x11/xtoolwait
 xtraceroute	ports/net/xtraceroute
 xtrader		ports/finance/xtrader
+xtrans		ports/x11/xtrans
+xtrap		ports/x11/xtrap
 xtriangles	ports/games/xtriangles
 xtris		ports/games/xtris
 xtrlock		ports/x11/xtrlock
@@ -16800,18 +17044,22 @@ xvattr		ports/x11/xvattr
 xvid		ports/multimedia/xvid
 xvid4conf	ports/multimedia/xvid4conf
 xvidcap		ports/sysutils/xvidcap
+xvidtune	ports/x11/xvidtune
 xvier		ports/games/xvier
 xview		ports/x11-toolkits/xview
 xview-clients	ports/x11-toolkits/xview-clients
 xvile		ports/editors/xvile
+xvinfo		ports/x11/xvinfo
 xvkbd		ports/x11/xvkbd
 xvmahjongg	ports/games/xvmahjongg
 xvmines		ports/games/xvmines
 xvmixer		ports/audio/xvmixer
 xwatchwin	ports/x11/xwatchwin
 xwave		ports/audio/xwave
+xwd		ports/x11/xwd
 xwelltris	ports/games/xwelltris
 xwhois		ports/net/xwhois
+xwininfo	ports/x11/xwininfo
 xwipower	ports/sysutils/xwipower
 xwit		ports/x11/xwit
 xwlans		ports/sysutils/xwlans
@@ -16822,6 +17070,7 @@ xwota		ports/comms/xwota
 xwpe		ports/devel/xwpe
 xwpick		ports/graphics/xwpick
 xwrits		ports/deskutils/xwrits
+xwud		ports/x11/xwud
 xxdiff		ports/textproc/xxdiff
 xxdiff-scripts	ports/textproc/xxdiff-scripts
 xxe		ports/editors/xxe
diff --git a/MOVED b/MOVED
index 82b36d1..0d64e59 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 edaec87..282111d 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 0000000..59ffc2b
--- /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 0000000..15fd8fb
--- /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 7d8ba0d..8131868 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 043f6d5..d198f3c 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 0dd35a3..dde9bea 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 4c68362..74f5318 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 9c68eb4..0b55240 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 f919f09..d83c441 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 63f75ef..76bf463 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 da8413d..06fbc78 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 f01d500..578da3a 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 976bd49..ab76b02 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 b628989..13727c9 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 d5b7d15..496a35e 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 fde3c04..bb94572 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 f82bef2..aff614a 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 3dac219..a437bc1 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 15a59d6..cffba07 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 edce11f..aecec4c 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 6995516..63e8130 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 6995516..63e8130 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 6995516..63e8130 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 6995516..63e8130 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 6995516..63e8130 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 6995516..63e8130 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 d897b0a..5728db1 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 e8ffa76..e438c1a 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 85d1b45..c3f91df 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 bb85fbe..dd713e4 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 476554f..0732928 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 b7b2696..ce3e0fa 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 bf4012d..a92cd6c 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 a3ca290..7de450b 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 21f8e7d..875bec3 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 39b0ec6..dda67fb 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 39b0ec6..dda67fb 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 f8ee9c3..9c5f422 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 698731f..9912aad 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 d2a8b1c..3495684 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 25fe09d..8341926 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 f08cb55..0b324ba 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 a450f24..f2d2b09 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 142e441..2df5c68 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 42a4752..2c80bfb 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 8a868ba..e38947b 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 10fbd43..a03ed2e 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 5be3b0f..3024414 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 c0d5bde..8f76ad2 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 2a28613..142f9ee 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 aa998ca..14a76b1 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 8cb4b20..096461b 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 cb50804..f008ef5 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 cb50804..f008ef5 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 aecbece..b9011b3 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 fd4946b..5adaf31 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 ae69b15..68b7332 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 7990a6f..9a314f7 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 7304bef..a678d200 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 39f737c..911ac39 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 ae86b4c..98bc9ce 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 da80912..85b5019 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 97be80a..f74bc55 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 ae8ebf8..16ae3c9 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 e682a46..bf57066 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 6081838..c81b6a1 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 b70dab3..f83a901 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 f7a90ba..128d4e1 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 f2d4312..1bded03 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 886440e..02cf46d 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 2f7e633..43f1aaa 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 58a63b7..6bdb525 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 cec9947..1c1cc7d 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 4dab67c..0228a5a 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 7da5a60..8d7d367 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 a81e446..b20a6d1 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 1124566..7597abb 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 2fa6f4a..35f01a2 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 68bf2ab..ac91143 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 62f4578..dad6dd6 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 5654c67..50e32bf 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 7851cc8..7730976 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 0d4abc0..454b2e1 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 c027c85..231e5aa 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 cebf8b6..dcf6aeb 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 e2944d6..91b89ff 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 fd652df..a964b6c 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 0fcfd2e..fee6a9f 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 599fd72..08224eb 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 34dad5b..7da9ad1 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 ebb9a34..f2a28a1 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 b81e734..a5b7f72 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 ae6818f..aa89a23 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 90544a6..d0fa61f 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 dce6976..27144a9 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 7e47935..76966ae 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 0356a87..0e01b57 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 714fb49b..9e903d9 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 e5e9a9a..66116fc 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 48beff4..6029c31 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 680e421..1491873 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 7f0891e..e46f674 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 079ac75..ee1023a 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 0bf85e2..c3365a3 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 4eb23c2..38648e9 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 25c6d8a..f9a959c 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 2a8bc3e..aa9582c 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 25c6d8a..f9a959c 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 2a8bc3e..aa9582c 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 f7ebdca..b0aa85e 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 86c3a0e..00efcf1 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 07a91e8..ccc542e 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 371978e..ccc2b02 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 e4a0741..7791288 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 1356c66..640f21b 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 d506900..1e253f7 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 d50ad39..c8e01a5 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 e0928e7..35ef2dc 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 bd93090..c607bb6 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 f4febdb..006add6 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 675cc08..fcf15fb 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 d322bef..8f3fa91 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 849cd76..e08b351 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 ab736b4..ebb1401 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 8e0c58d..d0ac8df 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 09753f2..b4e842a 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 0fc8fa0..76a905e 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 03a9ff3..69824a1 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 86862ef..0c6d836 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 08857dc..e74c59c 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 ab673a7..0d282a7 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 ea447843..5a31862 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 fc708e5..ab9f77f 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 ba008b1..40858b6 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 980537d..049a9e0 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 d23f741..974c0ee 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 4c2ba75..0bca5d4 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 3644f6b..d4430c6 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 08dc71f..4e47af9 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 7911261..a37f825 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 e9cf1638..b381043 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 1ce261e..1b7267c 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 ac362e5..8a3e9ae 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 0b7d783..926508d 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 aad25d6..0397a74 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 34f02dd..2421e05 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 4760387..4ce22e5 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 83799cc..72d36b0 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 21fe05e..2cf68e3 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 00d62f4..92bb0f5 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 cb05521..ee1ec37 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 1e98809..90b391d 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 9f38658..025dfe4 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 91aa561..e3f053a 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 b8d1201..e984f9d 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 b4af194..e85a161 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 f376698..59874a4 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 5c74a37..f88c834 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 1fe7489..d44357d 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 6433274..fc5037f 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 9cef1c0..150b37e 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 d23b0ef..f8701c2 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 8229515..9f4a30f 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 677a981..540d0c9 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 4a21746..1fe4661 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 01be2f4..c84bb92 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 d47ec14..c91a0e4 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 c01101f..a10a9bf 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 06dd1b4..36c7d76 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 7aa63f2..81b4aa8 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 de0b06f..8ed5ad4 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 7aa63f2..81b4aa8 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 de0b06f..8ed5ad4 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 1f7f56e..7a4d432 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 2799e76..9eca8b1 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 4879b5d..3b85744 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 a7819cc..08d7e38 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 00e4285..e3cf0d0 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 7e60e2c..500d1b7 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 ca9d43a..e26a4e4 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 8f2c031..2f81865 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 eaaa95d..70e31f6 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 7bb71ca..79c787f 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 52dbd5a..6ad6a9b 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 fb26aa7..e677f26 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 686078a..d366ada 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 61dcd42..45a1d917 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 6b4bac9..029f1b6 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 34ec26c..e292199 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 d20d383..9cc3e2c 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 2454e65..cfad6b6 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 a73316e..3c2745b 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 9d1fbe2..0704f1d 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 c600a08..cfe85dc 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 e21aac6..c139fa8 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 eeecc68..5a867f6 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 09fb345..7e8b407 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 3d4fc37..27a9dd5 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 969419bc..869d994 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 6ec7c02..6135349 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 a4c9779..75ea069 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 46e3cf7..4094d2d 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 3d77b26..1210431 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 809a77b..00062c6 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 4e03fa1..4d2d16e 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 3577c33..84d209f 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 cb14759..a61336f 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 f854c4d..78eea93 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 dcd5c6b..2634734 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 e9f5a0a..0526d25 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 0dcdd2d..2570d5e 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 62aa1bf..4c0e013 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 b0ff0cc..753becd 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 a5b42d2..c2a79e2 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 dd41c2f..8dfeef4 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 47283f5..8e2a49e 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 f41a301..deec029 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 f0da64e..1c06055 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 8bafe81..3142b05 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 0ea1ff5..ee1b231 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 46502c2..171d9d4 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 1f45dcc..caca89c 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 7533e54..d33274a 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 e1d2e12..614fc9c 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 c13219f..f4f92be 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 ade3ab1..1f6fa71 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 fca5c5d..f45ff8e 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 f300429..e6d1129 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 c691ceb..a56cfca 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 405121d..61c6d56 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 8d1dc8a..06e8c1f 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 a006a0d..5cf5511 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 26d0442..8f3697f 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 bfe3632..2488dbc 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 4c471c1..ed62d77 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 418925d..f6cc0ed 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 d79a9f8..e0dd0fa 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 a4a27a7..0e00ebe 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 7b300ea..bfe0215 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 bfa8183..0c4922c 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 7386a55..eab36b6 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 49b7f34..a0761b8 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 3ac04fe..2e823c8 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 0b73161..fbdbf17 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 b74c298..b8cac0c 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 d3aee51..6a9290a 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 0d2b435..61d0ca7 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 623f93c..88a8cfd 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 957f8f9..fa31e76 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 0bd3a4f..8452fc3e 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 96a1df9..4b5cbd9 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 c615e2f9..315bcfd 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 f229bb4..0b45d11 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 8799ddf..d7dc6a1 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 3dbd4d5..41c2e80 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 1a0c327..43546a5 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 321b5d6..bb3d5de 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 b1ab6e2..4f18a74 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 83f70ee..3578948 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 db7d62e..ce1da04 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 d014642..21b4a4f 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 5872ea2..4597fe9 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 71d3918..cd43505 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 5efa6b4..793f87d 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 334a420..8b4d47c 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 fc1cbff..35212d4 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 03cbfa2..aa7e284 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 7d98a1a..764c93d 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 9fbf872..2ff20ea 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 304c9ea..ca8e5a3 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 b005a71..a004376 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 a463d03..902cc63 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 0215e52..4fd0836 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 c8568c9..75e3ca5 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 e153705..b4433fc 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 cbb8844..f909cc0 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 98923cc..921b0e5 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 6266c0d..1ef6b78 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 a8414f0..e3c88e2 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 e7adf90..9263236 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 f5840f2..ab16ebf 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 5c8d57f..827d7fd 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 cce443b..ec34788 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 242b164..b8b0850 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 f26f49c..4e6acad 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 42fc5a0..2c708ab 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 48812ce..5c211d8 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 cd5c828..d74c50f 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 71855f6..50e33cf 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 a737d13..550c9f4 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 0e66c55..c2ec246 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 fe687a2..9d1d894 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 5d8e4e7..0389578 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 9c5ff3e..4a1874e 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 53fbb56..077352f 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 88e921d..3957e42 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 7601933..1e5a014 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 cf094d2..ccd7e9d 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 c4ba195..f1a8ed4 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 730eddc..2f1a8e1 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 a36b14e..0bdebc2 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 13a21bb..68c826c 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 f0f9318..1d5e106 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 5545c14..67e4a6d 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 c584bd6..04206e2 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 650e577..3c3f01b 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 1ae01c3..6491b6a 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 045870f..3368d1c 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 fd10312..5131ac6 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 2192d09..17fbcd9 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 49eb735..38c8b4d 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 cd6ce9e..1c64594 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 9ac5c1a..a8f56fa0 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 d471048..cb7eab2 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 d471048..cb7eab2 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 b721987..a113bd2 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 aa40422..7ecb52f 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 bba6e8f..b82eef7 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 9928a0a..152000e 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 bef2062..6d3a23f 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 980f8fa..50aed92 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 e21a933..adac9e8 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 72de80e..3afef4b 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 69e9d71..f71fca7 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 7faf259..613d7b7 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 d6f5715..bf9ed02 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 ec3a5dd..8fa65b9 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 9891443..bf31f59 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 b684aba..b7cc492 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 8da175c..ca86638b 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 b14cb00..c656eb7 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 f4efc06..31efd39 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 be112eb..3474287 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 44cd04c..c96e84a 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 9e8ff0c..dc8df40 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 c974397..f0410b8 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 864d747..b82d999 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 38d5dce..feb6bc7 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 fe56015..367ba13 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 9176037..8e48ac2 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 ef88ded..4289246 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 c5b18ca..e60c49b 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 0530168..cfd5d797 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 4632f99..10bae9b 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 06c01b3..5ce2d15 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 3b854d2..cff74cd 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 cc9fbd6..3c29079 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 b9df4dc..149d031 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 abbc0cc..7c5735b 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 8010410..1ec42fb 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 d147ea0..cf69a22 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 c3c2173..bf9cedd 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 eefddb5..15436ad 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 88e0244..88199ed 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 22bbbb2..dd68a3c 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 e379c04..a920cabd 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 e8d2bc1..c2f846a 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 887fab5..c3eb610 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 4f690b5..b3c4390 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 a3f6eb3..e492ead 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 f2cfa1f..ee3d179 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 0070273..c5a05b8 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 afc9b51..3e950b6 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 09c0a9a..35d87e0 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 6cab526..f0a9c36 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 04d1ca6..37ddb00 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 bd8fec6..ea16fdf 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 fd0f1ce..fa9fbe4 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 8c2fe41..a8c30c7 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 2904e90..ba5b2cd 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 e9e2100..ab2728c 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 cb03a81..1937301 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 c1bc686..1282f90 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 636213f..ffc96d6 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 d0bc97f..c598418 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 6a26286..18f74bb 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 ffb508f..47f4ba3 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 747e8bd..7a6bb70 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 ffb508f..47f4ba3 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 747e8bd..7a6bb70 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 ca3dc73..79242d0 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 3622c7e..d0f6b20 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 411bf84..77a4759 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 b2a80c3..32b4ea7 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 424c98c..6352690 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 4797ee1..c7bd8a2 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 2389c13..f6eff43 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 b980de6..e8b66e2 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 d0c738d..deb6366 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 f370a85..222dd9a 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 7e92256..8a88685 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 169fd5b..faf1415 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 759788a..5ae6527 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 4bf5328..5c7e778 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 2a2cc7a..b4e8328 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 9a45c4d..5dee601 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 cc38592..0966c33 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 3730ee6..463b866 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 db994cb..02b0e49 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 acdf2e1..5310f14 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 21c87a7..5622a91 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 d6cb556..7dde441 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 81be4de..33e56e0 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 f1915d30..99931cc 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 791a4ea..4a168ed 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 208d86d..ab0650f 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 ef4bac8..fd3ab32 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 421ec79..49b9461 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 846c827..7fcc2db 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 3f55053..1e80ee5 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 d6afb21..d722fd8 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 5fdc714..b8afe4a 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 fedebe5..64a4586 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 5301934..ab5fe98 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 0ec1fb2..f9e93e7 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 951eb49..fabd63a 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 d11612d..ec59b1d 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 c7f4685..7437c63 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 70d233c..bcd66d4 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 5dafc3d..d8dc315 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 d96ceaa..d906682 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 d2621c6..75f8239 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 627b9ea..7862dee 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 fe604d6..e9fb638 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 6328fab..f68945d 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 fa2f23b..e9ef164 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 c7409b3..eb112a7 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 39413c8..2d4452a 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 52c5fdf..6fa0702 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 ed2327b..aea500a 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 f8c2fc8..70ae7f3 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 92a0dbf..214b21f 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 7f96464..2de918f 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 6fdcb2f..00283aa 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 523d328..9bbd060 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 eefacb0..0a148d8 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 080d2fd..a70d757 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 83c2217..6412d8f 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 116528b..1ea4a25 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 fd9d3b4..041699e 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 6d41f9a..3d3c26f 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 380e82c..f1b8b03 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 520f808..3b3d2ed 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 26f7f4d..4e36cfa 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 1cfc88d..4f36e7e 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 65f6687..3ef0b25 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 f7fb72a..273dec4 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 5e8c68bd..2c6a8e8 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 d58f259..33ec52a 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 e689dc4..808e4c5 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 8c16956..02e936c 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 42df058..9681bb8 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 b776dda..e683983 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 c095ecc..4675e40 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 d5d5eb8..5a74b4b 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 a7aaff1..ceda3d7 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 13d34d6..cc724c2 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 e8905f9..7219e22 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 d792cf2..48abbb4 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 4cf0b77..d6bdd09 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 1d7dd59..6cc806c0 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 39c65b3..2e705f4 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 c96cd74..cc604a6 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 1116cc6..bae75e0 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 461c189..c3d160c 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 7221e25..066bebc 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 34dad1e..2d3fb05 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 f95443f..1c7c8b9 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 9177ff2..ea1d45a 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 3d98283..e119529 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 7d4be86..01ffed8 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 19b0d6a..044a736 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 b62cd48..aeec565 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 d9645df..211e52c 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 501a1b1..6a91b19 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 796d4c4..a9100f0 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 ffb0203..684315c 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 c4fbdd6..410eab0 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 e9a0d31..9d8fbb2 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 590605f..2a58997 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 112dffd..cf68532 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 6af2687..741e410 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 bd32b46..a0a9e55 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 6b689e3..bb862a1 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 fec5110..226800c 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 9f21d73..48ce9d1 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 f14fb2a..0ee611f 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 39c2edf..458265e 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 b90e5c8..e5208cd 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 35ae500..40ae4f3 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 db7eebe..a2bf529 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 be5c8c3..5905758 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 908955f..65f6097 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 fea582f..ccfd9bc 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 3bc4e67..13e692f 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 d0e2da1..9d3ce5c 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 bf07327..092fb33 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 fe604d6..e9fb638 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 9bd7338..050fbfd 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 b83c1d7..6ffa112 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 2ae1f06..f7ae296 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 1c43e3e..c7a665d 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 a964639..1fce64a 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 a7117d5..37aa1d8 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 8017e76..e33632f 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 f0ce82d..4a25cc0 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 7023250..d52027c 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 3e191b2..7a23341 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 e923812..bbf847e 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 f4919f4..40e83c69 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 0f1c68c..f174477 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 f6dc1d3..9a48514 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 316c458..c643fdc 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 f9f001f..66aa089 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 01be3d5..74f157a 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 78a28ac..febc92d 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 84e720a..e98a182 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 3a4d681..eb5b582 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 4c18601..1d74304 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 0fc1ccc..3667bc5 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 59a2cda..cfd6b53 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 d557fab..e43e20a 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 f2e1c4a..3d8fbb6 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 e51dfd9..1a0a9dd 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 042b4bd..ba7ab8f 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 0f8a9c1..80ee4d8 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 39c9604..0c6fbc1 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 70118de..7491fee 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 c4998b2..ee85444 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 8043382..3355a8e 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 92374d1..c49584b 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 5b27da8..9d693b4 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 b765a9f..4c9da0b 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 bdabee8..93d67ce 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 2fdecdd..bc9016c 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 7a6a15a..2102790 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 7e71a07..3ac7d7c 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 e3d3181..e49c771 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 eaf00bc..db8a172 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 9596bb7..f7f9742 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 4cdf210..aaee515 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 383d1e4..dac8bf7 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 e3f721e..1d8b3661 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 040963e..7268a4f 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 643c83d..ba50ca9 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 ff7ae08..868337e 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 96d4d20..3cd6454 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 a5bedc0..ec32aea 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 b6738ab..10d10f5 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 2e81e0d..2decb02 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 ef6f01a..7b2cbc1 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 bfd1b04..9e21481 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 fe2338f..2fa1e04 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 0536e1e..b6e9d4d 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 39252c9..dd40c86 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 cc0bf31..77cc58f 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 93283da..bea4f4e 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 e1b630d..6cbc32c 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 5b835cd..44d599a 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 3fe6f3d..5d37c87 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 0ce0b99..519a59d 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 fef589a..d349a97 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 e225a53..527d7cf 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 cc4ddea..b81661f 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 a3c1a06..9e6c5ac 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 d252962..f69b527 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 5fc2cf1..58bd9aa 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 46326fb..862b754 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 15fbf45..48d33f9 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 e24713e..52abcdf 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 592b864..1173e86 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 eef1bfe..e05228d 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 d89fcc8..f673fa9 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 f4609ca..ffd9b9c 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 f76e290..17e8cf1 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 11996d0..424815d 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 61c7504..1ea7b28 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 5c9d5d2..f44e05f 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 ab81646..13afd98 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 52326a0..5fbc620 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 3b6bbce..3302d4f 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 52532fa..ad3694a 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 787c49b..2da529d 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 b4be33f..7595d6d 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 1e2a7e7..646996a 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 865b2d7..16ba38d 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 4f35d76..a9c888e 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 d447b59..4383654 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 dfacb0f..d2c96a1 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 dfacb0f..d2c96a1 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 7ccfd23..5fe7dd7 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 3783705..9a07c10 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 6a062dd..bb6a24b 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 27781b9..0055457 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 ab47ad9..617abf4 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 39420f9..9772e34 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 6491ff4..2c1ecf8 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 cf0dbfc..ca0bc60 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 be829d6..7913fee 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 71f28b6..f31d00e 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 33cde89..71b4f4b 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 5cad8fe..dbba7e4 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 3b2f1c5..f947640 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 47f01a5..282dcba 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 f39932b..df38c0c 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 df00d8d..0a65b80 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 1a0c49b..cf87627 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 5a1048e..2ad219d 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 8b594f1..3a14cea 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 32f0107..a5d7376 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 bffff20..751c268 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 8889aa3..9448aff 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 91251e5..72e8f3f 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 1c6b8ae..81dfcbc 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 c775ab0..844cf0c 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 441f3e0..5cad487 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 dc15f6d..cdbbe03 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 d1cb57c..2dcc5a6 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 21b0a9f..88bbed3 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 ce47bde..5e725e1 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 18b385b..cbb53f8 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 409b8df..937e990 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 adaec36..23ebd28 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 044a967..6de6d48 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 bc56586..2f45ea9 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 ad67689..9e78670 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 2a31595..0309736 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 23dc738..780ac2a 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 fc486c0..6b0b172 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 37e6fce..0832e0a 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 204667c..6eedbe0 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 b3fc8cb..b9205f7 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 d6fe60a..1b0a0a0 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 b6990ae..acf7d9e 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 ad0b460..a1ceb2c 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 60d277f..b7aa813 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 3ce7663..405dbd4 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 3ce7663..405dbd4 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 5716e92..baee248 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 ed6a250..90d1db0 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 1858e7a..9113747 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 9cbfde0..aabf15a 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 98a1066..dd3bd26 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 c019889..a99656b8 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 1701c03..8098d55 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 c019889..a99656b8 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 1701c03..8098d55 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 bc56586..2f45ea9 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 ad67689..9e78670 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 bc56586..2f45ea9 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 ad67689..9e78670 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 a0ba7ae..abfab83 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 f7dadad..4f33536 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 e913d52..1a6baed 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 7896f67..94d12a7 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 a174536..493ebdb 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 a37ccef..ab20214 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 6e2fe63..557b51b 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 6c8a485..8761831 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 5162224..8b6e067 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 0fb10ee..1ee9179 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 d43786f..89f9894 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 7405c3a..4bafb17 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 7c997ef..3c81911 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 8cb1753..64d0924 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 5e840753..74d278d 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 0140856..b2cb54a 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 1353606..16c1968 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 8812922..716b05a 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 013437e..82fb2a4 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 52ee171..4d320be 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 4291df2..360e2ed 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 743e651..e81cd2e 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 f74c474..e2f6918 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 d4f774e..adf3ab1 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 34d4fa8..e69a698 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 5397faa..c58ec98 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 1703846..48f7251 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 1703846..48f7251 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 ed16c3b..c9c9f0d 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 dfb2471..0b7ac4d 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 5ac3bb1..a1438f9 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 8451fc2..b9a7f06 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 78a3bae..8791eb5 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 e8f38b3..e463d96 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 1162a6d..88e9aa8 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 67f331e..d2e9106 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 1d59e84..da34e58 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 7d56caa..a196687 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 ab980f5..8c4432d 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 bbacf72..c4ee4d4 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 f78e8d3..cc32e8d 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 565514d..670b055 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 915e074..21f5b19 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 d8cfc3c..ce4aadb 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 0ff251c..1c74356 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 3b015b4..b25de2f 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 9aca385..5e7b7f6 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 56027fe..12bab94 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 7a1dff2..b1907d6 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 3365660..7477d34 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 e362192..919929b 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 60ccd0f..ca0b807 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 45175bc..7bbc3df 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 7e3c05b..8a7abc9 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 f7b2764..5de869a 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 9df9ce4..d9efd00 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 8451468..4d96f3f 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 17b56f3..b8dc4e3 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 51d20f3..9b1f07a 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 9a5fe06..30523d4 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 f5bc58c..de8eb7b 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 d0ccce7..2a83b38 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 df2aaad..fab8baf 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 81be8ec..b550494 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 ec805fc..33bd826 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 c57ae0f..628d785 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 d2a8b1c..3495684 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 d93e69c..a687518 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 846571d..a576d8a 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 b8dd94d..5c365f6 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 3a20213..16f6ef5 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 ad5eeef..7de5ce2 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 cab21b9..ede5011 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 d06e4fa..30b350d 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 9081df2..84f4608 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 157de03..a0e4349 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 1ea8f32..0da39b7 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 516a48e..ebabbd4 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 0e488ea..712d98a 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 ba7fdf3..d38c873 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 e14a357..96f6f49 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 bf3e865..14083962 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 eeafc74..41abdc5 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 e183766c..2a3f8a6 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 02ef5ee..eaa86d8 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 3c53fe7..b3f18fb 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 9da56d7..032721b 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 348d76e..000b536 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 aebc0e3..cda1dc4 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 835e232..708d208 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 0013204..ef79329 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 a9bba05..ad67456 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 12de63b..90199bd 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 0b0e90e..1c09696 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 1726cc9..ac8c080 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 3fdb8e1..04081c6 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 aacec41..9f21a35 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 bd074c4..6251a0f 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 65be848..1ac63c6 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 d0e723c..04302bb 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 35e2697..c3097d8 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 223ae02..8b246e2 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 edc4c96..972d608 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 e78ea34..b533a7bb 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 6e7c17f..9000736 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 f3c444c..88d3780 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 328fcfa..58bcd35 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 4ca210b..91b4ba0 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 2c4d6a2..b52359e 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 c68e1f0..24eba2a 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 040fa37..9d5c5b0 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 cf99eae..391dff0 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 ad12dfe..c90f2c7 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 66ef80c..2e17faf 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 b74251f..1b513ca 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 57c03fe..1bd65f4 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 f9bd0bb..88bcda3 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 97324e4..3cccc0d 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 034ae75..50c19c6 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 f15e144..b85a839 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 d9a3022..68abbd1 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 974a985..a854aa4 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 b035a64..da78e85 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 8f056d6..29dbd42 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 f7a8b93..ba35c1f 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 bc85fca..9225d6f 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 ed4e661..208b61f 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 9eb0bab..0654c1f 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 b7bdf5e..9d6cc0f 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 7139340..124a3a6 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 c071de9..d48590c 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 0e5ba80..4737c80 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 7d981aa..86b364d 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 f6c93f7..b0eb215 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 0064f06..6edd51a 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 39aac90..1f60224 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 a99f7fa..d391946 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 18c1135..195f9aa 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 5f1cca4..75da588 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 6246934..f142634 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 5011b18..694f16b 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 fa73f70..e40eaac 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 631d76d..80f5d48 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 f6c870d..8ca35d2 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 f45b33b..cb5a90e 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 8c7bba7..5b1bc26 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 a4e4000..202c6ac 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 fdbaf63..cfd2e8a 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 cf9edcd..c967920 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 cf9edcd..c967920 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 017ce78..8f51a86 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 45fe9e0..d9c5cf6 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 72c6fbb..ce58447 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 26033c5..b5884fb 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 4200a3f..9d3fa18d 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 c0ee48b..1c2dfe7 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 66894aa..4f15163 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 522ef37..84c0d5a 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 bb5a3f6..855cc92 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 a4046db..583c9ec 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 a4046db..583c9ec 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 82dec0f..b634e8e 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 e4d4b7b..5f069ac 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 67f3e4b..24e5cfb 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 21d0712..6d50ce6 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 90e2968..364b988 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 5dd14cf..0b0bd24 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 ee4366d..4491397 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 87f92f7..1b5e27e 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 617d1b0..00e8e10 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 94ea054..45a0e57 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 2e9d60f..6738812 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 321ce81..6d29d6e 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 298e7ed..99168a3 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 8ca10c20..4ca20c5 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 37cdeac..16ae86f 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 2ad4788..6bbaefa 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 38e9204..b11019c 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 d8bd880..d45dcc5 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 2ad4788..6bbaefa 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 38e9204..b11019c 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 d8bd880..d45dcc5 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 2ad4788..6bbaefa 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 38e9204..b11019c 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 d8bd880..d45dcc5 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 2ad4788..6bbaefa 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 38e9204..b11019c 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 d8bd880..d45dcc5 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 2ad4788..6bbaefa 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 38e9204..b11019c 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 d8bd880..d45dcc5 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 2ad4788..6bbaefa 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 38e9204..b11019c 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 d8bd880..d45dcc5 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 f1cd25e..50da5e0 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 8a40be5..ddfb84a 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 0d09dfe..699dd03 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 dcd8667..2c2aa921 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 06b39e2..cd380d0 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 6b59be2..768ae49 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 84884ba6..1f8fd36 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 b47d0a0..f5eecc4 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 4a2d8eb..0c3176e 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 6307054..f364753 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 f78ea7d..a9526fc 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 a8b5bda..4b14a41 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 6450937..f3fd023 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 7b8f319..b930790 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 4e7627d..a5607e2 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 6662dec..485fe68 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 8ab5c90..deeb4c1 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 7b14855..e72de0b 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 a821c20..05fdec3 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 d025d21..d020b1c 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 7b12ce3..2f433b5 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 9bbc42c..dbcce24 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 e960a43..151d663 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 0834927..6c31253 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 45ecb33..7faaa13 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 db4635e..4c4e0a1 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 86c2a29..f15d1e1 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 87865fe..cf19152 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 1f4a029..1ec7373a 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 3275aa6..ce661d1 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 9f49029..5ee60bb 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 f93cf90..84bdf79 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 3483472..5fb4411 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 3ee13a2..bdcebb1 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 b0857be..5f0c5a0 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 126350d..f9ea6ac 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 de89b96..bf5c39d 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 345a44e..b5f5537 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 b65fe6f..6b70544 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 479e0a6..7ceca56 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 3f64386..bce5171 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 f763d16f..9887d17 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 8856f3c..f4f7507 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 7b96c50..d170b5d 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 56b6069..f92f47a 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 84da5bd..82eeebb 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 48f98a7..797f3f5 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 2c65bb9..3157e98 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 42f07a1..0633aff 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 5b27c70..3ff309f 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 3cf9361..3d640ad 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 d0fe61b..d7d5e39 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 c0eebef..fcb5fcaf 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 d32c19d..4a7bb7a 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 6f27e93..1ea02e1 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 53d027e..cb67073 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 11abe53..7f7e004 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 b514014..d0ef35e4 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 4d7ce98..fc5ecef 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 260ffbf..a05a639 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 8f453e8..e9a1eaf 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 9621f6b..7d78372 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 c169110b..f781438 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 caf6129..c32edfe 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 a875012..82c3a28 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 b6e032a..e899908 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 ca59cf3..1140a2d 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 624fd56..4bde0a4 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 addd818..81f6b75 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 42e1702..54426d3 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 8282fdb..14f0c02 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 c8ff79d4..aed1110 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 6663ad8..95c7c19 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 87184f1..865cb38 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 eef2330..191d32e 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 1669238..454c33f 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 7ad55a6..b972bf4 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 e20e7a6..c88a696 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 aff4b3d..7abc70c 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 7cf7f2a..870553f 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 2b143cf..fd3828d 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 8e7b064..3115097 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 e3e795b..1c1c016 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 368e0ec..08e6546 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 077e5de..53271f1 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 b36c791..57d534d 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 1df39c8..235d246 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 3a3e76e..f4c6876 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 02023ca..6759988 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 214609d..90213f2 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 45ce031..d414b40 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 69ddefb..5eb07c9 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 17d87d41..1a6a6ac 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 9b7a6dc..13ed5f5 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 2acbb15..654e76d 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 8e3134c..9e6e965 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 2932c80..642e7c4 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 9822a51..de41328 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 1f274f0..b4403c9 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 878877e..52bc47e 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 3729826..2481637 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 de7b23a..667f73c 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 81b5e3d..780503a 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 e0cc6a2..98505a7 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 6f80cc3..feef016 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 e09c5fc..213638d 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 e1f9719..d6a03d9 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 02db72f..54552bb 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 b13dc08..9e06774 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 e968224..dfb1c5b 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 f8e1269..296ba70 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 3a3cc07..e1697f5 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 c6b6b98..cb50987 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 4733d12..d245a10 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 dffdf08..dc35f09 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 c6b6b98..cb50987 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 4733d12..d245a10 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 dffdf08..dc35f09 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 7c95a6a..81058bb 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 481a64d..e5c86a6 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 019dbe7..33341fe 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 81c1189..dde0466 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 b6ca63a..e2cf55c 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 77107f0..e0923a8 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 6cbf972..042e02f 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 06fe9de..c50bf17 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 5240993..de5675c 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 d2a8b1c..3495684 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 1d28f93..831d1db 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 39afdc8..4054e27 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 39afdc8..4054e27 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 97eb74d..372c7bd 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 97eb74d..372c7bd 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 97eb74d..372c7bd 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 f458f64..19ff4ac 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 c282b63..009c96e 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 5626ae0..0db8e49d 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 1af8ada..bcbab2d 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 fe4e44f..e8ca957 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 6a0e9b2..d194d8b 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 89345b6..a8d349a 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 9da10a0..c5dd818 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 9453f6b..562d52d 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 149fdd9..fa9f0bae 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 f0d7d43..d6ebb80 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 c6b6b98..cb50987 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 0625066..2eb4c30 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 276555b..85d4c50 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 130f198..4299e1a 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 a1adbc2..2454072 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 e968348..174006b 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 3715917..3b0227b 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 e968348..174006b 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 5fc05bc..d278da2 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 d938fd3..a77b082 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 6fba383..53a4ccd 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 94b92e4..5649b1a 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 270c7e6..190bf53 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 8f78cae..14a4421 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 4733d12..d245a10 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 381772b..ffe4812 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 ff1f1e8..7b3c2da 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 fd31736..642af1e 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 eadd338..dd2e60f 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 f95b053..0885b77 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 dffdf08..dc35f09 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 a712c02..4e8619a 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 0f04353..1315d8e 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 9d25dff..3ca1f47 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 cce5415..dd83911 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 3517508..7ca2bd3 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 f8848d6..897bd8a 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 519338b..08daa82 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 a7f63be..7e45d57 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 4cc725a..6c84285 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 de0dc08..f6773c1 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 1eda48a7..0740778 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 f538799..4411126 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 f8b1414..41aff9c 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 03a8aa7..98f4d35 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 fba1b9a..168249f 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 b524252..ee9b7bf 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 5e5506e..baee3bc 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 0bb4802..348fdca 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 7dd8f6f..341d39a 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 0e004ee..3c14cbe 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 32b56c9..6d171ae 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 68b7333..1aaa043 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 a34538c..d83369e 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 53840f2..698d59c 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 b6949f8..d1360be 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 5d6f3d7..899141d 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 855639d..84f2519 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 251df64..c792b77 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 37cb055..4170dd7 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 f458f64..19ff4ac 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 650bf3b..b4b32d9 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 8b22479..9034023 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 8175d72..eab9917 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 9c1bd7f..cc026c3 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 e968348..174006b 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 e0eb43b..ddc15e8 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 4cba4c5..5acb098 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 af5435b..40d7ff1 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 e5a0ddc..19d6d4c 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 2c2ef88..2d580ca 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 04ec9a5..1359518 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 72a9bd9..1609d7e 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 9d7ff85..366014a 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 bb04810..3814354 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 67e3d8c..29eec70 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 f6e47a9..fc67260 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 24b23ae..ab0285c 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 a29fd10..36562d6 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 261f554..febbd58 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 1d75933..3beb6d6 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 d779c0f..4d5a21b 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 9150a18..5d92b10 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 47c726b..49345f1 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 5e82f62..48fbab0 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 8ba4f7f..6934d41 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 c0eecb9..e3d9cc1 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 6e45287..31dcf1a 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 a1d275d..631165e 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 f2da1cd..fc03f5e 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 cb7b588..a2765cb 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 7432be9..c5fc05a 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 8a91263..740bda4 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 6abe19a..a3bbdd7 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 6c4285a..ed10c19 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 75918b6..92936ef 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 b3b1e79..0240abe 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 6e2aa58..74184b1 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 2ea5d3f..5affdbb 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 68e3df8..b91bb96 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 ff4a921..fb38071 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 6c72cff..7492024 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 618c8ae..f228e13 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 6785ab1..4b55f4f 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 70f7eca..4387298 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 4fd66ec..073df51 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 7821e6b..6cdffb6 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 103f120..edcacb2 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 67f4b95..06146be 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 89883a3..4d4f3fa 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 054fa65..63a57b8 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 bd787b9..aff0fa9 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 239dfe9..5bba1e5 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 351bcfc..362fa03 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 de0e3cd..fa19ff3 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 97b91c9..02ab135 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 ec476e7..997de7b 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 8ebf7bc..851e766 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 a362b2b..6b06cd22 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 55e4897..5a3af1e 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 a9b8bb0..fda87bb 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 0e2c526..49c6f22 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 e9a4072..804ef0a 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 8492c92..d72fe29 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 6353e03..87241d3 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 0745a4e..a9df0ac 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 bce9848..32393d6 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 c0a1c4a..4d5ab26 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 4e8bb02..ae82d23 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 e923d35f..d9a6d4f 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 4e8bb02..ae82d23 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 e923d35f..d9a6d4f 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 d29239c..16b48e6 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 9de63da..c8e3bbe 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 bb4b478..2657dfa 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 d93de6e..52ae97f 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 0df2f7d..90eefe5 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 b6366a4..3a8773e 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 cd3f5ac..4cc3ae9 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 e979124..cadd899 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 c32fdac..64f01b0 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 e1cf44e..357cf1a 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 1c8db1c..4ac6b5c 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 db59482..4bb9ee4 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 db59482..4bb9ee4 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 db59482..4bb9ee4 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 0bd133c..a9e2365 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 c1cbbf1..113e7b3 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 09b541b..b67d0b7 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 e2c9366..2aaa4a8 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 9e8040d..4e878e3 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 8f93a8e..f2228e8 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 c4cd275..4088ff6 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 a9bf80e..09c2cf5 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 49e3066..b5c488e 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 8eaa23c..598a5d6 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 7d04cbf..b519338 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 601303b..f1eabca 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 d2da766..0be3157 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 80589f2..09236ee 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 64b81a0..895d183 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 2b46ba0..6c52ad7 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 39e6a28..3ec3bc7 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 8cad572..16c6036 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 55c6945..57976ec 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 0453888..ebb9e80 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 b1bab9e..6a64e0a 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 6f508d1..9e8b167 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 d1441e1..7babc4c 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 14f14aa..2a435e9 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 8144fa0..20e8961 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 ef3ecdb..2dd9579 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 9cc4046..56f5d18 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 fde0231..c528556 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 786fea2..4e73528 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 b4532ea..328c1f4 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 5c6353b..17e156a5 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 76ca3da..de6f9ae 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 f3a4eed..91e0f03 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 c6f86b5..d745c4c 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 71f4633..e0621dd 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 6511e64..09069ac 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 c3770f5..fbeff2c 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 e8a35ef..bdea047 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 acd6e8c..1993fa7 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 308226b..c093a2a 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 7e3d07b..6d86121 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 00c9ad0..6c42194 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 203fcd2..b2556db 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 a15c790..a7a1a0a 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 3c4bf8b..62eb2a4 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 308e813..3134130 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 223ce84..c308982 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 4789b46..f591ac9 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 2097bfa..c42e00b 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 a40913c..0fcfdd0 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 a45e2f6..1c9f157 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 d272f95..7eb496f 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 774aa88..8ab9a8a 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 77ae615..035bcde 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 1a17fa9..0347971 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 2673e08..cfe9690 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 0fa7895..b28d2c9 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 67aefe5..a629ed8 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 1d84e28..0aad626 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 3481edf..90fee2b 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 f50aafd..68853f4 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 79b9936..84b9827 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 9577396..4614061 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 d020517..0f81f63 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 75cd9be7..78f6db4 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 f7dc309..39e1ecf 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 9e9bafb..31609ae 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 938614a..84e5dcf6 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 0000000..b55bebf
--- /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 0000000..44bf7ed
--- /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 0000000..4de4fc5
--- /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 40f0ddd..71b81f8 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 cc6ceb6..7ff8432 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 e6f4e96..6989d66 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 b2dc4c4..7ccbc02 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 83e5e8c..024621a 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 deaec0b..23cdd4d 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 0e31b49..bf1caf8 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 5ee66d5..7aa44f9 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 ca6ed08..54f368b 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 4ee371e..878c68d 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 8a5c6c9..1108411 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 c29daec..ef9a296 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 2bc31d4..1a1bdf4 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 c1219ff..4f96063 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 64a4c6d..04eed75 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 98efd48..83d37e0 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 4d85150..3ebde02 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 e820565..d990859 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 d258bb9..155ef35 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 561f817..f28e878 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 e0fde69..f618387 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 8a43ed5..55ee6ca 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 762ae5e..180f5fdc2 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 a0d5039..a9d47d2 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 a0d5039..a9d47d2 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 45dad1c..8bfea551 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 535aec6..4b2abe0 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 9cf50e4..e539021 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 386e89b..5d27096 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 2eef628..571ff7c 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 dca70b7..81ed5c9 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 ef9ada9..3a5fa10 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 147bff6..4db8af0 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 1e5c964..bfabce9 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 d382131..2d3f5dc 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 67db373..2e966bb 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 cd029b3..c6b7251 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 67db373..2e966bb 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 cd029b3..c6b7251 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 c335e44..3a904a6 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 4b31da4..5a7d211 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 d029422..6166e9e 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 c32cd46..2857997 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 a9586d7..6126b45 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 705d51b..91b7670 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 23a2740..12c320a 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 1a52533..e561841 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 99eb08e..bf79d71 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 0815846..497b74f 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 b0ae8dd..d9cc98a 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 a43f5e3..88ce574 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 48965f2..838626f 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 9eae583..13adc74 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 b376a96..3032197 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 49e3066..b5c488e 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 bb4b478..2657dfa 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 5bde437..57b4e2d 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 be8fc5c..c47ab38 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 a1e4625..32dc4ff 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 42743f6..a4a356b 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 b1bab9e..6a64e0a 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 6cc76df..b420924 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 02465d7..a714029 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 cd183c9..aeefe92 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 536b31b9..cbabb33 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 8834d06..a4f62ce 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 0f4448d..d116dd3 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 5bb731c..450ed74 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 b9c06d5..a37a8ab 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 01679fb..1369b75 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 597dd20..662597e 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 1c90faf..22e4f31 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 fbd0ed3..9aa6d68 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 1ce373a..b5c3ca4 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 a5442a6..f395638 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 1ce373a..b5c3ca4 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 a5442a6..f395638 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 234c672..faeadb9 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 0000000..aab6ab2
--- /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 0000000..e47c505
--- /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 0000000..ff56097
--- /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 0000000..aa426cc
--- /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 0000000..4ba8d99
--- /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 3d5291a..b552cff 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 0a49f36..913224c 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 f922c83..da533d6 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 961f083..5be1475 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 377ad65..f6ca706 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 d8d83dc..f88b99c 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 0c349bc..bd265d0 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 bb1fa1b..5886479 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 7da085a..301e149 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 9e2c63b..9515a1a 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 4ff6973..672ef7f 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 dcc2dec..4f7acb1 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 c83d047..cce3934 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 ec476e7..997de7b 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 5aca687..85384ad 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 cb68c11..5aefdb9 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 5f62949..52fc156 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 a2ff7ca..e6c7717 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 6346538..6c3c693 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 6346538..6c3c693 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 b69deef..54611f8 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 949a062..756db11 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 b69deef..54611f8 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 949a062..756db11 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 9c6c746..2a6c262 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 340b5f5..4b083ca 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 b856ee4..ae72a3b 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 0bb8c25..bbefc2e 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 bcd34a6..b629576 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 1db30ab..a571321 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 97c685c..f381073 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 d2d590d..ae7a79f 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 505162f..0e2929d 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 aa810f2..086e28c 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 d2e89c0..9b10ea2 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 1656e58..64c502e 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 a1c4ffa..0572b10 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 de67f05..fda80ee 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 d1939c1..2f47272 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 6c5eeb3..0797729 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 4a805b0..c354f84 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 0d3ef19..d0d4018 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 a87a4f4..7a208f8 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 fe79c44..e9dfb92 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 762835c..1feb57b 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 3bfe19f..2544c87 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 8ca8a03..d370b97 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 53c5bcb..9f5456b 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 140b06f..281d986 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 855ea36..00c69a1 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 897916a..b978af7 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 cdef1d7..83729ce 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 c3df2c3..73ea7de 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 5120256..ca0bf0d 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 cba6532..3fc7308 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 7eb6180..fd1f6ba 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 438bd61..1cc322a 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 6cdbc69..74ec2c6 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 a2f5204..64f5652 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 9282e62..beb2532 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 609b22e..ab24633 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 30c5dc0..a570579 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 c0c138a..768dcdc 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 9ccfd5b..d690eff 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 75856a6..b915218 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 fff2e14..bae16e0 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 207f924..45461b8 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 68a8ddd..9e4f97f 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 b0d3cfe..3c40380 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 564e560..1f5098a 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 f073fa1..d67a3cd 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 0acd405..bf68ff1 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 4c65b08..d7332e4 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 03fd129..a933270 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 b6c0fcf..08baf34 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 8bc3421..5c5b63c 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 f18998f..257f9d4 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 2861e35..b118520 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 774f6af..4f7ca19 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 1712b64..a296536 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 2155192..70af0ae 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 0244c98..3f2918e 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 f990ecb..c514592 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 84ae9da..30b098b 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 4429d97..a1a55ca 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 293f10f..92d9437 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 8580115..f4bc17d 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 9712716..6f319ae 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 a4b004e..75e97d8 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 6b25294..4d1ffd2 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 a6e8083..00e6b75 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 2d8e728..8239018 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 35240b6..5433f9e 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 816b2f7..8ca1e2f 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 e7bfca5..8ba3bd1 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 079e7f2..9c86eed 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 c7255d9..f2abfac 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 218a51f..46f5055 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 4ca2f86..3160a0e 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 e3f76d8..e0fc16b 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 41f1f61..3a27bdd 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 9f118b6..b035145b 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 c9e9c86..d31dbeb 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 f919570..5f68d81 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 e63d18e..7a32b87 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 cc94efa..944840e 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 4f894d4..00f0020 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 7ec95b5..91676a9 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 fe51c69..93b1adc 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 5451fda..985cb1a 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 3908a0b..ec8d7eb 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 380643a..65955d7eb 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 44031a8..d4e9eb6 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 c5deb73..f39ebf5 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 2578967..7d520fe 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 32ab714..6dc0efb 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 13b54d6..9109f36 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 afedd32..92cccf5 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 1024e2d..3cac952 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 0c4536e..24bb8d6 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 ebd5b14..5ffafd3 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 9f5a7da..4c5cdbb 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 9f5a7da..4c5cdbb 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 866c840..cdd844d 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 f1a1a58..d7c89fd 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 8bfc269..005487b 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 c83c692..2a22853 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 cec2e38..edfac89 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 348f59d..8345d1f 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 dfc9dda..2f531ac 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 d052745..03003d9 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 ba2d833..1e59a10 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 49d2b1e..237247c 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 9491b51..02af5ce 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 fe20954..890cd32 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 d74cb31..94fa3d1 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 d569d07..ac761aa 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 1ce78ac..d48115d 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 811a219..ce1644a 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 f8fd167..79ee89a 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 cad484b..c9cf7ac 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 4db40cd..039ca72 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 17a42d7a..6ce6ecb 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 cd23a0e..05443d2a 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 03cda81..8e34d77 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 09e3827..d72b7d9 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 44c1ffd..12b6389 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 bae2a50..3afc125 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 f57aaea..230e17d 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 ae6265c..84039d2 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 fb36894..590fda9 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 c8c1d13..40cd91c 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 0fc11af..acb8d1d 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 d29b99b..aa8c96e 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 e017c56..0d289ac 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 eb9ce57..c71c8c6 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 f57aaea..230e17d 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 870b400..c20844d 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 5b6d25c..54fa4db 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 e94f063..0ad7dcf 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 9853d74..acc049d 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 a3156ab..680b7fd 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 32ad798..bc24a7a 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 5996b53..4ff3014 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 e4b4a3f..a0e889c 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 8bdbef3..f45083d 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 45b2f56..48baee2 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 e4bddbf..c29e2a1 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 3033cc8..e8f016d 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 2d05d98..978a886 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 d24a4ee..c8e06ce 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 fa38c75..bb4c62f 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 2b65198..0798863 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 0f77aa1..502209b 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 a269bca..b0f21bd21 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 fdcc522..389a46e 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 076b3e8..6445699 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 1fa8162..46d3a98 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 8149d33..a322265 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 80ca82e..a34014f 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 ff41696..6aef9e3 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 38d3765..72d96d1 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 47034dd..6da1cc0 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 6acb3be..19b4558 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 baf0d16..96d78fba 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 73299a7..143ac0d 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 fa0bb0d..118cd08 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 8149d33..a322265 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 9f89dda..b631ca1 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 3d9e9d4..1ec7984 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 8da82ce..4a260d7 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 4da03c1..2f7f9f68 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 2701a2f..e2fa4f1 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 f11a862..e7d3110 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 a10d588..755eebd 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 6aca223..463e85f 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 065f715..0c9c56b 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 d9cc173..11c1e21 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 3c2da8b..5d9a289 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 5f58bd8..6abc33a 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 e6a17eb..5643256 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 00646f9..1ccc67a 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 4b2b0ca..03b539d 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 112dfd2..94e9b24 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 ef11dbb..9bfaaff 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 2ec921f..323d2fd 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 6007b08..36a46c6 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 323324f..c661742 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 c7e98a0..4f77929 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 25d0392..e2c3f61 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 f6f36f4..db1874c 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 1d2b940..6113178 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 92a601b..fb51d09 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 2ae6f3b..0b973c2 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 7b6d410..53fac3c 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 7310da4..f5bdb96 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 0a00e0c..1cbb6ae 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 0df13f3..8c87b45 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 7b0562b..f9e1e20 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 8c4d469..67b3186 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 68ea146..9782201 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 2fae265..8f0dd71 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 5a75699..505a990 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 67f5835..8def1a1 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 9bdc71d..b6af147 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 0000000..45df4b0
--- /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 0000000..9ceb007
--- /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 0000000..bddd7c8
--- /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 1c158bc..fc4db87 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 0e362546..8f1be74 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 70ef768..cbc6b5d 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 e880e3e..8d6a26e 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 2836a54..d95fe2e 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 ffac66d..af6143d1 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 92f1431..d62955f 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 93e2d9b..5d6f195 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 237201f..d956051 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 53ac3fd..50a7d2d 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 278e645..a015c1c 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 cb5b016..05f78dc 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 d91396ed6..df4f545 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 6c2bd9c..be72ca2 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 9c7fab5..cf91e9a 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 47d5065..1fa2235 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 a392431..2839544 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 e64c3e1..a19f317 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 b4bd5f1..edd3c17 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 d30b137..58eeabf 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 c88ced9..0fb3423 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 2ceee8d..85760b4 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 22bf892..fe8ef8d 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 7f2db74..34673dd 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 a5913ca..f6ffc30 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 d0b3672..c6a4f3f 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 07f2907..2411d50 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 d3a4877..91bbabb 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 8cdef10..5993a4a 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 ef53f99..9e42157 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 4815d0b..1d65003 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 8d6bd14..7fd5445 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 c954450..88f8a09 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 0b7d96c..2201f1f5 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 04587ce..bfdac79 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 ee29b52..a9a1bf3 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 c2a29e5..8d8c04e 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 23ab60d..cb5e58d 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 636f12e..f6cb59e 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 9ee68cc..0e15bf2 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 e700ae6..01bfd95 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 b3225d2..9b597cc 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 5487dc2..7404a21 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 a2fc62c..9e44764 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 e4cdc94..496ab7f 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 d4aa53a..c087b41 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 5668f66..2fa9dec 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 e4cdc94..496ab7f 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 e4cdc94..496ab7f 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 9b3b773..3cf0aa6 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 7e5170a..f0a1807 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 5eb2822..f98e7ad 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 56dc92b..e6d1e06 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 2e9c461..3c15277 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 009e050..7575292 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 c478b73..7c10f9e 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 2ec4f74..6f271f6 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 fea908b..652b24f 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 e0b9fb1..6002976 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 082496a..bc35705 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 82dba2b..4c2f73a 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 3c661fc..337e544 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 2c1a6d1..8b93008 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 d3e394e..6e86886 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 6d225f8..72c7205 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 5bfc3fc..d69955e 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 fbef435..2bcab08 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 36b17d6..e0d4102 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 e03a810..5137bff 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 7192409..b329fae 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 2b103c5..26fe5de 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 7e2d859..6565d41 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 f8824cc..15bbb7d 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 e5af1ea..f935325 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 0fcf5a5..7c4eb8e 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 8e231ab..705b67f 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 0fcf5a5..7c4eb8e 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 8e231ab..705b67f 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 8598f1b..c5fde2f 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 8598f1b..c5fde2f 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 e4b9ec6..c4b8ef0 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 2ecbec6..61ad16b 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 8fd8edc0..b789af1 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 7de5ad9..4b0157e 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 b4bd5f1..edd3c17 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 4912601..017b805 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 ea51b9d..373ae03 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 d30b137..58eeabf 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 c88ced9..0fb3423 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 2ceee8d..85760b4 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 86a742f..e398b2b 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 22bf892..fe8ef8d 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 7f2db74..34673dd 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 f1a3591..675cf0c 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 3973b3c..619c3a1 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 cf72007..d1c8644 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 672d43e..1c5188f 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 d91721e..56633f0 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 7b830f40..de51002 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 7a2bc5d..68528fd 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 a127111..5fb8c04 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 a5913ca..f6ffc30 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 0931776..8c09f63 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 cf87b12..eceaec8 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 9d620d2..24db363 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 106daf7..fa7ec73 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 45a7dce..f8b26b2 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 143d7c5..54884f2 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 d407f02..eb8428d 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 d0b3672..c6a4f3f 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 07f2907..2411d50 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 fde1226..9f6376e 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 9032169..e27d0af 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 9763599..8808112 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 fb5d0ad..ae19ada 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 a4ae3da..cc3c209 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 12976dc..e1fca0b 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 ef6cb3f..a386b2c 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 ef6cb3f..a386b2c 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 d3a4877..91bbabb 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 2de79fb..34939ef 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 5395244..4dbac99 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 a655430..ac2e27a 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 d8370e5..16d95bb 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 b68dddb..48c5d90 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 004d1c8..b7c61ca 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 852f90d..245d7d5 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 fdb440f..04703d3 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 a4e08e9..9af9419 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 8cdef10..5993a4a 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 ef53f99..9e42157 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 b4bd5f1..edd3c17 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 d30b137..58eeabf 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 c88ced9..0fb3423 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 2ceee8d..85760b4 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 22bf892..fe8ef8d 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 7f2db74..34673dd 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 d91721e..56633f0 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 a5913ca..f6ffc30 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 d0b3672..c6a4f3f 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 07f2907..2411d50 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 d3a4877..91bbabb 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 d8370e5..16d95bb 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 8cdef10..5993a4a 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 ef53f99..9e42157 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 8785c26..67028ea 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 2a8fc75..2bb6dbd1 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 043179c..8fb2feb 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 58f26f0..941b037 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 9cc8962..9b7e5f0 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 fd73e5e..ea112c0 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 750377e..f6d5b1c 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 9c3f49e..31810d5 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 d8fbec5..bdc53cf 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 050cdf3..4d58377 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 ad017e8..ccf12c2 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 2d69162..cb7468f 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 3daa073..9eef398 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 d748610..3ec7ab4 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 04c0e17..de71f51 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 fd5ccaa..bea02f3 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 35a4370..86da30d 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 469d381..eea5365 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 10ded89a..ad68821 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 d2ce3ae..5cd14bc 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 ed693cb..c4565a897 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 ed693cb..c4565a897 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 c8cc152..839ea02 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 ed188d4..e89a244 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 6458658..625e45a 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 781b142..4407851 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 b3f97fd..9b27975 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 7631602..9cc02c4 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 944441f..d8222e2 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 ed188d4..e89a244 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 6458658..625e45a 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 944441f..d8222e2 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 ed188d4..e89a244 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 6458658..625e45a 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 ed188d4..e89a244 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 9646976..9b8518a 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 47438b7..9a90230 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 6fabf72..931b864 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 6b89227..ce16875 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 cf0fc13..33b53d2 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 6f05762..f07d796 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 da15ebe..4368652 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 c9cee6e..20fdd5e 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 c2561d2..4a0483b 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 67ec260..c0d4364 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 1560a3c..90cfd40 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 e5e7cd4..3eabee7 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 fc0bbd7..694dda4 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 443dd80..57cb6d7 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 b90f1e9..f49569f 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 339569d..2770aee 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 bfab759..c25e4db 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 f76d044..2de69ca 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 0b5f756..94b9bf5 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 bb708ae..bd3fe14 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 c761a84..8cc5c77 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 c761a84..8cc5c77 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 4970ac5..4be0ca3 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 82971fa..4c256c9 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 c4518d8..224822e 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 d4c18fd..9278ea9 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 ff17c72..07e97cd 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 e223599..839e252 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 f9f6286..15f712c 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 81224f5..19411a5 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 5305945d..09d92f5 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 663b15f..951aea7 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 8a8be5c..5b26321 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 d15775f..c9bd2c1 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 ec27e78..25c85d2 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 3ae6b1e..4b77e5f 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 ec867fd..15d61c3 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 4a391ad..2a3e373 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 f9ddd36..a696c1f 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 e9df5f1..fdb9a82 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 4b350ff..e334a7a 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 36a28ec..5bc2472 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 2eed362..b46c735 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 63097bd..9032a9f 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 095a8a1..4e4f1db 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 603090b..d1875c6 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 b60af65..a980f3c 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 7f7b9b8..e5b8967 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 5269801..41135ca 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 54f7f8d..d2969c2 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 20924cb..6f85b2c 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 9178eca..b0e2214 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 187efd1..c9eab46 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 714798c..7173362 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 3f9db06..b6d7158 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 78e5c87..3a55f9b 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 1113314..2257029 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 f66de44..80c8118 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 5c9fca8..ffad59f 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 9b4c85a..a8318f9 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 459df50..8fe0c40 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 b31cbdb..55f1109 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 1cad7d7..5eddeb6 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 3f71a91..e99e7c9 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 0855093..8866659 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 3448947..540e688 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 926ffda..246f690 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 ba0a652..a8e67bd 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 98f83d9..e253008 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 f2bb18c..6e70289 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 273c132..e4c793c 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 366809b..176278b 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 366809b..176278b 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 18fbc38..cb70f94 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 16669b1..a2776650 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 cb29bde..0623b04 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 17d8486..f1a92bb 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 5d534c8..b325e44 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 03707a2..6c71a16 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 556eff9..397db1d 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 cf43461..735c60f 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 de8a1c4..0d6a234 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 b41f8a6..b4ceb93 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 ab29959..0b1faa2 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 cd79403..9784522 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 23da6f7..fdfc95a 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 97f40f0..5147ef5 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 bf3f767..c187e80 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 8e8c236..7390460 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 5b7e7bc..35ea2ed 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 5bd4f4f..aa31d92 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 82e8d52..59aa950 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 97a01d3..4b435d5 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 3ce26f5..1713977 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 e7df1a5..633cc3d 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 1976c3a..f2766ae 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 123f18c..babebd3 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 41cf23f..1003a8a 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 6e925bc..c6ecad0 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 6e925bc..c6ecad0 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 e4c52ad..d3e80f9 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 83b174d..02fff7c 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 f9427fc..ec58282 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 9ec036b..a4f0258 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 59de4dd..d526a3e 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 2489690..ac990ef 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 d23dd23..401ce43 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 ba90c9f..e179403 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 c524f90..119af59 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 5b9f46a..e0999c3 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 81d02a8..8e59157 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 87eac40..9a64ec5 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 0a3c129..7448873 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 51d9745..1b2ee6f 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 a963469..1aca9ed 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 3b97285..261719e 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 6a472f3..57c1a2e 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 856774c..e4d6c18 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 0c1cc47..f3c0863 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 387a7dc..13e1983 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 df6267f..627e488 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 43af87b..11d5954 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 4d3e387..1fef049 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 2b3fe7e..80dae44 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 5a7f60f..c9f25d2 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 b78d2ce..54864cf 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 933adf1..fa995d2 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 0b23083..0c4fa1e 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 af1a9dd..aeb09c8 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 c9d7b30..477a84c 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 6e925bc..c6ecad0 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 6e925bc..c6ecad0 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 f9427fc..ec58282 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 6064e55..61b56ff 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 75e702b..51fada0 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 1d8cf01..75be37b 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 b619709..0f91d82 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 64f05b8..ed9ca9f 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 74bccc9..f5ecd17 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 b7d2869..0e82ba5 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 91e2533..854b629 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 34441f9..9bd0de1 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 6d6f4b4..96f5266 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 6c8a6a4..8127f92 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 e96804a..a1e9c32 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 ffca9b1..32f0936 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 23b5b56..786a265 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 19dce28..86a126b 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 c4c756c..55ce050 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 ce4f54f..6b378a4 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 85892d6..baa358d 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 b53735a..e9a7f32 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 58b9498..582193a 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 a8c363c..db05a74 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 07ef418..862bdde 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 8eedcee..063e766 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 1b81f5c..4061e3b 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 975e574..e31dde9 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 6c34dc5..a82b74b 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 6e84e81..67973be 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 15d7869..01d2d32 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 15d7869..01d2d32 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 5004077..1d0d24c3 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 2102186..a81743a 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 2a577cb..287f914 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 c492304..5f5ce5a 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 8e8fcec..37dc086 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 323729c..438a5ae 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 c594362..1698231 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 6733bb7..15c030d 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 7f01b96..dadab16 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 20a736d..fd3f7f7 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 6d933f9..b55d91c 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 c47c4ec..0540785 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 6270c26..d2903c3 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 cbbef1e..b738d79 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 60db660..7c88d72 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 541c5af..cb8fbfb 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 67c8f44..e30b01a 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 d53f313..3341cc6 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 cb1b1a7..0e259ed 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 e642c10..45b2019 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 02d8163..016e508 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 7286026..b23ecd5 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 c0798c8..2f6d23f 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 827a031..c3522b9 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 d6aac87..3c1d788 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 267ce26..12155b2 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 7b73655..ba52837 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 8d84e3d..7708c52 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 8d84e3d..7708c52 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 5eea46b..1b63000 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 663dfa2..0c570f2 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 750c817..65071d1 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 2499b91..16d35a8 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 d6f09bb..f6542b4 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 4d7e72d..8128235 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 814bb76..32e20d5 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 0224918..38e959e 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 c1ca467..46c7973 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 9e17438..9d472b6 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 003ec20..8e3b3e3 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 3c8cb4b..3db87b7 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 ad658a7..4494404 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 2a06507..88dd720 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 3eddcd6..d2ffa94 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 008b2c2..b1555bc 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 9510d2c2..7d2580e 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 6b619a0..6ce79f2 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 dfd8aaa..e0aa0e1 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 182c8ee..52791c4 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 54b77a5..46caa88 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 fdba987..d24a500 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 3905932..65b9395 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 98a4288..dc71164 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 e6bc02f..fa067aa 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 4097c96..33f401d 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 4097c96..33f401d 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 6b619a0..6ce79f2 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 6b619a0..6ce79f2 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 f6b0d4e3..75def8d 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 398119c..b94b1bc 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 1babd1c..34fc779 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 092f3e3..82a3be7 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 dcfd0e4..6327931f 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 7ffe100..302dc76 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 2eebebe..ac3eda7 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 66a91a1..9c22e09 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 5de0560..1436f27 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 4840030..4cf5aad 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 f9cee71..704e9b1 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 9e7a43f..eaf6222 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 098f6c4..c880659 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 ed01727..6ec5257 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 ed01727..6ec5257 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 5e62ca2..af76aab 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 34b87d5..d55540e 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 610e68d..11457db 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 607f45b..12c78a0 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 a5f84cc..52eff75 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 52e1b51..598be06 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 b357335..98cfbee 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 ffcead7..f057529 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 0766194..73be275 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 3dfc62b..800c808 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 4da57e3..2b6b437 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 1b4ef80..d0190b7 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 72c4fa1..28c6427 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 2289e5c..b34da65 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 086d517..4f60928 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 d1d9135..ece600a 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 d8271fe..3c05014 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 4ffbb78..8ef2528 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 0a1bad5..a958340 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 e354327..039d2a6 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 c1f0c771..8a2bf2e 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 7717d38..aa8a6bf 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 64aca5f..6564e67 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 36e24fe..b175519 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 28b52e4..06676bf 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 5eccd07..25f04ae 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 3841c4b1..6d2594a 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 33c45e7..e68adfb 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 07d0a00..5cf54e7 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 d04c02e..f866d9a 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 6be5885..8c3dc1b 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 6a6875c..341d83e 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 2b358fc..41616db 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 70fd14e..8348500 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 3c3dfe4..99b941d 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 e823100..d2b7e69 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 d9fa698..e3145f0 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 623413c..1b3ea4d 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 35aba42..e188118 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 a6e9fe6..0feb231 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 81a587d..17f1665 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 b972e6c..5621f67 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 b6d0d95..c1b15e5 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 b5c864e..b19d604 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 27db478..0f3cc3b 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 1b5ad93..a7222bc 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 37e2713..e559a47 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 e7d7a66..5413b56 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 4807900..26ee1d7 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 44abb20..7e41c45 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 466132a..a2d4086 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 acf4376..cfb4693 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 2b7a8e9..11d5a31 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 10336a4..bb52606 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 dd2a069..45c5b3a 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 3e032a5..93a765d 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 5c474e9..4ae178b 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 9225f64..4f4efc0 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 2f4d1ce..d6bbc6d 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 e8672bc..46275ae 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 907ab4e..39b135d 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 29fa64a..7eda0c1 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 e35b033..2cec6d6 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 2fc4f84..96f4bc4 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 623413c..1b3ea4d 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 10ca373..097acdf 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 8ccf86b..2618407 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 be673aa..5f14353 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 6a3e142..b64915a 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 83ecdb7..c26670e 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 2894544..9fbdac3 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 09b5b00..626c799 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 db33282..34bcee1 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 d586383..26906d2 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 e68d224..8829b05 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 2ffe9b4..6c76c1f 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 61bf255..c3f1379 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 309388d..e6eaa48 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 71400d6..dfb64d6 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 dc93c28..2fe408e 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 f864bd4..ea1a1e6 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 ee5be0a..c71bdfd 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 0fcdb75..ac0af53 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 eade977..1444bc6 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 f1d35d0..5d3a0d7 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 2eed280..ce8429f 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 e73e42f..1836793 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 25cdead..5364217 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 1ce8ba5..33bde01 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 4c070a4..c538be5 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 2abb171..3ab7a3d 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 393b5ec..26c5048 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 5c2b421..606f7c6 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 f97050e..475b1a2 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 2ba65e6..3f9e935 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 379caf1..81b8794 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 b31430a..fdb71614 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 7a497f7..def4df1 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 08bdc75..a540d54 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 3508266..4de5a2e 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 c780c37..7d1f2c3 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 b2668c8..eccd32d 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 e40e506..d64d7ec 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 29d832f..3ccf913 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 cb90172..058edd6 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 008e068..e899ca8 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 93265da..6e15db66 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 e8a3675..a2ba97b 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 1c29b98..1098f06 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 8532265..d5a15ff 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 24a6061..3d97e32 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 3504ea3..bc850a6 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 9bc8aea..67476ff 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 2a43736..d15e543 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 b653725..1c33648 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 b653725..1c33648 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 97289d7..0e118c0 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 79f2690..ec484b5 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 041da4d..c8d9dca 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 3898704..685ebfa 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 05f8544..ea2f0a3 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 a34800b..7946cb7 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 740c396..d545a0b 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 162973e..17d93f3 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 3f307db..9f4ace8 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 8b9ede3..5779046 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 32855d6..b90d529 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 cd2b9a5..fbb03db 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 f6ac5e1..d323f0c 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 030ec3a..68a7147 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 a2c84d9..222112f 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 d5be1d2..532c2c0 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 597f326..b73b805 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 60a89a1b..9bdde53 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 79dfdc4..4bf0c4c 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 6217007..9ce6db5 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 6217007..9ce6db5 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 aca4ea7..41e9e05 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 61a11bd..e76e813 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 e825bfe..8dc1e1a 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 b1e5d84..242d537 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 da4c1fe..cda3f9a 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 28e3d60..7343efd 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 3b29af2..4457cf8 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 a6478c2..a761c58 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 61f8e0e..de2cf84 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 d7df261..7058d7e 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 34b26d8..39ad082 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 05e2284..2fd1fdc 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 a07b650..21ea97b 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 d023a65..9eea06d 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 892bda4..7ce39f4 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 8b15a77..0322e4b 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 4f2b7c3..3d984e6 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 e63ca1c..43e8640 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 27a081d..5136a73 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 29d9ec2..08dfee4 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 8c43602..1ef4a79 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 b49da94..1481c96 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 ee0fe2e..086155f 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 2160171..beea252 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 0b41fe8..311b083 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 606c9bb..89547be 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 fcd400f..9b40b61 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 90996ad..8239ea2 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 72044bb..ad6eb51 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 23aa974..710f7a6 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 b40c41f..8b350fb 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 ad5eabf..a183b53 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 7217f53..a3c479f 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 be379e4..fb2c3e5 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 46c7f10..fcf9422 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 2d8124c..7b7beeb 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 aa0e1a5..18ff5a3 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 d17528e..068873e 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 031aa3c..b351cf8 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 16c9960..bea2611 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 d147464..77891ba 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 a7f3acd..a3ae371 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 b94b656..a280db4 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 b450b90..b2d3c5d 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 b450b90..b2d3c5d 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 a12c803..41c15d1 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 d17528e..068873e 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 b0a1ca8..6da0372 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 03fad46..78b9841 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 a3e0728..b74e4e4 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 96293c3..a20a1b8 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 29a321d..1b06743 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 e068e35..100424d 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 68fa2ab..22c49e2 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 3a5cd76..168a40b 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 2bbc4cc..b04062e 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 04cac22..d8837bc 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 fb19521..fa8b42c 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 49386d9..c523fb8 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 f1abfc2..b237015 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 dcbf9646..f1f2f2b 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 8f4e096..d1c86f2 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 83e85b6..d453852 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 29fb30c..5cbbe85 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 fe5705e..3aca7e2 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 0dcd5ab..b577637 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 dd76d90..7777669 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 107384d..8c37cb3 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 0f46864..3235b05 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 4d0b496..180a804 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 523f073..461eca7 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 dc3f033..1a91391 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 aa515f4..4aec3b9 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 ecbb50fe..231a8f5 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 d7e3eb6..bf5a6d4 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 8120383..e2bd51f 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 b171593..c426de6 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 0700210..75848d8 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 4de1d0b..0044888 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 d25a283..3c1010e 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 4296366..daaa559 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 187ae4d..43fa1a2 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 6ee50a1..8d4abad 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 9c4abc3..cda752e 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 33e856e..4a339c2 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 ecc07a7..265acc7 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 74c127a..e0d066a 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 f5acad1..9b9b7f2 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 a742632..7c750bd 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 a91c7ff..cf837bf 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 6e7282a..5c4e326 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 30d99e3..868c61a 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 0502976..2540e5a 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 4507a9b..f6ab9fe 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 68aa358..75bbb05 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 846f59c..0f375bc 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 d768ce0..2c27ba3 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 9aa6718..2f75cae 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 3a300f8e..820eddd 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 b1834bd..8417196 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 aeef33c..ec11330 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 eb35054..08516dd 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 37ffeb0..506010c 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 e528566..75dd9f4 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 1405ddb..b4ff2be 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 e6b4fab..89e5aac 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 e57f78b..5167304 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 d9157aa..9666d0e 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 8485eac..041d332 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 bab0c37..9c96491 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 eae2fdf..bb408ab 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 b470c20..b1f683b 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 aa3e75c..55f1fe0 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 6b6460e..7f7cc24 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 b0c583a..ce84de3 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 64fafeb..d3b20be 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 5edf508..26455e9 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 88d2b32..f737dc9 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 fd495a5..351f305 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 1ac7df9..e14bed3 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 07d8b38..6c76799 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 614920d..cc01a0e 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 00ac6e2..d867ebf 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 9fff1de..4506227 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 7abdea7..478083c 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 2a3dcea..c2f4224 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 5779987..3d219f1 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 29b4bf2..3c173da 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 11befac..8c030e6 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 792832b..ac521a3 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 593bc1a..63de768 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 6b6fc7b3..6588b16 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 68483ad..5628d84 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 510b058..8ca6002 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 f0d203f..dfc4bb9 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 09f7489..bd7774b 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 30c82fd..036051b 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 34c1f1d..d97e4e3 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 0990a25..ac84548 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 7742bfb..a0d5c36 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 b54839e..1456a8e 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 36d5f9b..e714b28 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 25d059f..c66e5e3 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 c2bce5f..32012f3 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 499ca24..8f5cafe 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 5c5f58a..8548d16 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 e72b670..f347338 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 13c9085..04b3728 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 d11e4b4..869a4a2 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 e704f10..925f96a 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 a91b6f8..9ca4159 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 9a8c9bd..63b82bd 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 7b0430a..06d934f 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 b79e67f..fd6269b 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 cabd579..caf35c9 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 197a650..c76d18c 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 0cb6a90..a101692 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 f640b4a..0264961 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 83cf88a..82547fb 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 cd9e5b0..a2bde40 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 016c014..6eba8691 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 1e701ce..5bbeb5a 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 3d1b091..15c50b8 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 732d101..62489ec 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 732d101..62489ec 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 9642ab3..b4b1824 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 9e2e45d..0250fb2 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 56cb3b5..09d8777 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 42dac83..7a834eb 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 6ef2567..d80c38e 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 1571370..551b8ff 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 fb6e711..531d750 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 29b4bf2..3c173da 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 3a300f8e..820eddd 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 bade154..ad0b272 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 cb9f782..0e6b201 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 3dcd841..abb03ac 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 91826e1..6decf3e 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 4d0f5b5..1229289 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 7bc3d02..39dd1ca 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 4f3f477..fccd9a3 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 ce54c8c..b630df0 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 1988ed3..e6b33bd 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 cf6686e..5778df4 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 82c1724..6a9189d 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 82c1724..6a9189d 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 798946e..90bc076 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 a17ed77..8cd8b22 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 9aa4ef9..b9d78cc 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 e592e72..4124b89 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 37b619f..b417482 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 e048420..7f29c7c 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 63a22fd..d5b83e3 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 ce31a02..71387cf 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 76de94b..671061c 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 a987c31..7eebb60 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 76de94b..671061c 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 a987c31..7eebb60 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 3229790..a0d5157 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 31c81a9..001cdd6 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 f1b4a6e..e1661e4 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 43d010c..9222dbf 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 2b0b177..1e43ea7 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 513fc8f..a5b6740 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 c751c1d..4a7659f 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 86911b7..7024e44 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 b65d875..9ed4ded 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 3a81d4b..cc7dd58 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 bcba563..2089ae0 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 760d798..5cd6e67 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 1594af0..a35ec40 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 e01c3c8..6f7f650 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 e281781..0e57294 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 2c393e3..91afd76 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 16c2863..dfefeb9 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 0820f15..e2c4c4c 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 0ca8d83..f7d776e 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 5d88346..6b7316d 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 8d28bb0..76909c6 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 327b5e9..fe45b51 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 6857eba..ad74b3e 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 275fa44..03f7a64 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 210a7cb..1a1eb30 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 555afc5..e325915 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 972f50a..8f065db 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 820a384..7dbf71d 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 fb15e28..fb51dc9 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 5000fd7..5fc6bdc 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 09436ac..35b4691 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 ec56731..aa28308 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 e2394eb..516c365 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 d1006b8..ee9f649 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 f0bdce5..7733116 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 b95e742..6667da2 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 f713670..ffa64f3 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 a38eb0a..da3c6ea 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 5ffea7a..0c5c114 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 3d1c7fc..3311e4a 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 e69718a..c4ea71f 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 f695db6..37c450b 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 522ad9e..094bcf0 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 b0f3f39..1cbca69 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 3e83454..648743f 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 ac1b95c..a2a7759 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 0181e72..5791951 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 f22d2d5..38656cd 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 33b6e68..873b367 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 6df3bd4..f04430c 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 84f3303..b12d49f 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 c4911e4..6ccef82 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 8b6ef46..934635a 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 895c865..f8ddb92 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 36da2a0..ea0b7a8 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 b3281e0..cf2d7e0 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 f6995dd..537f96e 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 59b6331..82a4188 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 e9d0826..e3d41bc 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 b5f407f..e7d051b 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 507fbea..a24c8d0 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 e05938f..37c103a 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 74a5503..c7951fd 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 13ef61a..0176b09 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 827a066..9ce1951 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 3167b8f..35d15b5 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 5f3f02f..80bb810 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 c76c9fb..453ceca 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 af71193..c52a983 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 deee1ee..c0ee1b8 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 8075c15..8ae9dca 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 94b69bc..8cf9f1b 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 0636a786..e41f2df 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 ccdb130..e30d41d 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 20a6972..69f07b8 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 c9eabeb..390e13b 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 39d09c3..0358858 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 310db5c..59c7941 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 779ca04..d84124a 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 77d5f27..b65af4c 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 23fbaf4..edfdec5 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 1f0aeae..feb8f7b 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 5eddf05..e8decdb 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 9e21936..36402df 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 201adc8..a98c0f0 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 9b173b50..dc2b7fe 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 77308b7..edaa88e 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 2c2f045..4dd0f2d 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 3004024..9947e43 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 08ceb431..305a3be 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 fdc2669..74f6dd7 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 ae121a2..f443c50 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 1e1f899..7e87cca 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 9f83261..4774420 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 6d948b0..642c1ce 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 f0f89d57..2875cf5 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 ace7245..35cf7de 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 5cfd3ba..13bfdb2 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 4ba4bc1..cea828a 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 c93a522..01e3bb3 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 d2eabe4..6438fec 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 aac52a4..aa4d41d 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 93ca24b..3d2c064 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 f6256cf..993348d 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 e5df083..de9f748 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 3389ca4..8905008 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 779aa0c..6f8540a 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 9049c12..e950218 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 8d1b7f8..10cb67c 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 5b0c9b2..84d68c9 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 af3b68a..b19da21 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 3e8d36f..80cd6db 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 94f0163..02a7892 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 43b122d..321f4d0 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 988b02b..3851d2a 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 a2d88f8..e70ff13 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 de9b13a..9d9c3f8 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 eb36ce2..e430654 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 1d14247..e208a48 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 15c72d6..67dc8d5 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 1176977..706194b 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 69801ae..225eb9c 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 ebb7363..43e033a 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 5166afb..105e3e6 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 a6f22a8..6279261 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 2ebfc9f..0e473a4 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 08694dd..36fc946 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 3e8fcf2..7889a72 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 b74c8c9..73983e3 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 0c9bbe0..d7fe34f2 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 afef1ab..e3efea8 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 43fe60a..558e03b 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 fe8a377..e18a65c 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 1b433a5..89288b0 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 4b8b55d..843d2c9 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 b30d8af..fa2d4d2 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 375e8d0..6b94d19 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 0e4b1b7..683fc33 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 63f10c3..a798e7e 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 d502bb2..a5ffdcb 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 44b6d7e..8078f45 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 8caff27..b3dcc76 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 12f5b50..54d1082 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 b3bb76a..fb20b31 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 1ce8ba5..33bde01 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 ec70723..c881b44 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 af5f5b8..8dddf17 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 ca27a57..798307e 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 937123e..2701651 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 77513ba..d8c2b73 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 bf065f3..972b2e6 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 666588a..f6f1a41 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 bbfa4d8..5694b9d 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 8dfa97f..2c9cbdb 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 8329eb2..bad00d9 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 1ca65b7..9e28961 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 1ce8ba5..33bde01 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 3d0e95b..77e3add 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 e887466..9b05cf4 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 202452b..aa27cd5 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 a28d8c4..c7b314a 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 763918e..28deac0 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 6d6c479..98de461 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 5071627..c9daa45 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 63ded06..cbc835b 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 6452385..659a7ea 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 0d75a7a..56c8a44 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 2b5f5e6..6338944 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 aa15368..7318f87 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 4823c7c..eede72e 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 a86d446..449ac0d 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 0244b1c5..783b03c 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 b24e25b..1693136 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 f8fd0a9..2bd9eee 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 453c0ba..ee2ef5f 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 c09f1fa..00c1ded 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 b549d48..6788329 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 6cd708f..35612bf 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 6f76fd3..53ac20e 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 b188c56..afa0448 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 490296a..99c09ac 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 e8ad6a3..0eb0472 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 6a4ba3f..d39d0c5 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 1ba0591..8aeeb9e 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 b13a1f8..b1ed4ff 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 153fa68..f0862f8 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 2c818da..dfea2e3 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 e01d40f..efba423 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 88b2189..01c6a03 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 253d49e..1592943 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 3c0c7ca..296acb7 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 88b2189..01c6a03 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 bcc3d1e..e27cecc 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 97b7667..b6e881f 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 47bf661..7456dfd 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 1c9e4f2..9498213 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 f89f8ed..5ba4998 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 8d0cf7a..531e246 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 54c9f08..44d4146 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 c0c092e..f5420cc 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 9a377aa..3a79b5f 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 3b49d57..b705fa7 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 3e17dc5..5663fcd 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 52ed058..fe322f2 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 3fc21d9..75fe405 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 8ee5b28..197b3a6 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 c48b06f..c69796e 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 c1b33bd..71e768e 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 da71143..ad59939 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 3e013c4..a622ac1 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 e4686c9..22de29e 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 2764e41..7a65fc0 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 3ced5d2..47fc5dd 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 ca96b04..2711f3e 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 1e1699c..4640eee 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 431bd89..f4b268c 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 a6bc6f2..cc39db0 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 922bf10..acbd1e8 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 0c22c9b..e5d9a15 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 7a2f7d5..9472f380 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 2b0a574..4592234 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 768e727..bb17bdc 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 8b15d72..17ba666 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 1c88839..d5c9c3b 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 1806f9a..b3c03d3 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 8a275ef..e1dc30d 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 6b5aca6..1d70954 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 e094589..3563f4c 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 5b1be77..f2f192e 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 0b9a3a1..0beb5a5 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 eff611b..8773fc2 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 49ec7f2..b3b311e 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 72044bb..ad6eb51 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 db70977..3655ab7 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 505846f..d8875e0 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 d61b927..12a7dff 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 b99f17c..24763185 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 9b07fec..db938d1 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 f2762a7..c249fdb 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 f30e384..a4155e6 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 849ab8b..5ce9fde 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 e9a0c14..d76a576 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 8b5fcdf..3b51482 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 771252f..8e5b769 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 a4d7d4b..f794591 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 943e5bf..0e28d68 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 10dd932..631d19d 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 fce0f25..e1ac0cc 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 1af95f1..f2ca4ec 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 59833b7..82faa2d 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 323031b..4a89f8d 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 552ec86..ed5fd00 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 4038fb1..8d9d003 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 af997ad..a56977c 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 7d1ae1b..18295ce 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 a5d31a6..ea1da96 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 c01c473..2434505 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 3f5b125..e29f087 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 ff95d81..bf15fa2 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 dc68a64..498a66d 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 0679e36..5eb01b6 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 0679e36..5eb01b6 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 8324ec5..5dca9e8 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 fffdc81..c5b951e 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 4781376..f2da82e 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 c585c9a..8e6566b 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 74aa2aa..ba9fbbd 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 9d1661c..b815fcf 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 4490ca1..9425776 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 d761ba7..09955aa 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 fdf972a..0156be2 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 1f27bc7..94f0c2c 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 39beef6..0f88c67 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 2ffb991..3a1774c 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 a69b082..44f43ee 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 57efcc9..148333d 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 c01c473..2434505 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 3f5b125..e29f087 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 26251c9..f704538 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 6bc9cc0..cc17e5c 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 b0c5fd5..60c4b2e 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 1697eae..cc53ddd 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 6686a73..d89908f 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 1318fa9..37a1ba5 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 ff9f463..4eb0110 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 6475520..8c81962 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 8198f03..1391be4 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 e91753f..667e916 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 508a2b4..e96dd4a 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 bdaf887..39b56b4 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 d738f1d..8f6c708 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 1ce0c62..866fe0e 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 ebf85d3..04ffb54 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 73ba8a6..af403fe 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 1b5b6b3..6d58f4a 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 150c652..a57b38e 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 205f6ae..8fe9be1 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 d695fcd..390451d 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 e0c73ad..9494083 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 5becb66..373b7d2 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 fab116a..86141b6 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 4b419e1..ecc31dc 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 bf1575b..49c0acc 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 34cedf3..81ef274 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 6e92e01..f92feff 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 5f7feba..dc24ca2 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 a7b595d..0874211 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 20d4cca..2d01d99 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 da54b0a..27662ad 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 1862d15..830ba9c 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 cff4f4a..2fa8b486 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 76a02c1..795d63d 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 02f5828..58c11a6 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 7c1ad7c..0412ba5 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 8ac8bbe..614b8ce 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 24e5895..1d69e6a 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 923181c..f955c94 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 480c6e8..2e0d05f 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 3f9c3c9..b66bcf3 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 8457651..1d6d1d2 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 47f9c07..9bfb0ff 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 102185d..18ae5c1 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 36cea84..0a3585f 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 a86d7aa..244ddfc3 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 7159178..4e7f69d 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 f26c8ce..4143501 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 4d4c936..b4c05dd 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 44018bd..1e5b884 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 37a3f56..9c4c8d2 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 dfe9c5f..d516a36 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 7eaf830..fc26348 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 cf85e8e..411818b 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 a2ad654..d4fb5f4 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 110e279..60c8be6 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 4b425ae..1d09e1a 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 fdb377d..5276e73 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 5a936ad..df8154a 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 3f1d563..651b26f 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 a9f7e40..582a892 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 f81f93d..d9c7b92 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 10f393e..c26587d 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 ffa95c7..0424973 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 7b3d2ce..3fc87bd 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 bd6889f..f7841af 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 70646e6..5defc82 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 8f15933..8923db8 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 4643579..cba3abc 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 fc97df4..10ff3e1 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 d4e0f6b..2c138ba 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 5a2a84d..fb5f845 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 0006a2b..76f5f7a 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 c76c9fb..453ceca 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 ee4f587..cc304de 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 e8ae444..3b6db68 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 d5228c8..6a64943 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 d791bb7..d3f4f2a 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 27d12fd..1581997 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 6d48678..b7ba479 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 229cb11..80c1d36 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 a7dba8a..20d1caf 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 75373f97..86d3889 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 dc2577d..84a31f5 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 16781b0..2af14e3 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 6dce134..a0d0fbc 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 0794c87..a83ff92 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 3ff29a4..3c43151 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 29b33a5..31c29b4 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 08f2d02..0ba738d 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 c4bfb12..e196240 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 0c9c611..f8bfaec 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 530c57c..e9548cb 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 ffc45d5..69379c7 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 602dec6..6833625 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 fe16cb8..68b4855 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 bf5467e..1474599 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 68af5f8..bb6aec2 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 fa7c964..961d651 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 674c5a4..3c09f28 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 eb6ec11..9fd02e1 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 3debef6..70d7441 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 699c71e..5c3006b 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 543bd38..98ffb9b 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 c980ba3..8ad6cea 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 ddd39ab..dd2e60d 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 56dfdac..e638c06 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 9a64922..6d8071f 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 f7ed636..c4c674c 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 fa3df2c..415bfc2 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 a9af095..fb77240 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 1c382fa..9dc17b6 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 f3e0903..32b8eb1 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 e447195..225882b 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 b0dbd0c..7021e14 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 4b06807..c6061e4 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 19c8bd0..1db8e66 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 be1b4af..d7b21ee 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 e2f2652..c2e8994 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 fdc288b..f5f35dc 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 c2f9c6a..3ed2ac8 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 051f43b..2ba7517 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 c7d7960..9bca551 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 5c3b736..1a5623b 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 8d8cbfa..ff3ae3c 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 9deaab4..41a00c6 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 f7e262f..305206b 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 5cf1132..88dace3 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 9bc9678..24e5502 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 b158ce0..ea4fb54 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 411a387..4754d45 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 e311c3e..4b1e3d3 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 eab3800..e9ef463 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 fc8e231..16763e2 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 b27fd14..85c70c9 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 18a8b1c..d86a6af 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 4ca08e5..84a4ea5 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 e66558f..c61e80c 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 37a6c6a..cf2912d 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 494feef..98217bb 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 767013b..2fd4332 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 52b1db6..db219bab 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 6cd062a..62ac38c 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 09bb4f4..ac19fb6 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 a8cbfb5..8afb28a 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 a8cbfb5..8afb28a 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 122d207..efd674d 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 494feef..98217bb 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 494feef..98217bb 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 01276af..aa441a5 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 09dcae1..fc431a7 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 0c4389f..c6d96b4 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 101bca3..3b32dcf 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 5b1d5cde..1f006fb 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 8e14d95..dbd8af4 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 0205685..a68cce2 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 0205685..a68cce2 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 0205685..a68cce2 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 6dc8ca9..76dd7b2 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 f14c2df..b822a31 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 98d83ec..fee349f 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 3031a81..02c5a79 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 62723cc..c36f8fe 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 24c04b6..26ef279 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 fc6acd4..5cea77f 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 94c1410..00f9b89 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 0aa8c16..ad0a69f 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 9a4ac52..cfbf5bb 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 90e01cb..4e2e5bd 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 9e33a8b..a032572 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 898a486..bddbfb5 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 1cab020..f60a433 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 27d7cd6..9b4a7cf 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 7f07cb9..cc5fbf0 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 3c84a6a..1be6184 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 ac43167..3324ff6 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 c2580e9..5ba3d75 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 c58e181..6439d76 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 e1486e2..aaee140 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 20155b2..1685016 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 e9b5021..bf40f34 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 158cb14..4e27b63 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 12773e5..c10a832 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 bbe964f..a077981 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 3feddff..d5709d8 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 776ff33..977a456 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 a422958..4bb9cce 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 ef7cd72..2dfb0d6 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 2d2e16e..c1aebd6 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 757dc8c..e9b3904 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 06f6819..2263739 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 d7143a7..574da69 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 d7143a7..574da69 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 d6ee27e..9c27fe7 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 2e8755d..ee40eed 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 11a311a..1c50d2f 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 c1a1174..61087dc 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 23d82a6..d4a3a13 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 6757f5e..1d7af91 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 7c0e6ef..9758e34 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 3a1e7dc..64fc957 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 0cab374..de64154 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 7134e63..b9ac2fb 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 7b2351e..6a1ee5b 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 43fe0d9..2060b3e 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 df2667d..3e5daa3 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 7a2c0a1..f678b01 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 399ad7c..e611ec1 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 4afa3a5..bfa7527 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 1ad2b1b..631959d 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 37ec610..a6fef50 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 c594fe1..10128f1 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 e1d896e..6fd4e68 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 2a1589d..e5e1dab 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 71c6974..6c68401 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 1c89297..48bd91b 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 b8c89d6..c24e474 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 831b89f..31806fb 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 5a2f520..9e25470 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 831b89f..31806fb 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 5a2f520..9e25470 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 1b9125e..b64e706 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 8670aa4..86edcaa 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 6f8cefc..967a1fd1 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 8421955..473ec59 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 b47c821..676746d 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 9c2793f..a2af6d1 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 8e12389..4cc3af5 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 58b60c4..62e445c 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 9a6d42a..127cae9 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 f65cdb0..0000000
--- 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 bd9cdbc..0000000
--- 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 0000000..517e460
--- /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 0000000..bc17aea
--- /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 0000000..1d79d5f
--- /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 337a523..16d886a 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 20b0aab..b8799b0 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 70d5044..2c804b9 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 0eab942..befdf2e 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 3738b19..42a2ca2 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 8db37b5..57e86d5 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 8b4da83..88d3381 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 6b27269..4306a0f 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 0000000..e116408bb8
--- /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 c21dd21..6484fe8 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 ffff6cb..89d9386 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 078177d..ffe9fb7 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 08a99fc..7cd4f75 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 ef07567..43998e3 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 d24b056a..a8f02f2 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 358be73..d72b42e 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 d11a024..7e4a000 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 19f2a29..84c3a47 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 e3218ee..5bdf599 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 b7d00e8..fdb4707 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 6fae395..6606654 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 7394141..b02ee75 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 dfb1c85..f474318 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 803367d..a6b21ab 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 cb3de1a..203582e 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 70d4518..9e9838b 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 ee903ea..fba921c 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 e608e2c..334700a 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 da84706..31ed6f0 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 e8c256a..f2bdfba 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 1427e44..33ee533 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 e16f9f8..3012f37 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 f5a5396..b63fbf0 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 bb5d064..a4939de 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 b9a2aa5..ad2ca66 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 3475525..67dc949 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 d102cee..7252135 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 4a78fff..d3c5372 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 5aa0ac6..b1f68e6 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 8d9de113..4dff874 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 d3ed143..228b26d 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 20054ff..64f997d 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 c2c2e3d..e02cbc2 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 aeaa2b8..5038a6c 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 3c78e53..f51322a 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 63d2de2..ed98b36 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 2d6b570..82be5f9 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 66839a0..4ea11d7 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 7e6fc41..5255846 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 da5e09e..350fd41 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 63edc81..1e83592 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 30f9fce..f5cda6b 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 a355f81..3712763 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 e11d49f..548e7a7 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 3fe20a9..8364f8d 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 2ac3f00..68fc555 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 09e9a6e..b9c5c7b3a 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 19fbb9f..3e61ef1 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 e53e610..41ebd3f 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 48c602d..23fbd77 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 e0a444a..8adb028 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 657cb10..9ff30f2 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 90fe35e..e6a385c 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 1648de0..2666494 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 41b61b3..d57f9b1 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 cd7ee8e..1c27ddb 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 75ce102..a9f089e 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 58fe8e8..d9f9e0c 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 870ba35..0bf8f6b 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 eab0319..0f0ab05 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 7de73eb..f107e24 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 2415865..8932b78 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 d81a0db..6ecc672 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 3a85ff5..d9feb9c 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 8bdf282..1708cd5 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 92f3d89..fc8f68c 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 af3f662..c27e38f 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 15ac772..e506d37 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 39f0562..4822828 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 81781d4..2d63d94 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 ff1a271..22c050f 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 288dedb..05477d5 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 f7457c1..749e128 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 e8b47ef..3993fbf 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 3d069d5..724fe64 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 98bea6e..9f998d7 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 1614b24..c01c2e0 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 80349df..a420327 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 0c081c0..f532059 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 78a5c92..3722410 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 54144fc..91b1bb4b 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 a5e27f4..9a6ac7e 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 cbc3abb..7592f4d 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 29310f1..39e2a72 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 54829b5..07b34c2 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 196a3e5..2b732e3 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 c648490..8146c84 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 b9922d4..05a74295 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 64743ca4..6e21e81 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 1779de2..84fed5e 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 20220fc..ae6e297 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 c5f5078..d92098d 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 c5f5078..d92098d 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 fc11e48..0e62f3f 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 42ba87d..c1143cd 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 4bd6b70..fa1c147 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 c8d8881..669061a 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 6a5db5e..66030f9 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 f445baf..86b9020 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 2b7950d..4234b9d 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 19fabef..ecb96a2 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 533bfef..d587892 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 21a4ac0..75d0692 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 48c6702..d7ead1a 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 5bd6511..434810f 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 8d07743..f633ef0 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 aaafff0..91b850c 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 9582bb0..27ab117 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 048c844..4fdc993 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 b1dd349..50182a6 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 3c74c29..25e4426 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 debac06..6560519 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 1c0628b..a7e7ca8 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 e7361ff..e469fa0 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 d4187c7..2cdefd8 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 d1646ed..07daa85 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 9920f4d..48f9dc5 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 096724b..a815a39 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 c3ab02d..7f9e44b 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 3c20504..8e765e2 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 53e72e2..c6f42e8 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 bf9e97b..28cda73 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 871899e..48ec12e 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 a7fe8b9..674e9d3 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 55edf6c..9282ccf 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 26cb8d1..60e5f56 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 44b58fe..0c7901a 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 b1b845b..f75ea23 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 d65cb38..d445f68 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 251b288..a007789 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 4521fe5..fb02ba2 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 0b8150b..5b98abe 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 7edc768..7c94c394 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 62c16f0..b106562 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 f870a62..65e0334 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 42fd952..eba78f7 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 ef057a4..59db8cb 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 d7f70f1..ca33235 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 f3d9fd0..0daeea3 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 acf55bb..62d14b1 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 8cf7341..3c42a9d 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 3571556..30383f9 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 0198416..ae57b42 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 cbb817a..2100508 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 cbb817a..2100508 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 6b87e65..df00d7b 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 5046bdf..86c60b4 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 1837131..edc6456 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 f51de01..b04e2fd 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 926f893..a67ee42 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 1773d2f..ae5af8a 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 a192b31..7a1f556 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 3bc8e61..023254e 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 1d23dbe..20d7aab 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 1ffcc15..06c5bfb 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 e2c261c..33232d6 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 d0b2aa3..6a51eac 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 ec37424..3b2e2a7 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 fe5e8da..b50e1bb 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 c21d4c3..1dd2879 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 ae19936..5fef0e0 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 26fa92e..b6e80fc 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 9c2c429..60328ca 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 c43f5d4..ec2e2bd 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 c14ebce..e5baeae 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 f7ccd2c..2a2ecf3 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 5eb9b6f..6fab63f 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 e2c6c8d..a504d27 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 4fc2a3f..760c5a7 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 b5847d9..bf29d0d 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 0b704b6..753b942 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 6a1b8ad..06c1292 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 b25bf09..d90862a 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 f3c17ce..5cad311 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 830f492..0e87e33 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 37d79d5..5664e0e6 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 4952173..39d5492 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 58bd1c9..0b0b560 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 344789a..e19a0a5 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 1ef53ff..cea437d 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 723739e..53aaa4a 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 86c18d5..21e5e7d 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 31f014d..425d0dd 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 0458a77..8d76f92 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 6fef321..3a3258d 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 355cd8a..a646334 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 355cd8a..a646334 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 c59f1bf..113a362 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 7f347f1..d7a2469 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 abe09d6..e316a72 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 abe09d6..e316a72 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 b31397a..3620d7a 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 d0d556d..7271b8b 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 b31397a..3620d7a 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 d0d556d..7271b8b 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 c65062a..1d77c7b 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 f5b96c9..dfe89af 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 c2b414a..8d9cf07 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 41a0941..bb540de 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 e4556e1..0b5d0a6 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 41a0941..bb540de 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 e4556e1..0b5d0a6 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 fff518c..8e21a33 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 2d31f68..b67a910 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 2d31f68..b67a910 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 351cfb4..c89c219 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 d473c57..f26eaa4 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 d0404ea..041f264 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 1833915..84a64d3 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 0000000..1a094bb
--- /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 0000000..127cae9
--- /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 0000000..b312015
--- /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 0000000..f3fd7c6
--- /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 6fb773d..56df5de 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 c5664d2..127cae9 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 0000000..2d3520d
--- /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 78fa9f8..0000000
--- 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 0000000..7c8b5ea
--- /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 ba0970e..addb2a1 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 d952757..0000000
--- 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 0000000..3360d06
--- /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 0000000..127cae9
--- /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 0000000..4a3f497
--- /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 0000000..3f5db5e
--- /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 0000000..03f9d36
--- /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 0000000..b6ec770
--- /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 0000000..a3105d8
--- /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 de0b3fa..ebfa19d 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 1ee28cd..f7dbfac 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 2c83807..b90e3d3 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 8d0ccf0..77d563a 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 5d71f54..e904f7f 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 4e76f5c..f5ca753 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 5949ae9..2766024 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 93a2dc1..eb58e16 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 5dbbb3f..d60b0b4 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 cb2e000..e770845 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 5911344..6531d54 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 86993f2..61e05a8 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 532435b..032c3ef 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 e3a0ca4..f598453 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 4592bb9..d8ec8e9 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 4fb366b..a338823 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 0a91f56..798250f 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 37e354f..3a0c485 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 1db5bde..2ed2101 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 8eb4561..71af3434 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 cc7ae05..90a133b 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 5d5c269..d127996 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 1c4d5f2..5ab94a6 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 f14b1a4..21fbad4 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 f14b1a4..21fbad4 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 6982644..b0c256c 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 289a945..32bd895 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 6982644..b0c256c 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 289a945..32bd895 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 4219276..db41d61 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 414aea3..e231fc8 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 0ee8420..fa8393d 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 589e241..b83ffef 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 7168c8b..60fbae9 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 0c2e34b..1d4a5ef 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 adcb0e1..484b098 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 0188a81..477fdab 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 7de73eb..f107e24 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 8d724eb..ada1e0d 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 bbc3b1a..9a49900 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 c8f789a..1dcbb37 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 8a388d7..7f8882b 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 d5d0f9d..d418e84 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 b2412c1..0cc81bc 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 8f8d371..ecd64ae 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 56cbcd2..10d610e 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 31bcb6f..2a504f4 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 03602fe..a92b9346ab 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 803b780..cf295b5 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 924c759..1347ee7 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 0f9fdc8..647e383 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 68c8d2d..a7128d6 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 0e94c9b..e0fd2f4 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 0000000..1dfc2c4
--- /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 0000000..1dbf8e3
--- /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 04e7be8..3ea474a 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 1256db4..75f94b2 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 3b14889..3c32a85 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 bfadb03..0b784d8 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 efa30eb..92a32ac 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 83ad58a..da58cf1 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 c32cbcd..e479a63 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 34bc6df..814710b 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 2aa768c..5685822 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 49e73c6..5b0210d 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 6249466..7409127 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 bdd515f..ba14937 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 17f1d33..aacae2e 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 27d44db..1be8a11 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 708f0e3..5ff80d4 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 03d66e8..3a6baf4 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 61bce83..ad00f09 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 f9e3b02..33dd53c 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 f9e3b02..33dd53c 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 f9e3b02..33dd53c 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 33e5706..5254824 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 3584566..860b99c 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 8714ac0..8127e33 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 0903142..654d9c9 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 0903142..654d9c9 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 11dea18..8651aa4 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 ba35d27..77d5644 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 6d59ec9..3e4f86b 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 c3010e6..55d3c07 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 13f524a..eef1b1d 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 c5662f6..7f2267c 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 6de7760..f0a7c7f 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 7617809..1713ed5 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 4a4fdde..d908b32 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 635f11d..de07e15 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 0a754ff..2704942 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 db710c6..83fdf8b 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 e4f49da..b22a7e2 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 4b15ee8..3de696a 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 a15fb2b..459dbda 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 b3aeac5..9d5a9b0 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 a13ccf7..2733e4d 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 d38e188..f014e9e 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 8a6c9b4..2765157 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 5e67e1f..6b90183 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 be4aaa9..efeb355 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 e4417b6..63ccbce 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 534b879..423b8a8 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 38a8c9f..accfcb8 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 99ee81a..8b5e72c 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 b65616a..b267d8c 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 d6bc978..50982c4 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 b0d2a91..800624b 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 817e8ea..9007ba7 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 9e717d0..5fd9237 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 92da014..faf1a6f 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 aadb1c8..deb95e5 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 ff30824..d07338c 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 b5af5ad..f4ee132 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 7617809..1713ed5 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 ac6164e..1d79880 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 f885493..13a8519 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 e4a1fa3..5c8faf9 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 632cbb6..c68d728 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 53b487a..123f172 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 b5a19e3..be27d43 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 f4fb80d..f3a9509 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 392f029..6ea299c 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 bdae7bf..68c3768 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 396ec42..11f22fe 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 1a71299..7254233 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 062a1d5..b91ba70 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 92da014..faf1a6f 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 b46d041..6e8dfe5 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 1a7622e..ea2f25d 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 3e97ef7..d109382 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 3368d87..4332870 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 83a40d0..d91830a 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 016d2e7..0740184 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 9183b30..cca00e8 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 c64a78b..dc34856 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 c636f9e..c8bab62 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 8446161..ff76ea8 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 f13bd3d..c694de6 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 0b967cc..6b7a743 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 b246e45..9db5823 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 a0f03f8..9e4204a 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 79b3427..7253472 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 932b392..a3a46e7 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 b4a034c..6140d77 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 19ea8a8..529e74e 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 841b6dd..288dd58 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 f2c8df6..6d620b3 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 f4c8198..d64f913 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 a4596e8..e372e95 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 f853ec5..4dbef0a 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 d9c74fd..dd34746 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 ed22d1e..75bb972 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 d9c74fd..dd34746 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 d9c74fd..dd34746 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 57f27d7..fe9e95e 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 72e10e7..3f78a55 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 03921d8..c456e05 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 bbb7eda..e2e259b 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 265700b..8056ffa 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 daddc25..8122bea 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 484655f..4527342 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 35acb78..7ffb7a4 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 0492819..d0446a6 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 fa7a059..857fba0 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 663b32c..f6c0021 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 f68445f..01c0d7b 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 58c9e6e..6eb5317f 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 c372156..fc0394e 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 6cf808a..3e44d07 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 e08e2ac..174564b 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 311841d..72890c5 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 676ecef..f22f283 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 f3b0d95..d9ef9ca 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 9f89e7b..5398fb0 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 fc6200a..29871e6 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 8fa9836..4fd54e1 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 51c69d1..ac7a853 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 91b4c69..7205da4 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 5c11120..5ac2525 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 841954b..8273831 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 8e27579..f237729 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 5ca70f2..e813603 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 a4f5495..b083aad 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 6b9fabc..8df2574 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 3d9da88..f8ccc9f 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 c04422b..81edad9 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 4ab58fd..c93bdf1 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 52ff4d8..0fd8f09 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 e34cb45..095dc63 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 dfefecf..af9a6cc 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 eb7adab..19f1e45 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 4e9cad2..91c1600 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 404c02e..e21a9c5 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 48786a9..b12f0ff 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 b9f7b3b..b75fefe 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 e8474ac..2d18f1d 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 f423e0a..b6ce9f4 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 c9649e3..71965d5 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 34f77b1..c5d95df 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 2300937..6383436 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 2a6d928..ff8206b 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 c1c62d2..aba6c90 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 74da7c2..7806067 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 7916242..77bfe92 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 044571a..9ae4192 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 55b925a..4e810f2 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 5e38dd8..379ab05 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 5d993fc..a003f31 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 48265df..2ba959e 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 f086955..bb80c9f 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 324ad73..d3f4fe5 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 fa49f2a..6c7bdec 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 906d6a1..e01b2e3 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 3d9bce4..66ac6d6 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 1115773..002fcc7 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 0ed849b..82e1e43 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 85a0352..33cc0b3 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 8fbe36e..2ba3fe2 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 fcd1790..af0586d 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 61cc119..4d44421 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 d53c4db..1a541f3 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 0d8cd6c..cbc9bb8 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 5a0e31d..84b83f1 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 77c7e1f..8680ed7 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 44daa6f..78dfcf3 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 6cec001..881c73f 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 aa8d0ef..e87c716 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 252058b..220be44 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 e70e79e..5ddea34 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 a2ebc54..7e95908 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 c355211..1542f97 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 38d9963..c3c00cc 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 5e61537..614e18d 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 145a57af..ddcbf56 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 6fd027f..54bd58b 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 6abaf67..0300bca 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 871bdaf..d22d1ff 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 8641542..53f093e 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 94d24b2..69eff9f 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 e1b634d..05ff06b 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 b89d840..ba6d40f 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 ab0cae7..a80ef5e 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 83826dc..29e7241 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 c74eab8..e6aa68d 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 44dd35e..5822fee 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 a2fdabd..e3ab2e5 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 221fef2..70f4015 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 47d70de..5251f20 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 d5d9388..83870e0 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 0a35284..91277d7 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 d6fe296..97cfaf3 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 062dd39..652ed34 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 0a6ee3b..866e82e 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 8eaf93d..6786ef6 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 d639a08..4bb6a87 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 2753cc1..2ba1a8f 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 0118f96..10d10f1 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 47efb09..049b26e 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 97be6d7..313984c 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 7824cb2..380ae76 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 b693d66..d008c7a 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 407f91f..88e3b66 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 1185520..7feaa35 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 c602e5d..670cfcf 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 3beb505..adad5b3 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 bf93838..7ecf149 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 f7ed859..d10caa4 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 12804cc..e4754d8 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 89872a4..de32662 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 17139d8..223d99e 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 2543012..ccb5d37 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 2c47a77..ac36b7e 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 809bcb9..285c59d 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 185f304..418e3df 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 68d4a6f..6192c6a 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 68d4a6f..6192c6a 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 7fa5e1e..5dc5ab5 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 393d292..f4cd381 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 09e9d64..c9e654f 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 8051cf7..ee64b3a 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 0d6778f..3a4f372 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 5837b1a..deec15a 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 c32de35..28d2a46 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 97f678d..e24e199 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 31eeb15..90e324d 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 2ee11ce..8fae021 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 3d7dc62..1c6fcd4 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 f0ba371..3b09c27 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 cdce298..f381668 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 726f8445..cd697c7 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 78e6d83..1d8ffd8 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 45dc2f7..5b7c2d8 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 f1593f5..632ac95 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 56833fd..b42bb65 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 9899272..ce6ba3d 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 a14f1f8..47b0370 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 cfc93a6..815af9a 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 a42a80e..1ca773c 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 5642e3d..1942e84 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 cf82cf5..84c8261 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 eda0963..fb53636 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 ddf65fd..87f00f5 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 36e9453..6c4561f 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 5801cfd..43cefd6 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 edf8443..d3bb409 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 b4397b8..c9de862 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 c40efe9..8a37a3e 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 8db322d..d5c3ed8 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 1f25e64..8c9db67 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 9fbcd2c..14e0b16 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 ddcd8ed..105526c 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 1ad7cbf..39d3951 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 166a029..15fae4e 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 88ce610..c87f831 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 4e61db4..b59fb26 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 e1f69c9..8a9f5e9 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 9197b4d..9bc872d 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 c8eeb3a..d31a70e 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 f41490d..03afa39 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 41b3590..7838880 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 bc55281..7748665 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 7074a9b..1dfc154 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 bc070a9..6593c96 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 dbc477e..19d2685 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 4e4bde7..c49cd5e 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 734dec6..edcfc04 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 d494d82..3c54720 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 befdf26..60d7fd9 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 0981efa..e6a52f0 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 dd0037b..80e1541 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 0ef246a..e5c1ea6 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 6cca964..ab4afd6 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 d51d28f..3faab91 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 c254e8f..8103ce8 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 c758abd..ad5ea10 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 62f8de7..0139ff7 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 dba03d7..9dcdcf0 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 a7443c7..78e033c 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 eedd614..082effb 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 4521c4a..89c49fa 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 00a30b1..595a721 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 8046261..4e8126a 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 18dba3b..1af447a 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 18dba3b..1af447a 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 09a51f6..f7fc3bd 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 c8b80b4..3fa611b 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 d4e217f..0a3a660 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 67cea50..41a01237 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 67cea50..41a01237 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 39ee94f..64a255b 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 f47289e..9044be7 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 c4c749d..83aa390 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 2180f2d..219bdba 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 049703f..a1e7d25 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 cc1020a..aff4df0 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 f27a672..f834490 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 c3a32a8..3b05319 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 0a01132..5842f75 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 c3a32a8..3b05319 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 0a01132..5842f75 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 dfc4d27..d967417 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 4dbbb7d..e1c9cc3 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 3749fe7..51557f3 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 d2e1940..5d0108f 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 906a8fa..f0f671e 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 3a6bed0..d0fb437 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 fef7b01..0266401 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 0980ad6..ed66a9e 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 4dccaabb..ce88306 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 4dccaabb..ce88306 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 3f1dc48..38759e4 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 12ff57e..53cb1f1 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 09552b9..f497070 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 dc060b4..724f504 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 e1feb7e..66e2a89 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 7d09ac1..581d925 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 679b6ac..33f1814 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 d6c93a2..d90c9c8 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 c439136..9c0f993 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 7f790ce..40d4edd 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 ca786e4..f974c8c 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 861a76d..2afd86c 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 313bff0..8a8178c 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 8f939e2..ea1772a 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 b28909c..cbda975 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 f6a3933..1a4f226 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 c3c0d8c..5a5cd3c 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 c3c0d8c..5a5cd3c 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 2f0b3ab..61b7021 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 0ee7b31..348b15b 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 ea2306b..e5decd5 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 5547ec9..89c0fb7 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 024eb74..4b3444a 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 8dd375c..b827258 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 649dbae..8c2d3ca 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 6426cc4..bfc5b7a 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 f844596..f196bcf 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 ea9b8dc..fe183f0 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 d04181f..e0c015a 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 8c78612..a6b6fc6 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 a77816a..6e86012 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 58b70ff..8dd1d5c 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 d71b560..2d75267 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 b6a5e85..eb0c4d6 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 62b8147..c5238be 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 f6ec057..46361a3 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 62b8147..c5238be 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 7b47f61..ad05f2c 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 c82511e..daa8fcf 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 84c7904..a35364b 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 d83d930..84fd487 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 f5cd188..cb17a3e 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 ef5a9c2..a115b52 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 5cd148d..6de1f06 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 0e0bbd9..a1ad1bf 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 8b07582..96390df 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 d95ae85..72f6153 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 ac90326..f0f00783 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 490a677..c0ebf24 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 b18a0e6..9d1b441 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 62b8147..c5238be 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 a3c54a8..7d7cc24 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 a0090fc..1ac9775 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 fcdac20..9d2047f 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 b821857..b7db5a5 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 0089958..db15bc2 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 0a76820..4ce7e36 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 852404b..f534890 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 3ee5b68..d3f2322 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 9f23520..a0a132a 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 8bf119d..e44da94 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 3ecb4b1..1722fc2 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 381915f..c4a27b2 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 af5bbf9..386e471 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 61c3f55..a98dd46 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 513c849..299517f 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 706c96f..e5e1651 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 706c96f..e5e1651 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 1295eb2..9d9c15f 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 3c74d21..94a3793 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 3c74d21..94a3793 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 f6ec057..46361a3 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 66bbd98..67a86d9 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 66bbd98..67a86d9 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 e68a2cc..da2f9e8 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 46a0767..c6b696f 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 9f47651..cd145c6 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 10c58ef..e7c6511 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 348e4cc..4e414c9 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 348e4cc..4e414c9 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 50e0716..e6917d6 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 0577316..184d092 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 46812d9..cf50c41 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 f8bf156..457dac3 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 1c2cdf8..70b2737 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 89f601c..57bc544 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 85c4f58..bb55ce0 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 d6bb5b3..9b1e31b 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 8cc8299..78f64c4 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 7b47f61..ad05f2c 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 cca18d6..a8664cb 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 8cf5e80..a5c9d41 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 15c778b..422775b 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 9d2db1e..ec1b1be 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 ed0558e..6557456 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 2ae79e0..083c2af 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 5ba4f44..7ca5b63 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 6e975f2..25032aa 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 dcd625e..97dc5a3 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 50665b5..fd0de10 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 8c06613..4d1780a 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 d1acf3e..f642aae 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 7fe99c9..21be098 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 8ada735..314c441 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 4c28890..5a4d9a3 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 0842233..c1f4c84 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 7723ec6..c891f80 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 0bf7d6a..653db93 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 c82511e..daa8fcf 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 bf7d70b..398d7f4 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 47ba4441..45a48b7 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 925feab..c5acf07 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 8b43a6c..00ed6be 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 99e31dc..21ad8c4 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 d8aa25b..7fe2dcd 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 a90a8a0..5cef606 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 388f55f..221e301 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 51566f1..ac8fade 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 69e8aa6..dea74f3 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 b758451..0608bff 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 84c7904..a35364b 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 2fb48cb..f96eb0e 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 8aa2296..302f43b 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 b91c95b..670d6da 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 7bac5a8..0efd19c 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 6763e3c..479bfd4 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 6763e3c..479bfd4 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 12463bd..22573af 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 77f8d07..024526d 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 1545f7a..4bf6f8d 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 dfab4b3..1f276be 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 9e07888..2142b54 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 82e4b65..9adf5d2 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 3fd93b0..42ce516 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 8a5b984..b89e879 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 d718abd..6a5f270 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 33e3df8..919a3f5 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 92a8549..e26aa05 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 186d94c..a78797d 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 5b35911..51e5098 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 2652dce..670f4ec 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 d83d930..84fd487 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 4ab35f0..0acdf9a 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 104e905..4a63075 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 cd2d960..6514f61 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 b67552b..a845592 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 4443330..157ee70 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 9a55baa..65c6f65 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 92bc66d..152d077 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 57b5165..cd02dc4 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 5f27a02..5918a51 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 c33a4a4..8930b1f 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 7cc0c0a3..9f3df18 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 c595b16..83229b3 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 6488d71..f364072 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 32f602c..758140e 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 83ffac4..b8e0791 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 3a4f4d2..f70b3c5 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 fce8521..0f2caf0 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 de05063..b910ae7 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 1a9be57..b1a13da 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 3fa60ed..bd09151 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 bb11ef2..5e8ab5d 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 d5a9f33..7379ad7 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 cb504a3..202a235 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 2b51554..52872e7 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 61bb5f3..2e15085 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 eff20c4..cf3c825 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 b878e6f..bf53007 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 e9adce9..0138ab8 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 fa22293..29915c7 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 c3f25bf..e97d762 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 24e89fa..5c8c904 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 8bdc82b..0c81c9ea 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 d762266..f502308 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 15575f1..c66dc74 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 b8a1c2e..55f51aa 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 edf552b..4b884ac 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 6351434..cabca41 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 7579a49..8bd5432 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 82cbaf4..f52d6ea 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 12271a8..0b2705d 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 0b986f4..ae327ee 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 5d69e7e..8b6e6af 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 b2ddc0b..f673e37 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 32a3dcf..3467f7f 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 8f0061b..aa790c2 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 7a45acf..455798b 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 831276d..e48c425 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 b0f7076..46195d1 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 633af4b..5175e3a 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 9f4f03a..9ba3104 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 4dd8a8f..6f97ab2 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 f2da8b7..15fe02c 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 d07e23e..93d0257 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 3e2ef13..a73ac90 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 6709c29..9e1cdda 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 dd5bfc7..380fd48 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 10593ae..d8c1e7d 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 687271f..e3bffff 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 0ff749b..8407ebb 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 784f1cb..72a0894 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 b45f600..dedf6d5 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 8da8067..2d4d46e 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 6fe47e1..db691a7 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 80d1cbd..aef7c11 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 e92049f..ad78a69 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 17eb91b..51ae485 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 9750f32..fde6204 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 35136c9..d0e154f 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 516e5ff..160ea5b 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 0023fe6..c6f7d49 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 5f6564d..ad8c554 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 55afd8d..27831b1 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 c70531f..e58694e 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 bed60c8..e60ba76 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 4db38a8..4a171ef 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 cbf506e..01c8ab8 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 a1d2048..adaaafd 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 b136cf1..f624f06 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 b9aaf7e..b16eb84 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 113ea6f..fff87ad 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 6d82ac8..d65fd1d 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 67cc22b..f08b2fc 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 904aa21..fdec9a9 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 1cb7bbb..0794f52 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 bad3621..a2d922d 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 f54e302..3db5fdf 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 a168898..ffba496 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 b94f545..9d813f0 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 5a86ecf..bd7cbf7 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 089dca6..6117439 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 342ba33..6d9a811 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 91ea51a..99318cf 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 cf6e45b..6839d99 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 6b3c19e..2de2adb3 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 f16e8c6..ae5f164 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 e8df41a..0139eae 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 d9c7912..d09d946 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 1a494bd..2a422d3 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 21aec74..f414d64 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 b25cbd0..ee190e0 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 9d377b9..d5bea52 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 9d377b9..d5bea52 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 844ca78..bc76481 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 035080f..5299a09 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 e3e2b81..67632bc 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 fb5349b..d20edfd 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 a8481ce..b0394cb 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 7859182..c97a482 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 2da7bac..13c363a 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 e6f6d80..52f6a62a 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 17dbc1d..5abe897 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 cc937d3..7c14c2e 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 d6b2b6b..06c16f7 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 83546b7..5d04313 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 0da3334..085ba08 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 f3aab97..11be64b 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 c824d11..57f1e29 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 40f1de9..9a13b90 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 aea8fd4..9962b07 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 e52dfe1..295562c 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 206ec86..336c7cf 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 ebee1ec..90bd25f 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 40f1de9..9a13b90 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 809b8f6..a8e6ed9 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 4318895..cb3edc4 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 ae1e2d8..f81f2ab 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 4d3f6e7..bda75f5 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 591c164..79706ef 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 d7a11f4..4664c4b 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 385d8ad..3fd7a43 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 1da689d..d6f8af0 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 b2421fd..b368102 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 f128a91..3791a3e 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 b926841..6397107 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 01c20d0..d9f01b9 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 a98c8e1..60199f9 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 ebb8fbe..4b2a1b5 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 fab1f90..00a86f4e 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 a43cc76..304e947 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 d6e95dd..81285a5 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 2314f35..8e20309b 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 c4f351c..36cd748 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 e6c4083..21be1f7 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 22d960b..5e3fdb5 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 d8314c4..0a0de08 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 c9883a2..06eca1b 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 aa052fb..a523d44 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 ad48be0..c3550d1 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 e365091..e104c87 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 36e2083..fe89a20 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 a1af9c8..0f247a6 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 98d1ac0..15fa1ec 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 bbcda52..17a3f69 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 e047c98..96ecf5d 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 b0515b8..437b89d 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 4131853..be34d95 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 13dd096..e4c927c 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 7ba7b6c..74d74d0 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 7ba7b6c..74d74d0 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 256caa2..89ee9b3 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 13a8f2c..418a63b 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 6323a2e..3da39c5 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 dd2286b9..27f043f 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 4a32193..ffa41f3 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 84eb293..8c62c4f 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 93792ce..cc96249 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 345fdd3..c19fbf1 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 b404fa5..9829d7b 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 a5b1668..eaa43dc 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 a4d35e8..686d073 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 4a2101f..6be4130 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 0e6f026..57b6cea 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 de05063..b910ae7 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 40574af..93ee102 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 9d2bb04..8fef97a 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 29bab21..ac5b0f6 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 6d8bd6e..fde891e 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 d02cc0c..52aa657 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 96c1021..c9e8478 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 c9630c0..8513cfc 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 2c5c429..d9ffbf5 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 2c5c429..d9ffbf5 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 a0d0af0..6d0b16f 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 a882764..373e327 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 4a1ea39..13ad2fe 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 570e442..6570f6b 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 9028cf1..12f57dd 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 b791d7d..d0776fe 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 64f7da3..57c7ec0 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 1a0c4cf..172d0b6 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 ff42881..86d4847 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 fc01b17..d09990f 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 d70a9da..a49ec7a 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 9fe049b..84ae295 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 b3d54bc..30055b6 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 47b3d0f..1a6cf4d 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 d4c8073..66e649b 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 417d09a..4dffb07 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 70bb5c9..1ed4730 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 9caa00a..d6a6f68 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 5a7f1a3..0df7d69 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 8fae3e6..a1a9d32 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 b802737..ffd449f 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 0dd4010..4812516 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 38e2bf2..56aeb6a 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 efeafe5..a9df6e6 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 e2bfe03..1e0d823 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 1a4d3cb0..232376b 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 e03c03f4..c058748 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 4bad347e..3d68be9 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 395ab36..9dbc2a3 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 d26fec0..91b044c 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 3a2d5e7..af3d8c2 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 cfd91b9..2fd4073 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 7995d99..ff60b8b 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 e6aba29..249c7cf 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 914c9f2..5c3778c 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 905bddd..a5dcfa9 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 7123e5c..80074ce 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 163a5f3..44f1f3e 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 d65feb9..ea13503 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 4ecf555..a4c93b7 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 820e288..ca5e641 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 58f8b54..ea77d23 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 80359a2..e9595ad 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 d902ba4..83d115a 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 eec03a7..1bcc332 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 9b6d6e0..aa5bbd4 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 264a4aa..0a49020 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 b73eaba..20a078b 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 e53324a..c5ec410 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 a5ffa59..ba9d370 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 9b22924..84b05e9 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 a7e64ea..0d4a899 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 b011a03..7e0b3c8 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 7629dd0..742b216 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 0419d86..51c40ee 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 206c66a..6566853 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 206c66a..6566853 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 7197ac7..edc843d 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 cfcddb9..686129c 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 89181fa..84cd651 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 9d36fec..6c96840 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 1f2143c..af05d87 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 27a0f54..dd0059a 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 f6748d3..af2cd7a 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 c56208f..ab7687d 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 e04196c..f0cad4c 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 8c1ac40..bb41ec7 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 2842c04..dd12c76 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 930d436..f4d4d08 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 665ff24..5c94da6 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 b90081c..696fc20 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 db8dd31..d5bd143 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 b59e7a3..19e4243 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 6ca0cc1..7b3371f 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 637302c..49498f1 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 637302c..49498f1 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 ff9577f..beaa23b 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 aae974d..57c2391 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 d763728..a6bf21d 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 561635f..51c6d91 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 f9f0af1..b12e898 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 06e0e2b..b0db5b6 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 e7f6fb2..d4356fb 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 9638a13..59a7d76 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 600a1d4..46e6198 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 bc50a30..a3558b8 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 73df1a2..15ab982 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 7ceb0be..3f712ec 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 29c1ec0..83fe2f5 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 685d68d..cd68f71 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 d994b37..3ea6842 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 bc618ff..479a5ad 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 cc5e156..2273e0f 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 3ed43b0..94c3257 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 caa00ee..5ee6bc2 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 7c6a886..d84b9f0 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 b4ac513..7bfb216 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 a026c86..81c4fe8 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 40f933d..d1a7ace 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 376e90be..5a8944b 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 9f1744f..738bf6a 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 8e4e631..d93354a 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 b8e3966..034a3e9 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 8f08ac5..de8f2d3 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 638e94f..c639c86 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 d378103..697e926 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 d908418..40e5880 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 8cfce8a..9f20c4b 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 5cf4679..0fa8d02 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 594acd9..466a05d 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 ace2562..5c8b7f5 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 17dc169..f0e59ed 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 962f1f9..7a9fcb0 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 d7303db..6559140 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 f97c1c8..a5f0622 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 ab1f508..7b0493f 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 8e383a6..ba37e6e 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 12efcc6..0d26324 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 54be477..f5ba424 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 416e79f..4fba0aa 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 fb8585d..ecb15a4 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 085fe51..ff79813 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 98f171b..c36a86f 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 2801426..8fd6a8d 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 bed2d63..b5b643d 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 7450445c..dfcdb43 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 e35f976..45ba22d 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 d10ed41..68a7db5 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 7c12481..3e9723f 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 a17b4d3..44d378b 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 c8abd67..369d520 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 d1a0a7d..bca12b7 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 53b751a..386ea46 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 7c12481..3e9723f 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 a17b4d3..44d378b 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 d1a0a7d..bca12b7 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 7c12481..3e9723f 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 a17b4d3..44d378b 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 d00dc04..03c0389 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 fb92fd4..7c210c5 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 d388204..2a789ba 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 321c017..1d48e55 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 c7fde16..345e2e6 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 ae4b945..b390bf5 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 1e61f1c..2892102 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 bf8e16c..56e35d3 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 ccc3f2a..13f08bd 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 38fa8ca..f865689 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 34a6301..415db9b 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 15debfd..454e154 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 de4fc38..53c3647 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 0ed0f8e..9f514af 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 f76cb72..88d1d06 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 e2177d9..8febd61 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 b7b74a3..c94daa7 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 5c03225..20cc934 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 c8abd67..369d520 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 d047bb0..66a9202 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 4f3d582..bc1af6b 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 8f15a20..58317c9 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 e59556a..0d6a4ae 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 226b7b5..8830fa5 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 963d773..52ae423 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 6f0e47f..bb8a556 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 83e5a19..9013077 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 4d9baa5..e0ee53b 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 61a20ba..b2d0b50 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 2b8d2d8..be0bba2 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 c8818b8..ebbea3d 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 15c364e9..8199bfd 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 237d58b..d5b8a3e 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 718a470..550ef61 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 c9bbb8c..4cf7d82 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 4c0a79d..1c2b6a0 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 f17a751..a2eb891 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 a72514f..075e53e 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 a043c1a..f5dfda0 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 561c726..61c874c 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 56e4b83..bc9ea4c 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 a2a92cb..8159dfe 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 3309da9..667da1d 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 84e4c70..7fc0faa 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 aaa2650..c6ba8f3 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 36e9a0a..ca951f4 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 427d683..e3bbc6b 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 36e9a0a..ca951f4 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 427d683..e3bbc6b 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 7d74680..d788dbb 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 c0064e3..bb3871b 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 7ea7831..89879b5 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 308e68c..b1fe456 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 308e68c..b1fe456 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 308e68c..b1fe456 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 f5c13d6..fb63cee 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 d1a0a7d..bca12b7 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 3352d9d..251b530 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 1cb9906..4ccc0ec 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 604567a..aea377e 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 559e727..89635d2 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 0df5afc..482dccb 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 ac9d246..67e4430 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 ffdd90d..a8c4af5 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 1b4cd1a..9ca7e19 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 33ed737..2153fcc 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 02face9..b8bf47c 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 fda7cbe..18dfb5b 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 26f0146..f26da79 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 9acc8203..a7245ea 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 d2aca9a7..41d6e84 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 fe944d1..617eac9 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 b487332..6c2a184 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 32ba0e3..318e233 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 a7dfeb3..38e0265 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 b57d925..72dc58d7 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 adcaee6..eedcf7b 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 99c7ec7..4941888 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 b7fe9ef..d86f86a3 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 8e0d84c..154a3f7 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 f8713d3..5becf9a 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 9116fe9..ee7b8b1 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 5bdf3d5..ebeb1b0 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 0c749d6..c24db90 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 910731f..f7ad0f3 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 7708f6e..01dce83 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 0252932..b3f2cb0 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 fb3c99e..5339d25 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 6cefa4e..eaa78d7 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 41438db..f11d06d 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 6da6ac7..5a7d86d 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 011d3ae..f8c135e 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 0dff933..58e4f39 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 42cf4d7..80c851e 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 3c22d6a..42d11f8 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 60b9e52..6ea023b 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 a4ba717..48d7231 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 3313ff4..31d3104 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 cafb2c7..4e4a8d2 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 9e2cba2..5ddfd3e 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 1cd80e6..c74599e 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 112ca6d..b53eb63 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 3099900..7f3090b 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 fec4c1d..d94553b 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 2bdff3c..b8610af 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 07c88f5..c4a3b0b 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 96a6969..6739fec 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 efd8a15..5097ec6 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 01aca06..5c222ce 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 d2ef160..83443c2 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 a304805..3d3fae6 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 f765344..0a7744b 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 4375af8..34d2f4c 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 34d8bdf..23d96b2 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 07be353..73bd7b8 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 43b8524..6cbbf37 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 0390453..c2f5ca2 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 b19c069..ff66ece 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 64e7651..7c4d71e 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 8f88844..0d46dd3 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 e050708..15911e3 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 0f9d752..ae8d46d 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 a7eadc0..ccfa106 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 e4d6521..2e66391 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 c599265..3857c72 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 e546e87..23f026e 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 a24720e..2654581 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 679a04a..49e3dc5 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 85eda89..07f135b 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 20efdf7..85d6535 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 c74eb07..62c1f86 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 266ca18..a69ce37 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 b9179fd..e6cb309 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 ae74eda..61384f95 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 c70eb83..5594136 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 62792f2..bb22f25 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 eb97e77..4735ae3 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 cdcbefb..d92413f 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 d2a8b1c..3495684 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 bf59346..0293be8 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 95f7319..2440b14 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 02e2173..e7c4835 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 b62a342..07a19a7 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 ffc4b9e..35baf9b 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 2495e2f..1815261 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 25ee270..fc8c175 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 9be505d..9e92951 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 4044704a..64fc124 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 c45f056..5c54b3a 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 60f152c9..2f3fcf2 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 f4b36ef..ceeddc2 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 73ee7c8..e1cca0d 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 bbf1b47..f349da3 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 2991a1e..1c510c1 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 ae251f1..6219be5 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 3c09249..936da70 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 3479658..e8d90cf 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 bbc2dce..257c37a 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 4d9fa96..0791751 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 276481b..5dc231b 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 8b4199e..6d91c03 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 28348c8..55c04e8 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 e609b07..d719fee 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 fc33f80..791a5b7 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 41022bb..6dbdfb1 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 ee317e9..6f7e573 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 789a972..c891066 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 871a29f..406bb42 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 7ebb34b..01ac5d7 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 94f9243..339972a 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 98fa5be..2e4e38a 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 98fa5be..2e4e38a 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 5b2341d..ac8aa6f 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 f26b532..d6be656 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 5b2341d..ac8aa6f 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 f26b532..d6be656 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 1b80517..420e59f 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 1b80517..420e59f 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 5a65b28..03a56ff 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 d10f549..fb1fef8 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 f274f30..4f97f2d 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 3a4cd6d..1c3fdb6 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 7ce9011..16aa84b 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 5aa3795..bb0a400 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 cd731d7..6633905 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 4292209..a34fd69 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 b3285ce..e95e05f0 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 7d19042..269b882 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 fcc9981..d85bdcb 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 1312532..daa99ff 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 cc1398a..b02cee8 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 6829121..24e6004 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 4701a45..704a90f 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 f1cdfb0..e7ec8ec 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 f1cdfb0..e7ec8ec 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 7480f21..bdd780a 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 21a0ee5..aee2e23 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 309dec6..3d059a3 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 4024e78..6aa3456 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 70ac9af..c2c87af 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 842f107..119c5bf 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 62d31fe..c4df03e 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 851d0df..a6e59c9 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 add781e..6756fff 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 506fcfe..1bb0f2f 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 9cf49cf..dd5ebad 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 dac9b0d..faec015 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 c1bc686..1282f90 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 636213f..ffc96d6 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 d1ac600..cacfccb 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 c651b7f..a78d7fc 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 d9302b5..c0d828d 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 a4003f4..a05f351 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 6328fab..f68945d 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 d1ad10b..5779f9f 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 83a0ce9..a1b4cf4 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 45122e9..bf3397b 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 7023250..d52027c 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 6b26374..9216db6 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 e8732f7..fa29fac 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 1e65836..e628a8d 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 c811a5b..0fbd5b6 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 8dbb59a..478391d 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 8dbb59a..478391d 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 8dbb59a..478391d 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 8dbb59a..478391d 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 c2210ce..59515d8 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 e2abd1d..54b121a 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 c4cab20..7e76857 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 d984927..abc3e2d 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 f8843b5..44f369d 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 46d90ca..e5c9fe3 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 437597e..9136b5b 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 baf44f3..8ed8152 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 a0c6d39..0130656 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 c1e85c9..81f0138 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 6e7eaf8..da59ee7 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 0865361..66833f5 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 3deb197..db0c3e6 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 fb5aaff..172d152 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 8752f00..9565baf 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 1f1ff8c..f661d9e 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 c2050b6..3b4ca24 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 161a5c3..70bc30a 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 e7f8aaf..0f3dcd7 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 41000b4..9ae4cdb 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 592630e..fcf5c03 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 a9e8900..66d61d3 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 e5fc0f5..346f011 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 4de5dce..b4296a3 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 268d6ef..20b74b0 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 ebf0971..d952d80 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 ba161b6..2152edd 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 d9860e0..d5b11d7 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 259e5fb..f3ab321 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 25a0c8a..ecc8995 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 8c56b81..5bdf52a 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 d597d0b..5e78e85 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 795cf3f..b1f561a 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 32a02b0..23615c7 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 f387e3d..ee18bb5 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 e9f1cef..315fbcb 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 8923ac4..8d6fd72 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 40e51e5..c8e38ba 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 777b1b3..4d2fef9 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 9835c79..5d671f9 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 6222e99..fcffef8 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 b92a327..f587621 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 d26ca8a..396129a 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 739912f..822c877 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 291342a..4cb310c 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 639b2cf..4f66335 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 c599265..3857c72 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 c794f0e..e9562a9 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 0b0b175..6e1452d 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 73c8b95..b4f306f 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 a0fe6a94..1a99398 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 679a04a..49e3dc5 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 7c6a89f..ce62997 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 b092d74..c6b05c9 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 9f22dbf..204a207 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 68be2b4..622b0074 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 80a5aba..1ebd450 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 8d8214dad..74a90d4 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 650480b..77f6a71 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 18f90e8..c9ba102 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 44dc84f..848e4f2 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 e22816d..c7c389c 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 7efcf5b..cc4b7bb 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 b8a73ff..06a9d9b 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 83b4fbb..e92cdf1 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 788ca6a..6690471 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 afb25e0..7409dad 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 3b573cd..366e0cb 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 10cf52f..69c68db 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 4c3f953..a8091a2 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 22686b8..02b14f7 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 c1a80b3c..2fd5389 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 2e02eeb..fd2f1ab 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 36aedc7..7cdb885 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 1f921c5..511bc0a 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 8f634f0..13929d6 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 722dd51..3e7a8d2 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 3954ab6..602bc6f 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 cf4a2a2..c84a0e0 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 b49da51..9c494f4 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 12373d5..ae1901c 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 0f47d34..78913a2 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 2e78cde..8677d5c 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 270228a..4cb8791 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 26aae8d..4e7e8dd 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 0685552..760cdfb 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 1c7c6ec..f7835df 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 86391d9..a7ada19 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 5ff6461..1db55d6 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 0a3abcd..df1e4f0 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 94ae48c..3bd8762 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 3358f15..77398b2 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 b9ca8ec..7809712 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 4d8881f..9ad17a5e 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 46270eb..86e75fb7 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 a1f3bf8..c9fcb18 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 ca674f6..17954e8 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 53e333f..cfbee13 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 7bbe451..50943a5 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 8506ec1..33a7814 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 3c0de8a..754b0e0 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 0c0731b..df0c09b 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 e4c633e..4d04be9 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 9d046f2..445f75f 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 18b2ea8..2ea7784 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 06c4a39..7c11dd9 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 7d028e8..dc60a5e 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 3a02eef..056202e 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 79f1d7e..e9fb93f 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 dfba952..9c476e4 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 1320b95..c167e3a 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 486be8b..1fad62c 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 9609a48..b1a6ca8 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 4ecd0ba..7edc427 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 5dd3fda..3e51541 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 5dd3fda..3e51541 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 a1d1b50..042b297 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 d84ab72..b333e0c 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 8a2737a..ba472c8 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 fbe344b..1ff581e 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 46ad62e..339d629 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 5184a48..70aad49 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 808501e..aa50ee9 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 d976f2e..3427724 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 1992145..cee19db 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 9f0ec07..9400fde 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 24532bf..83cac23 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 9c9ae2c..01c04d9 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 b9ca8ec..7809712 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 4c3f953..a8091a2 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 36aedc7..7cdb885 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 1f921c5..511bc0a 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 722dd51..3e7a8d2 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 3954ab6..602bc6f 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 cf4a2a2..c84a0e0 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 b49da51..9c494f4 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 12373d5..ae1901c 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 0f47d34..78913a2 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 2e78cde..8677d5c 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 26aae8d..4e7e8dd 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 0685552..760cdfb 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 1c7c6ec..f7835df 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 86391d9..a7ada19 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 5ff6461..1db55d6 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 b9ca8ec..7809712 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 4d8881f..9ad17a5e 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 46270eb..86e75fb7 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 a1f3bf8..c9fcb18 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 ca674f6..17954e8 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 53e333f..cfbee13 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 7bbe451..50943a5 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 e4c633e..4d04be9 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 9d046f2..445f75f 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 18b2ea8..2ea7784 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 06c4a39..7c11dd9 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 3a02eef..056202e 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 79f1d7e..e9fb93f 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 486be8b..1fad62c 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 9609a48..b1a6ca8 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 4ecd0ba..7edc427 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 d84ab72..b333e0c 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 8a2737a..ba472c8 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 fbe344b..1ff581e 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 46ad62e..339d629 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 5184a48..70aad49 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 9c9ae2c..01c04d9 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 32852b3..bd00495 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 3f23b4d..b2d8f69 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 3f23b4d..b2d8f69 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 d2a8b1c..3495684 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 d2a8b1c..3495684 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 d3e16c0..41d2f71 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 86d2b553..0e25002 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 80ad928..b3fec94 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 e4b9ec6..c4b8ef0 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 2ecbec6..61ad16b 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 8fd8edc0..b789af1 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 7de5ad9..4b0157e 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 b4bd5f1..edd3c17 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 4912601..017b805 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 ea51b9d..373ae03 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 d30b137..58eeabf 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 c88ced9..0fb3423 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 2ceee8d..85760b4 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 86a742f..e398b2b 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 22bf892..fe8ef8d 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 7f2db74..34673dd 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 f1a3591..675cf0c 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 3973b3c..619c3a1 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 cf72007..d1c8644 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 672d43e..1c5188f 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 d91721e..56633f0 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 7b830f40..de51002 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 7a2bc5d..68528fd 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 a127111..5fb8c04 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 a5913ca..f6ffc30 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 0931776..8c09f63 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 cf87b12..eceaec8 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 9d620d2..24db363 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 106daf7..fa7ec73 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 45a7dce..f8b26b2 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 143d7c5..54884f2 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 d407f02..eb8428d 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 d0b3672..c6a4f3f 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 07f2907..2411d50 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 fde1226..9f6376e 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 9032169..e27d0af 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 9763599..8808112 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 fb5d0ad..ae19ada 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 a4ae3da..cc3c209 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 12976dc..e1fca0b 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 ef6cb3f..a386b2c 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 d3a4877..91bbabb 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 2de79fb..34939ef 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 5395244..4dbac99 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 a655430..ac2e27a 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 d8370e5..16d95bb 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 b68dddb..48c5d90 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 004d1c8..b7c61ca 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 852f90d..245d7d5 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 fdb440f..04703d3 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 a4e08e9..9af9419 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 8cdef10..5993a4a 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 33dfe53..9120505 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 33dfe53..9120505 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 0d70332..101abc7 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 3c83d96..9fd873f 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 3c83d96..9fd873f 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 00cbfd2..85b499a 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 5d6d05d..e186b18 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 2186c52..4900a80 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 f4e8a58..59f2359 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 da64a25..6e0a179 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 94fbc10..15fb929 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 10a9b87..2b28009 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 7bec830..a0fb940 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 ccd38b8..befd4e5 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 f837022..85fa8c5 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 7932c3d..33e841f 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 b7da34e..694ceb4 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 09ebfb2..268f5ad 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 ccacf00..d921d27 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 142cabe..289deb9 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 57cc44a..2325b33 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 39828a8..c782977 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 311c612..1723acb 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 f983135..ed8bf2d 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 c06f666..2c28bb3 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 45caef1..6d27a76 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 25b6ce0..674eb66 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 6d09ed9..8aee9f3 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 d7da81b..d09d18a 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 318b524..e88c8c0 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 293d05f..393b398 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 536f5f7..3cd3c81 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 9f6da38..1d61092 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 e574c09..a2664ef 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 0363b2e..0289a2f 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 a4c9ba9..d2c4c4e 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 7b452ad..4b983cb 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 5634413..50fd12d 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 413835f..fe8fcf4 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 b34a3e5..dcaf0c2 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 f316185..5971dc0 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 b34a3e5..dcaf0c2 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 f316185..5971dc0 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 e4282f2..ad41920 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 9ed7396..04bf420 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 818af77..2b2400f 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 40f4289..0ebf335 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 0cdd530..adf858c 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 2e7eb7d..30bc433 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 b515405..c081d44 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 3687900..bcf7066 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 7e5ad30..4ae667f 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 015e3ac..b127b2f 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 ab9a118..dbdc436 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 3685742..e66f06e 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 5bae786..edf7de0 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 0876cec..26f87d7 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 ea63917..c173b7b 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 9b42fc9..b01f42b 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 0a51db9..b48f3d0 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 96d4efe..b29ee07 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 80df7eb..30f290f 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 08dc6f6..6d70d01 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 6f9044d..1471935 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 d51f7ce..1a34f12 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 bb589f9..2cc3f21 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 bf64642..cd90ad4 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 53283f5..5f4dbc9 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 dec4a92..43fd50a 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 291342a..4cb310c 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 384ce3e..8380bcd 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 0ed0571..d964ad7 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 1e891f1..fc78b33 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 2dd5f8a..06ef261 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 6ce0a11..187f107 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 0c9ef68..44ba445 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 de76d8c..bb93b7d 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 01fb4ae..3329191 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 eae028a..6e0348e 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 7ec2e6e..73ea6af 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 b5d62b9..9ad1828 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 19ddd89..7110343 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 f574fde..a453608 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 cc41f90..479343e 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 892b39c..e812750 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 1c2e48b..85e5505 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 7b55755..4b42c4a 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 66f17a7..573304b 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 4114b34..d89d233 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 ffde9f9..c389bcb 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 fe37849..73b095f 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 888fc3a..6c1899b 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 991881d..0507820 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 79d3240..7495311 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 0044f23..d2b8d61 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 64c49b5..a34e47e 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 5053bb9..04d9ffe 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 1ba8b11..729f37b 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 8fff45b..a505c28 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 a5a995f..d0f6007 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 087d04c..7c09e7b 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 18efcd0..b1c94a3 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 961ef3e..9abc659 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 8bb9b2f..ef3207a 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 1f325d6..5a0cbce 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 725649c..6adb181 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 f2b64ef..1be189f 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 fe7a59a..751499f 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 41ee9e5..198c5d7 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 4855d13..9ab1172 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 3b8a545..533aa95 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 358724b..fa4941b 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 127baad..325ff6f 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 cef70e0..85711d7 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 7b26834..9c19931 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 30570c9..c2991b8 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 854b211..a052e5a 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 34796d6..29f930b 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 efed93b..ab03bed 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 a5036f3..561d69e 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 8fe6d19..d560549 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 ef963e4..5f7ba22 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 9b03cad..860e3f8 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 616754b..71a0383 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 bcd922c..828c966 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 c2439ca..03ba3e7 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 3253ba3..1f04b3c 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 67e9c8c..5b16cf3 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 2fbf96b..88c5b8e 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 9eef5fa..4cb3c06 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 a39125e..74a3225 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 fd65fd2..e55f4a6 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 7cf8588..9d4d2b1 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 5c30367..adff7a3 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 19df09c..a798ed7 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 f3b3f01..0c0a934 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 599b311..41acfca 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 5947d34..9160d02 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 ae51a5f..a64c615 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 752ef93..9e41d3f 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 87628cc..14f61a5 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 f65bfab..d6e904c 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 97f4f48..5c90220 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 1f79656..4fb2850 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 d77bf6b..cc0a3c6 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 ea13713..019b79b 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 6c8c2ea..8002340 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 5c14161..a6b3c7b 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 ab49563..097fe76 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 6b5cc65..c205f86 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 b462d4d..fa31410 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 4d7cccf..6af1f95 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 430ca89..12b6923 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 0e0cd94..b3bc725 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 c6f619f..f13b40e 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 6e6c808..342ae7d 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 8044755..be68c1d 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 83af9ab..7b6b883 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 ba4ae6a..638edaee 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 74864c0..51d8da3 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 ac5c8cb..cbcff32 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 b0907b4..d0a3d23 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 9770282..dbceeee 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 47bb524..4ca9430 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 31a5fe9..5eacc49 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 514575a..d5f5c51 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 f985b41..e8d3160 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 c5c9f7a..afa74ac 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 729893b..14e11ed 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 4de289f..33d008d 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 aeba0ee..a75601c 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 207d90b..872f505 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 8a2bd6d..255485d 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 28e8e07..7f534a1 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 c1f0ff9..019da58 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 c1f0ff9..019da58 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 bc4182b..00bc2fc 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 85e9726..5e10f60 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 1f4cfc1..a16ae50 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 4e2f278..0636689 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 f3845b0..4f3067b 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 08f0846..1f48eea 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 08f0846..1f48eea 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 3d42303..1433ed0 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 405c2bd..1c8ce4f 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 e566e4b..2c0ce8f 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 768489f..9b3e4d6 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 e566e4b..2c0ce8f 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 768489f..9b3e4d6 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 bd91636..62ada9c 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 b9c796f..aadfacd 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 b9c796f..aadfacd 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 515e769..7768074 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 5534a91..d36dcc4 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 ba8ea78..9666d45 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 5ee9162..53a4e65 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 5cd08c1..10d17de 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 eb63906..1bb1c51 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 e85af1b..a1499fc 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 478ff31..d55a77c 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 d185056..65114b7 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 d99abe3..ef0a315 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 7999394..1e0562a 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 f40c3cc..c2d7aa3 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 7e57d72..6d1157f 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 f549521..2831706 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 03b6297..d850977 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 0cf0b03..70dbfd0 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 26a422b..4cf40ea 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 13a9ba0..29fc1db 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 d98a0ef..b9d9cdf 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 a2988ea..40696ca 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 8f28511..dd36295 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 86008f3..9e35ce3 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 b61f4f2..652c1c4 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 509f2a5..be06bd7 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 e3edf0b..e2e4e33 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 c8322ea..b257262 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 4c5cfdb..99e5d23 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 8c26d03..4b9aee8 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 688fb08..dfa000b 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 73afb82..8f4a859 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 21e36a0..b3a235a 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 3d9f14d..f103d76 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 9f5122e..358375b 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 bf1ba81..71dc664 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 f83622b..2ac7082 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 c60d916..2684c88 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 2c9472c..f47eef3 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 11f0890..832a84e 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 9cba35c..15bdec9 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 036cef0..046a823 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 2b77af8..d3c4bf5 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 1a35706..0564e4c 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 d5a6c49..9ebade4b 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 3d4d231..9d93dbc 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 2954f89..4607c6e 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 2d68b32..c73f3cf 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 ab99453..3c4232e 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 f255782..c466121 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 7f9082e..ba8a27f 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 22889a2..527913b 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 2b18b3b..98fdb23 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 2fb61bb..86ddf34 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 4ddb7e5..290318a 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 ba8a584..cb44bab 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 c3d6e7a..936ff17 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 34378d4..dfb88e0 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 e583ab4..00d6723 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 25425a5..92d1686 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 4b9d2fb..45b0a8a 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 c0482f1..bc47499 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 551c6fc..a3218ad 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 467ae21..49bf6e0 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 7abc60d..8d4eaca 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 15be0c7..8d59a23 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 103cfcd..83f2104 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 3060fcf..dcf6a59 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 d1ad10b..5779f9f 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 6299054..12f16be 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 0b0fde2..facc694 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 e8f7b85..a58a2fa 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 7dcbdb0..fef71f2 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 0e56037..40cb8e2 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 0e56037..40cb8e2 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 d22769e..ef2b42a 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 14f7e67..01db093 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 865094b..4f10343 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 457adca..22341f6 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 4bb7a47..84ed246 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 b43f2ca..51dfd81 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 21d70e0..2e1bf93 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 0400e41..37422ba 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 ddbfe72..0205574 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 b457588..777d956 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 f3acb83..b74c9879 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 903cac0..7078a2e 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 9c9f655..16d9452 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 1439e70..2773ba5 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 67fbf31..4149b34 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 ff88caa..cf776e65 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 349320f..dc90749 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 6a12921..1a55ffd 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 b02c47b..0bdf463 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 0f3f93d..6f30b94 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 28be7ae..9c4c971 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 7d3e6a6..d2efbe3 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 4f1b400..4e8d9e9 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 a9ac377..d6e3ef1 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 92b8954..38767a2 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 a56b426..30dbd79 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 452cd65..f70e77e 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 bc1e7e4..3d0cd06 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 1a88c01..716c099 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 89e7047..150bc0f 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 721d230..4dfe478 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 f27b713..7e1a93f 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 43e340f..8af1053 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 74ccc26..43da30f 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 72e7035..c23f494 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 16c2a6c..43ec88c 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 566ac6c..a1e6d4a 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 4a67c5d..9c1104f 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 f61f797..b2214bb 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 2438480..bf12f71 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 1e669c9..0e138f6 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 51d2223..11ac866 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 6e4e638..0c11570 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 ba1addf..c38c4cc 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 553160e..211ef080 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 78f3416..4034f2f 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 85f9ad5..fa07b99 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 8f72093..8c8f95f 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 3819468..4346908 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 ee35844..3cef8a3 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 ec389ed..5e92cea 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 d6c38bd..ed3c9c5 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 8a42c78..31f1d2d 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 40a6eb9..ecd4845 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 26a82c3..efc7643 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 6405f75..3cbf80b 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 6888a2a..0b8d4f39 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 90fe22c..91a14f1 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 ad79885..a859937 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 4788b5b..ed7ce0d 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 9e0c01d..4aeea40 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 224b679..efa832e 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 108eb76..f711427 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 22f8000..4af0145 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 6efdd40..3d62f3f 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 22f8000..4af0145 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 6efdd40..3d62f3f 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 698e0efe..1116c90 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 b6ee98c..f9ea998 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 e81e9da..0f2a0f9 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 7295b2c..778f9bb 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 0853079..259fe4d 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 91a330c..93e4604 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 71e480c..5b37429 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 56743f9..d9f336c 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 87b2de5..30d7e2b 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 c0a1bfa..5c736fe 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 c5eca46..2f94616 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 10fb1658..76e1c18 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 b6a5940..82c240d 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 43e340f..8af1053 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 74ccc26..43da30f 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 16c2a6c..43ec88c 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 56d90ee..971ecdc 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 a6b5726..6dfa9dd 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 25a92f3..ddabade 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 5b7232a..fa0dd86 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 a176f49..667a680 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 056b6b8..821dba6 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 a933c87..75bedce7 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 2935168..d8bc290 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 2935168..d8bc290 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 ffd0043..911ebfd 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 3846dac..f7435b2 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 ff698de..fc97ae8 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 fb8aeb9..dcfaa91 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 850b78f..546ee7f 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 61e63b7..6697c49 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 43a266d..1f6d894 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 840291a..5f8d112 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 9e4e39c..9b8c412 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 ecd10ca..b757fd5 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 1367609..b37972c 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 b6a5940..82c240d 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 844bd08..e955e5e 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 241cb9b..97f351c 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 faba0be..aff2943 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 77db6c2..d0f05da 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 87b04b8..3964ed1 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 9cc3257..be81f92 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 65aaa97..7300e12 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 1187653..c1a168c 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 7d46578..2df0dc5 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 81edaaf..6b6efda 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 10d6d9e..1393da8 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 0ef16fd..2f6165c 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 7ccf46e..f2d1229 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 33dc5d8..bac46dd 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 b612d01..7c5bb7b 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 62a286f..9a4dec6 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 e1380c4..b809b40 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 1173885..76f7bea 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 ccc567a..88af61c 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 81bde41..2c0e3e3 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 dc93bdf..3af17dd 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 c5cd10e..2a080f8 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 dc93bdf..3af17dd 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 387b629..0464a4b 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 3637944..b99f81f 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 4435c1b..39d1878 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 8ec2c7c..d737c40 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 563a921..61e067b 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 4d85838..30d5c3c 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 4c5680a..20e995e 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 0fde7e2..3074eb3 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 77d8428..c5ca21d 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 85785e8..5a74a10 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 15b909a..57b45e81 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 e61e174..04e7f40 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 2ba37d6..fdd6547 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 3ac95eb..1cd3309 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 b2545a9..f0ff6ae 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 0009962..a8ca91e 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 e4d3aa5..8ad73f4 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 b94ac6b..adb6510 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 0009962..a8ca91e 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 2be7ea3..25b4798 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 2be7ea3..25b4798 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 c2af3f2..ecb73f9 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 c2af3f2..ecb73f9 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 4faa0ce..a110fa3 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 2f21e5b..5d44b31 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 c2af3f2..ecb73f9 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 8d2c922..8526aeb 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 cff5d48..ca3bc2e 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 4667397..11f6bcb 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 4667397..11f6bcb 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 aa0c5c7..47aed52 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 f72e6a1..2140e5b 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 9441d71..a9a588c 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 70cdebf..78a4f51 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 25dd770..f9908ec 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 70cdebf..78a4f51 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 25dd770..f9908ec 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 b69ecc8..8508ab8 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 eb60ea1..201873c 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 83756e7..05b94d7 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 36d73a3..3330cc3 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 b76a748..10a2926 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 b76a748..10a2926 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 7897d5e..d5b0e3c 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 fadff99..0cf9d34 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 c55a2bd..538d1fc 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 c8f5185..410fde2 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 e812108..57a8bab 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 c63ffa5..668eec2 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 8488fb2..3632ab3 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 c2e9951..1d4772f 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 5471dd8..8082102 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 5bc704e..1863b68 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 b9e6000..8dd24ae 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 23a779f..36ea8f6 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 b752461..484c21e 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 71bc9df..3692ee2 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 cfac132..2e0a5d3 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 83e1a7d..26d6c8b 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 5d7a1fd..5c90a8c 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 9e4db23..76eb6ad 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 7826cd7..9fcf4d5 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 49b7ad0..8ab5d3e 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 2cd0a69..2fe331e 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 21dc074..a4e5694 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 2cd0a69..2fe331e 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 21dc074..a4e5694 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 00323b8..41d170f 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 d24db82..8ac8935 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 4e6dcf1..e5dfb61 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 d8716b2..6be8ef7 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 3a1e33a..01a1c74 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 9c20e5c..0294f1d 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 631bb19..77034d9 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 88514ba..b98bbc3 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 e500b04..03914cc 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 8c1cf2f..36a5979 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 4213d9a..6e18b55 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 4213d9a..6e18b55 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 5912690..323da28 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 43f3aa5..5aa82df 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 d2760bd..302a24f 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 f21745b..9b1b2dc 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 b8ec61c..456d9d6 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 65ca83e..1e1adcf 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 810d5a1..b8dc5bd 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 1410a35..a505b38 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 ab35181..e7cd0bc 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 c1d7743..d34e4e6 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 8848c3f..0b044ac 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 3d9a438..16a098e 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 ce183c2..f0d9d03 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 5e94cc7..c69120f 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 5e94cc7..c69120f 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 12b5c45..0cfe2ad 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 aea50c5..6febd47 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 25579a8..ea715d9 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 4ef27ac..a8c8035 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 3545356..16e92bb 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 7acc994..299203c 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 4e03a86..59804f3 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 64292c9..5f6a936 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 7e77377..afd67e0 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 9ddb55a..e41c32a 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 c8816cd..da4f75e 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 75c3adf..d7d3939 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 4667397..11f6bcb 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 5b0df9f..c54912a 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 adec38f..2a4a5d6 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 17dd9393..5ce8d7a 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 fa22c00..45a84d5 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 6a58b39..92ca8fb 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 45e0bf2..cb2519f 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 8ac9269..c0e4255 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 d48d346..5fadd5d 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 e2639ec..1029002 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 d5e249b..0b95598 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 e804e64..3693179 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 98f0843..8aab8ee 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 9e4457b..a82e55b 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 117d29c..d5192b0 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 c47ccd0..bef5830 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 09b5f60..fc4a5ed 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 b33a964..76ba5c3 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 70c5eaf..e40c91a 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 43e9fa3..f9d3484 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 a88c2bd..b9cda87 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 bd738bb..1c59cbb 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 8ad057e..e1d1f12 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 7cc2b09..25356d2 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 cbe0469..6e1ef17 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 1480470..60a38a6 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 1b068fe..febfd5f 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 fd79030..cdd4aea 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 61ae1bd..04a9cfa 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 040db26..1e0d123 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 3f95482..a84091c 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 77e79b0..8a62879 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 226095b..5aae964 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 6b9a54a..5c9d95e 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 87f80c0..51edf1b 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 e332b84..66aba88 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 f42a40c..6f41c63 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 e4863d5..5e5a06e 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 90ebb73..37383a8 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 9cb2ba9..18fcd991 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 78997b0..db67a21 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 7096347..aa2ec72 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 c4fcab4..11546a4 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 c9ab108..1742451 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 fd80477..d3f20cb 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 47df4af..b5e9204 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 6a92963..4090469 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 f8f9743..d514197 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 1511f0d..0dddfa8 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 696359b..624fa58 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 b3c9a46..d6e7dbd 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 95a2b55..b686cb5 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 a6c35c3..0ef48da 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 6f4cd9a..9f3d61c 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 654e770..d6c8a93 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 9cf49cf..dd5ebad 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 647d156..f66497b 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 ecb61c8..d5bbcb2 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 dc4ac4a..c1aeaa9 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 41101f4..739f628 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 9cdd8ed..cf66799 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 d7ce9b5..3a6fa98 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 62a286f..9a4dec6 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 7139340..124a3a6 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 bb5436a..1db6a01 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 55cc4bf..50b4d5f 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 55cc4bf..50b4d5f 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 56e3701..780977a 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 5993159..d4c17a6 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 7605a74..6494f16 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 866585a..27dbcca 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 7605a74..6494f16 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 866585a..27dbcca 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 fc3c0be..beabe39 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 a8595f1..91c88f8 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 30274bf..eca390f 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 e438629..5379910 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 c17dcea..8d0db3a 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 2dbc2d8..bf27377 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 b862cab..31e2706 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 a06f42f..de2eddd 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 649f063..7c111b1 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 da913b8..affe370 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 26a52ce..a325b1f 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 93c87cb..c70da23 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 40e1ae6..29949bd 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 6dd45c4..7d6247d 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 e4d81bf..c9bdf67 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 41471a8..1a7e936 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 1173885..76f7bea 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 0618f32..06bb302 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 0d02f0b..cd80caf 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 c39bba1..5486812 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 8723308..5a8368a 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 e067bdc..d057d41 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 565434f..6e527ed 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 29e87fb..0b30a1e 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 c153904..395ddcd 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 c153904..395ddcd 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 5305a9c..28ec562 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 25a8f48..ebc19f9 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 46df6bc..167d10b 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 ab13be1..5a3278d 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 98a4fa5..4ba8e1d 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 e4ca172..2ab0619 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 54126c9..a95f60a 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 488d8f6..b8322de 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 4947972..726845c 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 fee705a..dff84f5 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 bbb48a9..19a1c04 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 692cf6d..da1ccec 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 b8ea519..c513544 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 5f6ffd5..acde664 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 ea36b49..b5f8d66 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 520fdf4..98dd360 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 4e283c8..e4fd672 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 249196c..57d859f 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 4fecf1b..b73e0b9 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 460027e..ded9333 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 4b1290d..cdfeb20 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 0f6ec22..1c2e9d5 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 227329a..08f172e 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 088763c9..daf150d 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 82dc7cf..ac5cc43 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 c651b7f..a78d7fc 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 cfd9b27..e468e57 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 beaf698..2341b60 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 1a2e8e7..9472fdd 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 92326c4c..e1e7e99 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 a4003f4..a05f351 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 81498e8..aa5f4d3 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 c641576..6c12db8 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 0f04057..9f426d6 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 a3fa955d..7d4da73 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 571d6e2..160d5da 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 1fa8992..50ed373 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 f3ef4f9..e09a00c 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 f8af21d..f637d63 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 e864587..5aec1d4 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 643aff9..1560354 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 f01d01f..2c2d031 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 babefbc..50bc551 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 e102974..4a1af13 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 b895060..cbedd00 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 633cdff..20eff56 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 e2a4e27..9bb31b0 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 a933c87..75bedce7 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 2935168..d8bc290 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 5aedce7..d0cf841 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 2f879a7..6d9a623 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 413a8bc..3757bec 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 d362281..d7aa62c 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 d723af9..c2a1edb 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 0a7dfe0..877957d 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 f31d3d9..aeea3ca 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 074faea..766c376 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 5c231b1..d0f7263 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 f911066..fec80f2 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 610ab0a..8b04866 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 f9db194..53b4b5f 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 8e94735..ad1d973 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 2323a7f..bf622cc 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 9bec31a..d860d65 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 93483f9..f84cf4c 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 e468702..f5e349a 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 40c4dc3..bd7cab3 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 46f3919..f2e486b 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 a39554c..a2e61fa 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 9070a71..16bb517 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 808e570..3b54f56 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 4f82454..b3402b8 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 f6f773c..3066fe1 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 7cec00e..1c1fd74 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 83a0ce9..a1b4cf4 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 5c82bf1..bc645e0 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 0796ac3..48c6e01 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 ba0dbe8..d923127 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 8f0dd08..1a0dbbb 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 f82416c..54b2777 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 3c9c5ac..f9cfe3d 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 6d15176..c0f8015 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 a3bae59..a7fae00 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 4f63517..019a920 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 46d5f6d..a8b69c4 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 b58655d..978a0c2 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 a1e4a94..e1ba196 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 d797f22..0c196c4 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 f5dec2b..b29891c 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 e326c14..2d355a9 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 9475e68..5266d29 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 b93b83e..7c86ec7 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 818e79d..969bfa1 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 4563933..35af60a 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 fd18225..78accba 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 057eb15b..91f250a 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 3dec872..8493153 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 7a91f80..3e60ed7 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 35337d2..5600872 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 0f90188..8b8b8b6 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 764375d..86f48e7 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 be13fef..1592b5b 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 c7d5de6..0ad1b36 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 f31fb23..938b4ea 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 e4f11ce..d94cf26 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 4ebf08d..c00396e 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 1af3f36..17fcdad 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 6d83289..6561747 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 2e35e56..a5e40d7 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 dfd318c..47b5a7c 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 c257dfd..e661fe1 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 984b23d..81086cb 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 f4e0f1d..170b30a 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 edb6057..cf6aa88 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 4e06840..007ef93 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 979c55d..c0c4659 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 8f28498..62daf46 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 8734622..699e5bd 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 84d6854..be945af 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 b9c5d2f..8505f57 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 ce2141a..c53419d 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 05f9351..746954d 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 9fcc669..2b1834e 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 e745a6c..2958d11 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 e89391a..af32d08 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 73eaab5..b962e6f 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 e5309de..12c2802 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 4756957..6a9465c 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 4756957..6a9465c 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 b01b8ef..59db48c 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 3eefdb6..f836578 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 42d7a14..d2b8a15 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 4597fbf..165fb37 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 439aaee..9259e22 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 f264867..a0b223d 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 f6cf800..f000804 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 511b49c..1ccde65 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 b6fdf20..5e5d8f6 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 34800a3..0a076a8 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 772a0b1..463e626 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 772a0b1..463e626 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 439aaee..9259e22 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 439aaee..9259e22 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 fbce5f6..96797c6 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 359709b..4570fc7 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 46dd9b7..6671c8f 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 0ff21bb..74b86dd 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 7b13fde..e651223 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 cbe981c..cf93ff0 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 cbe981c..cf93ff0 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 8915359..e393488 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 7477594..fe07c4e 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 1246bac..1ef3b8b 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 9a9011c..5db165c 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 e1f5a3e..8556fa2 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 b587c0a..d6edd65 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 8c8ed7d..273602a 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 c9bd9fe..0ffd652 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 e2bbe3c..5dd6fde 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 c9bd9fe..0ffd652 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 e2bbe3c..5dd6fde 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 e1f5a3e..8556fa2 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 b587c0a..d6edd65 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 e1f5a3e..8556fa2 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 b587c0a..d6edd65 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 8d38d7a..641addb 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 009cf0c..7438ad0 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 e4b66f2..28bbe78 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 baa2a31..0d02345 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 8164bbb..5cb29e6 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 73cb9d4..a34df0e 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 fbac4b3..7de1eb5 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 96a4f59..a4944f0 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 994a748..57a344c 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 0d1dabd..ea5beb7 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 cd7e6b8..56b8b48 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 0e49ae9a..8e738da 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 b14a472..e4f9096 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 aa7127b..387fbe9 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 f3a8b7d..b51aa22 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 be7c8ec..5d37ecd 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 a0142c6..ee7ab7d 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 c030dbe..f45ffe0 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 28bd6b6..1b83bd5 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 5568aab..4d8a203 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 d229866..d17d26e 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 cf971c6..e02d7f8 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 2a4962e..faa0c64 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 ba77afc..747cd29 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 ee27736..cbc554b 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 f6e0c45..555fba8 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 7af19c7..ae54e9c 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 cc9850f..6b85d00 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 34436f0..473e0ad 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 af40df3..e9d4d49 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 7c8b301..d2b4807 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 0527833..5eb331b 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 fd8a1e0..b4c5b86 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 e710c74..b4b6902 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 60931d5..48a4677 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 7a19062..f297e9d 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 fd2a392..71d3218 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 225dc4e..88a7830 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 05e3b77..c52ff1b 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 b9e73b7..f865552 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 73b461e..c1b3773 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 5208159..f04c23f 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 b9e73b7..f865552 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 f5cd188..cb17a3e 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 c9883a2..06eca1b 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 73b461e..c1b3773 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 5208159..f04c23f 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 0517b3a..443d88d 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 1f3caba..e649303 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 109e99f..d080d23 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 a322480..87ca50d 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 94cfea7..e7bd24e 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 e6db126..0d8b18d 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 bc97c1c..66163b2 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 21bf6a8..43ea9b7 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 188bd4b..5ace94c 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 f1ffc683..0ebdefd 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 c66a339..ffd0056 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 43013fd..cbecf9f 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 9a1e922..f71554f 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 55a710b..5cd9b49f 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 5530774..2ffd29d 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 447d333..1f19d17 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 4271c54..84b9660 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 5e1ea3f..6c7eb25 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 d5614c9..e26d694 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 4319070..a5b23b3 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 3b967d9..7348d6d 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 9c88000..60178bd 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 a9c2a59..b4a8140 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 1188cb7..921e7d1 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 1188cb7..921e7d1 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 634004d..e937613 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 53cbf87..eeaf3e4 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 3ac87db..a3a9c2f 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 03ff999..5143ca7 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 8b67d56..58fc18e 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 748252d..9c5606f 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 218418c..50dbc78 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 c06fbee..6d0cc15 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 a1851ef..f5ca75c 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 af5fac1..8c36424 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 f8b717e..e3eabe8 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 0cd5b05..aa69afd 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 d29e698..5c15739 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 f007ab6..a7da69c 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 00a0093..a714a3f 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 ac95d58..56eec29 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 55faf02..69e3a27 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 a6fb478..413ccdc 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 1ad0fe0..2eb1f11 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 d1cb57c..2dcc5a6 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 7b38095..015e38e 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 0c4b369..042303a 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 dd9263de..f546c87 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 28ce0a0..94516ed 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 648153a..0280ff4 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 b67a2a7..587cf24 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 f06784f0..a771e3f 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 8bfb41e..619753d 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 410c4f0..a7c31ce 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 7aba146..17069b3 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 f9a5800..d1bce0d 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 e47e498..a966304 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 e7bfc2d..2b58487 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 6d9a683..bcf2fed 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 7861e2a..8905db3 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 707caa1..51a176d 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 41270b8..52588b3 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 6b4b5a7..0216d7e 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 afe2d6f..40b204c 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 d2649f6..69881ec 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 f0c3335..976e032 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 52a8476..5910bcc 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 b8e0ca5..76253f7 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 401c7a0..331f51a 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 401c7a0..331f51a 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 401c7a0..331f51a 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 401c7a0..331f51a 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 401c7a0..331f51a 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 64ff717..f81d535 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 bcb49e9..cd8ef40 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 ad44fec..3db1a76 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 71e16e9..9cd2067 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 d882a3d..90ccbc9 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 dce7baa..803d0a9 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 f3817b6..519196f 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 16ab0e2..1c3ae5f 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 4fb93cd..afdbc49 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 8e6147a..89e4c01d 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 6163c59f..9bbe00b 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 d1ca992..1462294 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 2dfcbf5..192ddf2 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 865119a..afd3fcd 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 3798049..e9cd7df 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 094cf92..d6141d3 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 ceb3fe4..1430461 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 bf41954..3543faf 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 09202b6..5c9340e 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 72eba47..0cc105c 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 20ec77d..d08031d 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 4d49817..935ec57 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 6b91c8b..07c01f7 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 5a50a34..d27d4db 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 e1c3243..a287ce6 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 5572d04..2a7c457 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 3d1f147..1ce86e8 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 cc6b324..a9313de 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 1fe512b..2b77ace 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 ebe3d76..1bdb5dc 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 8033ca1..b0662fb 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 601e83e..baea324 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 77f980b..d7b764f 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 c6a115b..7579fe1 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 0ca69c8..918045c 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 d0117ea..415db2d 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 94050e2..ddda40b 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 7da5835..777593b 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 41fdef0..58bcf40 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 c771e7a..453e263 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 6b0273e..74ae98e 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 23df67f..0bc68ba 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 a725879..8283aba 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 713d4b5..dd52e44 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 4d6bd74..8e0a4dc 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 d5993ea..2d745b6 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 fdc8379..dc58f8c 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 e83c0b5..e2987ba 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 28f7a60..8592b27 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 dce6699..175462b 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 b060b2b..2d08e2e 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 ae0b838..1bdf37d 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 7cb9048..5f27a67 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 52d4f34..1ec5274 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 61274ad..f76eeeb 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 cce0b15..60c7e70 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 24f970a..3165253 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 1fb264d..17b8e0a 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 415c5c3..12b2fe6 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 8ed5ede..075250d 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 8b72a93..fc9508a 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 5290d88..f4c9fe8 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 1751ab0..8a1ecae 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 6c4c6c3..db088b5 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 588a460..d15b704 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 08d0b11..076741c 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 08d0b11..076741c 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 bb9aade..45c2e20 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 b78c9ca..fa2f1d8 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 c1b55e5..d4644c6 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 3202fc5..8aebb6f 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 ad0238e..00bdea3 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 ce4b75a..d81d240 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 741f7a7..f56e4f3 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 b40526e..54ef74d 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 c5161bc..cfd862d 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 74ff8c7..61396ab 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 535cc41..e8f5529 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 0e03159..4c1cc92 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 cf34ead..26e2245 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 e623e08..599b1d1 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 8ca8e69..68c620b 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 c85ca74..06b8d10 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 35495e4..76f9fad 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 82da00a..92faea8 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 873d3a4..c4f8bcb 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 4667d1a..15a7d66 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 488ce83..866d46c 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 8ecc4ff..e02bcba 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 158fe7d..ec7c488 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 158fe7d..ec7c488 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 8ecc4ff..e02bcba 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 8ecc4ff..e02bcba 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 9fedf3d..997a33e 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 5139110..48a0c4a 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 4b22fa7..ed72acc 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 270a760..a454fdd 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 6031009..3dd7787 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 3cf4cb4..f045528 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 f2da1cd..fc03f5e 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 63c0e56..94bd21b 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 8a918e8..4e7a539 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 47917f1..5962695 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 997fbd4..f6c0d21 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 4f93bca..f0f0781 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 5d9c697..25c82ff 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 328c550..b94261a 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 0060de2..9987f9f 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 1df732e..a53ee5c 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 6ea2b71..33a3946 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 b0c2657..1cf91d1 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 0606b8c..11f8e36 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 aa4dedd..68dbbf5 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 e8e88a1..a027024 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 0000000..8bc3be4
--- /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 9ec6a57..4c7d453 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 c6f84e9..4bad793 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 f8eaf3f..d9fa7cc 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 816a7fe..013534d 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 9947cf7c..dbf0619 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 3087a8e..3e31c60 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 7c4a25b..5007152 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 929625d..74cfc09 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 4e7dc71..9a00056 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 da9bc88..127d011 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 d3f68b1..bfb3ce6 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 d0fdd94..4019c45 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 c0c1f90..7c0cb37 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 52fd605..8e548e4 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 48013c7..682755a 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 2c1a83e..15f3bf6 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 ffe727c..72403d0 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 f4fe717..9f646b2 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 0f08f36..cf7aa0f 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 f4fe717..9f646b2 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 0f08f36..cf7aa0f 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 5d5fee9..146f666 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 00b0b44..a6a89d1 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 42daab2..ef70423 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 0d630bf..ffc8d18 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 026ad81..0e27b931 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 27763b6..6c42c06 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 a443b8a..52996df 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 5b34674..4fa4249 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 931c80f..be5925e 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 d3f83fe..0922af3 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 e25fd91..e0f99c6 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 ce564ae..a0e5684 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 f62fd67..52e63ad 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 995d4d61..6dccfdb 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 8d515da..64f23b7 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 05a933f..543b388 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 47917f1..5962695 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 128d620..3e8785e 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 4861ad10..2c6e7b0 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 0641eb6..08edef5 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 2b2a995..3fa14a9 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 960687c..81e14fa 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 74d00c6..7501d47 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 5018922..6468500 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 b50dc5b..186cd1a 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 e0092a8..675ca56 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 80477d6..e096353 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 430ad99..37b0c1c 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 6774ac1..10620bf 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 c780710..5c755d9 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 b5ad47f..d9aa7ba 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 2a69a58..6bd726d 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 7d19a38..f0a82c8 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 d6a95f0..bf0ad5b 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 2bf124a..29a8f1e 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 c21cda6..daaf1f4 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 c21cda6..daaf1f4 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 c21cda6..daaf1f4 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 291eb04..617358e 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 60ec2c9..b438bec 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 a9e9a95..8042f20 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 0f962c9..6825fb5 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 58f824b..fe5e02f 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 8455df9..42346cf 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 ea05047..aae072a 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 dc16b8a..4656b6c 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 ce9beab..65d9dff 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 5ce004b8..bf3bbea 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 f322e65..b03e14d 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 e42ad44..ec300cf 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 9104351..a8878f9 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 8159b1d..65a413b 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 546d4f9..97502c2 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 7ecb212..91b75b6 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 619bd70..2f5e8b0 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 cb718b6..2f94e38 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 8f52e0e..a7f0c04 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 c96ad01..91d4892 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 9087681..1e37c4d 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 8bd9ebc..4aaea8a9 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 697da8f..cf7023a 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 795f9bc..47006e7 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 5edfe6a..fb12358 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 eb88e0a..a4a892a 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 ca764eb..0939c0e 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 390efb6..b0b0663 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 c32b129..3ab52d6 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 290f967..07d2be3 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 ca764eb..0939c0e 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 50b6372..9c5ae1f 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 1b5c466..fd4e747 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 d2a8b1c..3495684 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 fbd978c..e8771f7 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 0d09329..67531fd 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 8f9ad13..6dbb57f 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 5dd2de5..50cc753 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 5dd2de5..50cc753 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 5dd2de5..50cc753 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 5dd2de5..50cc753 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 e8d216d..be3b23b 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 d2a8b1c..3495684 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 f078f15..8a52fdf 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 f078f15..8a52fdf 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 f078f15..8a52fdf 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 ac150a7..a6cf086 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 bf53b52..083894b 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 a93c3b9..8be6cc3 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 0f00233..0bcfc46 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 8df2ec7..a3f0b7d 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 94a5015..0d0686a 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 bddf64e..80dbaf5 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 a42a331..76ec697 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 74a416f..7239732 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 e029bf4..4a46bb1 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 da3e4a1..c36826ea 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 8db1951..9f1d724 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 bd5a858b..a0d9bab 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 1b79910..3cf7f52 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 734d3e9..d7cda87 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 60ec2c9..b438bec 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 a9e9a95..8042f20 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 24a1220..80e7bc0 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 e63d04e..fbd9dab 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 eb5d17d..d3f32fb 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 76ad3c9..fe65182 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 63a06f8..0337ea5 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 2f07a52..1438486 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 c509d05..aa115cf 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 46a2d24..b06be45 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 e9a5fb4..a4feb81 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 6806855..cb8f4be 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 0562961..d5bb317 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 c1e9c22..93ad8a0 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 0b139e8..12feb1d 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 3af5c41..cbc6f81 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 2117102..0e01901 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 93558f8..93f416f 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 985d9b3..c025268 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 099a290..21bbafe 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 cd1256b..aeaad9c 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 201738a..a721bf1 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 93ade50..1ffb4b8 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 916c3ab..561c2ab 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 4871be3..c7bbcd5 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 f72fbb2..85c2ff7 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 b69ba39..8bcc5d6 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 da6b0a2..e3325ee 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 d885ae6..b0131f6 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 76429d8..006d67e 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 aad4fd5..02f4a92 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 c99f0d8..a5f93f6 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 b5ab230..d41bf33 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 21f2506..3e68b2c 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 5bbd022..6a2ec02 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 8e446e8..29e9e63 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 dc98749..4fa57ae 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 e230c77..d677295 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 eeebf9c..dbf377c 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 bb0c31b..02ca5de 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 d337dcd..833ffa3 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 69b0b58..7b16bee 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 2f8d94d..6b0c935 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 dd5f670..e3f9ad6 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 235bdc2..124b98c 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 8fc8fde..8ea603e 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 b28b65e..d53fe60 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 c54d918..40356b4 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 a1883de..081f953 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 0555b7d..c4cade6 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 d7e3be3..41079a0 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 dd38a08..692ba1a 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 dd38a08..692ba1a 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 b5a541b..d09953d 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 bd79bc0..42220f3 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 5a77d59..ceee63b 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 dd00e9b..d28f8a4 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 97846e8..7131f0d 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 bb90267..ae4af9c 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 57651f1..b7d708d 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 99cff34..02ca147 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 f73cfba..20cdddf 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 b4d6ff9..9d687c6 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 b84856a..9ffd1cf 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 d846898..0c6a246 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 eab715f..6366643 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 1f77cd9..ee828ce 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 895bbf4..a9a77d0 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 a5fa071..f692394 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 02ba705..642b6118 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 d8981f4..db00f82 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 e3d809d..2d7ff66 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 a4595fb..84f84d5 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 e397e62..ccfbd84 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 e397e62..ccfbd84 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 63d9ccb..2990416 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 0ae4a71..e204e7f 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 ff925d1..fea9b6d 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 62af922..4b83a0d 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 5a64fdc..52a458f 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 9c8805d..a645105 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 cfd0549..df43803 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 14d4cbe..57a22ae 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 1f224eb..f461cd8 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 641ccff..a879a22 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 a19b934..cac6651 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 9ee0551..282dd29 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 81cb657..5393ada3 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 397c2fb..216b122 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 ed7af84..6a929bb 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 90cd7b9..f5be829 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 0a927d1..7707c7b 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 139ca87..b6dc3db 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 b287bc9..320a1c8 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 3f80ce9..d10f83a 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 1a7619a..55e3200 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 a1bcb7e..262a823 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 992ca8b..f4b4e83 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 d5a7f18..4af912c 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 3f06676..5008dc6 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 7b05600..3eaddd6 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 4f9ef5d..96a8312 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 c634136..c525291 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 608cafc..45b7286 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 f611d3b..74c2b56 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 cb6be48..f0daa09 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 c3312f9..11e61cb 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 ed8bdba..efd9d66 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 a219aaa..89d70a4 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 b06ed46..5ec219b 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 9e87b69..083be48 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 b251815..f6895ea 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 53b0ed2..e048f69 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 65ec9bf..43de72f 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 a78e643..bf5a2e7 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 03aa400..035e503 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 33ffa50..8944bc3 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 41ea1cb..a3d27ec 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 0550fa8..a145fca 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 d5c3b0e..e70985c 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 228613a..535e63f 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 89fa704..eb797e9 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 4f77fae..2ec8d10 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 35f6293..c837084 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 9bfa6a5..d46b216 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 3119233..844509e 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 44ed609..7bef143 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 fed7570..a60b82d 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 8ba6536..4a95d18 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 b78d831..213dcb2 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 2d79791..b937a48 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 f513954..eaf3a01 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 0a88856..fa48fbb 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 219eea4..6b0d1e7 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 ed84d2e..710c081 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 8eae98a..4d56d58 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 f5cd21f..6bf10cd 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 3e60357..c35c3e6 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 3e60357..c35c3e6 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 7b5ed57..ffbb235 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 36f3d61..4ce1098 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 32c9815..b5f068d 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 32c9815..b5f068d 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 d2a8b1c..3495684 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 a22eead..72d1865 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 4b0b867..1268e00 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 d2a8b1c..3495684 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 1e016a0..16ebcab 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 91bda54..9f06c99 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 29be5f2..79603d3 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 35b4e80..7b9a163 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 2647718..ebb6bb9 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 f3cde17..306ac91 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 b2e432e..329847f 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 f3cde17..306ac91 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 b2e432e..329847f 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 065e8ee..e3c5d29 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 29cb572..e38e865 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 a3e6e3c..fb52000 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 29cb572..e38e865 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 a3e6e3c..fb52000 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 3fc53a2..853e487 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 8a16d44..384b7ab 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 3fc53a2..853e487 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 8a16d44..384b7ab 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 177a6e8..161347a 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 1e0d474..3260bcc 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 a02b891..8da9224 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 14dea7f..d3f01c8 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 0096d39..c2b9fbe 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 4604f99..6d8d1c5 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 a362c3b..873389f 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 acd5ca6..0ab8404 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 ef584bf..4c00650 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 5d90aa7..f9cba33 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 a58cb28..357aa3c 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 7d8b021..762c388 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 1f2b9af..ca5a454 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 82fcbf0..fe12581 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 f60a6ef..d29cc17 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 5d8c645..4168f78 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 47a18e6..e2d8c0f 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 d7c9181..4edb8e3 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 ef4f604..5b2523d 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 14bb9ec..97001e6 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 508088d..719125b 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 810ec4d..f95a956 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 631c18c..27f3244 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 daa675c..2648287 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 5111081..2f133d3 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 0aad77f..c4e5857 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 9f004b4..32cf6b0 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 18d3e7f..fb486d5 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 5787389..56e7f69 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 b6bcc7d..1faeada 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 307204c..c78bdeb 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 b3f57e1..551ea0b 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 187ab90..f4b9c1d 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 a2d9d42..0142a39 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 530aa00..a915557 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 5f42b14..84dd648 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 5f42b14..84dd648 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 5f42b14..84dd648 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 5f42b14..84dd648 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 2eb6a0c..ccd3bd2 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 535aaac..cb28915 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 d2a8b1c..3495684 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 0d05cce..f6dc45c 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 1dd5cb9..3eda7f1 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 a7353089..fed2dcf 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 65683a0..e6eef0d 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 0f8d0dc..082fb88 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 f37f02a..d313d04 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 3d37c60..1adff1b 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 03d7ada..915a55e 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 882f4fa..c940537 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 b521b48..dd4e0be 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 a2d5e9e..a96b9ba 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 b521b48..dd4e0be 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 a2d5e9e..a96b9ba 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 622b2e8..71e47e5 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 d0ecfdb..3bf69f4 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 f315824..3dafd88 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 df76346..afa244c 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 a9780a5..46a1ac3 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 638bc54..7d9c27e 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 ebcb677..ec798b7 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 897f409..4c35f6a 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 fae0ba2..efb1ab5 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 cf89612..750c737 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 2e079e9..04aaa83 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 8025b2d..976ae0c 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 0279836..6fcec7a 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 56b91bc7..f181a9d 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 ac19c70..b948660 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 e81d7a1..7c23832 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 57344e4..78f8646 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 a45f7f7..e5874e9 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 d4bae78..f947f2a 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 e4ccd66..27addb9 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 386f840..d493fe2 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 ddf46f3..a25860e 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 cece4fd..ec6bfbd 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 d33b198..29d3593 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 9d0fa48..958926f 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 5105f79..b6edce0 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 aa4bace..127936e 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 df13d32..e598135 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 1b1ad05..2e46210 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 4ba2489..022d818 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 085a9cd..d15ace3 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 acbe1d1..e2261ff 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 dc908b26..be8ff23 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 be60be7..a2eed14 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 e603ada..927aae7 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 da2d382..7f00378 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 d7a5a21..c7dc882 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 03ea2d7..3edf263 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 64c8527..2cb6e02 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 c1a3335..6c02a7e 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 18945f2..4bb2bef 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 f8c01db..b2b0dc3 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 dbacedb..75bfad5 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 fcf2ebd..e24adb0 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 4bc08d3..82236b9 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 fd958a8..e831df1 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 75fdbdf..7c24b8f 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 015273a..9b6bd52 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 8ec2054..012d588 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 d1f2393..826e8eb 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 110b0e8..2371d4d 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 f0ff650..4d610a2 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 edeacd7..7d2b5bd 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 962978c..d76a181 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 f1958eb..1c1d0f7 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 782c809..58dff2ca 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 d8c0b94..e7d22a0 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 a080c22..ad7f7bc 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 0cc5435..c38940a 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 01c22ec..0a1621e 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 8909c44..047fb80 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 4c9b1b1..89e157b 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 fef8433..ddcc843 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 5fbf6a1..97df058 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 2d4ad95..f91de77 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 172024c..951a7b7c9 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 4a6372c..6f9ec9e 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 c092735..10cb314 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 441d2e4..68fd0ea 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 982d6c5..ad504af 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 9cca1ae..ef0b174 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 437ad5a..146c87d 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 dd82182..4efdb51 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 79252d1..d984a92 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 45ab19c..d4207b4 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 26fb80d..f7d7b8d7 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 a3f52d9..e0e71fb 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 b432601..e850f8e 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 0c1905b..d45f348 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 b1d1d05..ca401ab 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 391fb07..cc2a915 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 935950b..a37f848 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 5f43a46..636a233 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 8a22696..715a621 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 901bb2d..6f16eac 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 7ce58c5..6d656dd 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 7fa8eb7..e3585b1 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 6d5547bb..812bbde 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 5a123d1..3f1018b 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 4f3ce1e..faa1e5a 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 beea2f7..fe1efc7 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 859356c..68862ca 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 bfcec2d..8c4fd15 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 d5c5196..4e42a8c 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 0ab2f4d..e8c48a6 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 a8026aa..7649898 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 7ed23ca..86bb06a 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 b9cb3c0..1ecf4b6 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 2f03a7e..a078ddd 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 4626b1e..a71f440 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 e74ef1e..dac8648 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 96d47df2..b29042b 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 15d10f6..0d93de5 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 a04d2eb..ee19f48 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 cf0a4b9..367e376 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 65336ca..a64f2e7 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 ede83f7..f599c32e 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 8c9c560..91d56ca 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 8c9c560..91d56ca 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 aa810f2..086e28c 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 9cc9d9d..3922030 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 b62b175..c136f95 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 1514752..50fe49f 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 0804227..b4d919a 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 682022e..a1384c5 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 73fe96d..65d33b8 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 e9e897d..493861e 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 76f956b..1d954b5 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 f5b5b48..dd18263 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 78078fb..a076472 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 d0f52aa..da34ff0 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 1a35431..409aaee 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 0bfa53d..1cdcb39 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 d9f71a4..25b3517 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 a9962b9..c627745 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 7b3ee85..3b4e794 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 0d5a700..407fcb6 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 f38390f..d1f72eb 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 928f72a..44e382f 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 1379a34..1331842 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 e775390..30330df 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 8acd8eb..6a31ffd 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 3f33261..142360d 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 7382150..14269f1 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 9a0d884..13292aa 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 9f83573..f06b1e7 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 6c1801b..c160b01 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 6c1801b..c160b01 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 5b590ee..bcbd1ce 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 cfec6c0..426a657 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 e1883fa..e43e015 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 7066604..ae38c0b 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 6d90bd9..4817f87 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 136e960..27db658 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 87fb2db..723e0ac 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 625ae74..a027114 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 25ef9a6..93e79d4 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 a56a921..65e5f20 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 353d20f..1d93a59 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 d93bc40..a632306 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 809d60e..cb1f000 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 46d6557..88df807 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 edf853b..1295c66 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 0e1e481..87891e8 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 03207ba..f837867 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 2aa22c3..87d98d9 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 1c0a70d..d8fb9c1 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 22bf637..3967f1d 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 5542ccad..364ac88 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 ad62eb9..ce37572 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 9cc9d9d..3922030 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 9e142fb..599dc23 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 6fbd200..414ad31 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 90cead0..bee6285 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 18f6695..48b2135 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 8c7fe64..d56fa48 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 a280399..a874575 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 8c7be78..86cfcaa 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 58f585d..08c5e6f 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 2a43249..2e96f71 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 e561e8d..429c9a2 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 490260e..ba937d8 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 42ca349..9b7ba0e 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 a16ec9b..86bece01 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 0caa035..cc63301 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 9477391..60a2f77 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 9fb1c15..63cffac 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 9fb1c15..63cffac 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 733de20..8bfbf11 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 98b78de..358601a 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 4171f38..f028004 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 862d959..a2733e0 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 722d843..77d39a6 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 bba14e3..45db62c 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 7a99902..3da4b75 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 7349680..600d287 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 dafc0c8..49289b7 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 6122280..3981e83 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 f588434..0e3694e 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 016d28e..17c46c6 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 55fecff..0796a24 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 a046b60..dd08d5b 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 1fb0a30..717c8f3 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 d480809..9a29738 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 f5bec34..3f4ef3c 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 a6e9802..2c56619 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 3445a8a..d91c600 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 3445a8a..d91c600 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 c284713..217ddd0 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 2fc6457..fa58820 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 814de29..ffd8e65 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 7360292..ec95b22 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 fa0b6306..a1ea7b4 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 b0fd3fb..4af40a5 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 b20b3e8..e192f35 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 7eb95c8..12c2855 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 844bc28..9623080 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 ca36ac4..e0cdf30 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 e9781c9..541856e 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 aa6007b..39540e1 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 bb1599e..9f795f6 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 e345159..a404a36 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 d25d4cd07..fba3a46 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 b57e46c..de19705 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 9cac06a..2397c438 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 a7e5b83..2085af0 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 0a07d88..6d3eceb 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 55a8a6d..8079631 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 832b853..03c6811 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 07b0560..a769d44 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 1613ee8..a366bd8 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 f3c7ae3..936c9fd 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 a7e625d..d1c8024 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 9406ecf..73bd5c7 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 4eebd2b..7567d7c 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 21a2ca6..35e1650 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 d194437..908a613 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 edc06fa..b009371 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 305be60..4e1f97d 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 5384d8c..96abb6e 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 58fbab9..f5643ca1 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 3c86be8..9523da4 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 7fc9e29..f6ddd0b 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 7fc9e29..f6ddd0b 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 3c86be8..9523da4 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 3c86be8..9523da4 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 7a265ed..c635fef 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 6f0668f..87f136d 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 645a098..3ebd418 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 9495923..e6d6fb5 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 7bbe16c..4f91dc9 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 17e0deb..d828acf 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 5a41850..3aa34b8 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 b585e39..6fe78be 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 b6d09b5..2e71cb4 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 21baaec..f4c3dbb 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 0233919..e21c8a4 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 027fbce..d6f5537 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 0f386be1..ec9f9f5 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 b5bfb3e..5dd979d 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 1403cc1..841910a 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 dd6d372..a24890b 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 a872411..289d1f5 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 5fb2241..557120e 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 d625200..8057552 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 103ea9e..550e9f4 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 1fe7ed7..0d917af 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 e685480..c8c6b73 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 9c6bae8..4047bc2 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 f784398..2f0e8f1 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 1b8843d..913db79 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 ee1c990..4eb109bc 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 ee718a6..023153b 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 fcb0e56..17971b3 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 f2a8e65..31c679e 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 60e67e8..8a7b525 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 2c78f29c..0ca400d 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 97cde4c..a68d0ca 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 b5874e6..71c5ab8 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 e58316e..af6ca50a 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 2cf3f2a..63ed807 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 3514646..649d1c7 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 23aa330..3fca901 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 c1459fb..7a846cd 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 0ac0996..e30e2e59c 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 3b59366..ac145ee 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 143a0ba..119b165 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 e667325..b8c5f6c 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 a4f6b66..c1b664c 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 a4f6b66..c1b664c 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 fa6a4db..094ccb3 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 1420f59..0873ca1 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 2fc67b3..51b2eec 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 e675cea..0c8d274 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 e675cea..0c8d274 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 eb5fcf6..3797430 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 f20301f..2f43aa0 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 8a5dadf..b1b6393 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 f42c025..ad1f3a0 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 c3aef8d..7923d5d 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 1d5e212..b3e058f 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 0cbaf64..e0b172a 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 9782b9d..5db484f 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 c601f64..a313c78 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 6e9f9d8..f5103db 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 1abcf55..1b95e78 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 f42c025..ad1f3a0 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 c3aef8d..7923d5d 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 fc30c5b..019ba65 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 61c95f2..31ffa91 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 1abcf55..1b95e78 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 b1ac113..7a0d189 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 6e9f9d8..f5103db 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 c3aef8d..7923d5d 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 b1ac113..7a0d189 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 b1ac113..7a0d189 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 91ee0fb..d255ff3 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 3cc7ddb..7d4978c 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 a5f5bc6..c3a0e92 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 1ffa859..f7aaa7b 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 4a5aff6..074c10e 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 adaa34b..da97d5e 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 98cf56b..87d59dd 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 00f0b4d..3274026 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 5c237b4..777be43 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 a150ae5..aeb7ad7 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 e643578..b084947 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 8b09b90..a26c14f 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 e0dd467..71d6453 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 e16cc25..2531a05 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 19e0896..faa9416 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 348bfa0..d3ac77e 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 c9555cc..06a77b6 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 eb7b875..49e9f04 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 eb7b875..49e9f04 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 d8e53bc6..87c39c1 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 c9555cc..06a77b6 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 c9555cc..06a77b6 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 eb7b875..49e9f04 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 f7de2a0..d25d754 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 61c4259..df6f02a 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 3d9234d..96d6c30 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 51ee066..2b8e9f3 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 cd206fb..c2136ee 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 abdb413..f8c2d2a 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 abdb413..f8c2d2a 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 055c14c..9a64e88 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 1cbf848..80172ff 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 d6d1010..ccac972 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 f33caf4..a19eacc 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 d782d17..13f2166 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 8f7aae4..3e8c34b 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 3c09ad1..44be387 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 a790a01..7177b5a 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 0b8f0c9..e992ee3 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 539a0a0..6dff469 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 05a3a0e..aa8336d 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 c209102..be65996 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 8a8a154..1e73a85 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 4ddf714..1561810 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 43c5598..4eae085 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 831d6fb..5dc161e 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 1a964af..4ee0f4c 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 831d6fb..5dc161e 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 1a964af..4ee0f4c 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 97bf2fa..5c31e29 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 d7b781425..bdfc798 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 4c6645d..cd737f5 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 406035e..d5693b0 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 73c6f74..dde6d88 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 7ed47f7..4fc8669 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 10b9e16..613ac33 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 406035e..d5693b0 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 73c6f74..dde6d88 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 d86cbe4..17e4fa2 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 851cd97..fddc9ad 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 09b3cfa..e131a5f 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 8354c0e..e8e1adc 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 6aeca2c..1f6fb3d 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 6aeca2c..1f6fb3d 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 7aefe8e..4b30ba4 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 5367e93..fe0dcd7 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 a692074..baf807b 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 0313b92..e596cf7 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 83404ad..8747e00 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 97f5f7d..6516b04 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 3d105b3..ceed50d 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 3d105b3..ceed50d 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 3d105b3..ceed50d 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 8588cca..492278a 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 588b101..25305e2 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 588b101..25305e2 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 0352bc8..8ab7005 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 64796c8..cc5ff50 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 ad68790..ac0f988 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 4abd481..84a6e30 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 fec4f7b..4d269a9 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 54f2d62..f8975c5 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 2144628..4f7d02e 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 bbfd4fd..7c4cd9b 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 d641946..0059bb1 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 d641946..0059bb1 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 838c7fb..9b94146 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 f2ec91e..042feef 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 5a46685..8c57ed6 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 a9015af..6a0de67 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 c7174e1..f837ac0 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 40a466d..e02bf27 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 100888c..3663cb6 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 100888c..3663cb6 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 70030e6..9de365a 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 7de5b7b..2d4a91a 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 33a6a3a..2f7c181 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 e0dcc5c..fa577b6 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 52edcb6..b8bde10 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 7791eb0..458f414 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 3902d1e..84650b1 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 3af25b0..0cdd140 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 9c0835a..ab06497 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 14c9b0c..c54a19b 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 50d9f91..c67f02b 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 f4cc090..3197d762 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 f4cc090..3197d762 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 0352bc8..8ab7005 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 968a7b9..fc2fe12 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 3e45db6..923e2d4 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 5dd2625..581c1d0 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 a4d55d7..c0d6850 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 ac860cb..ca4e100 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 bc87aa7..52884aa 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 ac1dda2..fe6a01a 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 cf6ec7a..14630bf 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 5f29227..680ab41 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 e4e41d7..b50b453 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 3b06444..128014c 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 547ce86..ac8dfec 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 f2d346e..452fdc1 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 5ac74dc..87bd60d 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 ebc4bf3..9485b73 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 c537842..6076920 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 2fa3ddc..7b00617 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 2fa3ddc..7b00617 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 9411859..f308569 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 40b4cdd..0f9163c 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 43f1565..e1a9218 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 35b44a3..c473690 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 4de8852..62f1a9c 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 2f35af8..3e9ec65 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 285d0ee..ee219ab 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 d43b623..e8b0579 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 e5aedb7..924ae46 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 bc14dcf..70f69d9 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 c492346..64e870e 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 31ce55b..2f4c5c7 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 2fad53f..d532663 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 68d9d2a..5303698 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 69d2569..337804c 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 6437ff8..064f12c 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 8047815..2bc2e8e 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 c75166b..3cc3606 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 551d461..c12b979 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 a51df3a..b78d729 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 551d461..c12b979 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 a51df3a..b78d729 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 da1c584..d6da6b4 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 da1c584..d6da6b4 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 84f7e89..d2de505 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 d368b7b..afa61ac 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 c13beb9..061adba 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 696bf71..9be0dff 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 de8cc25..03f7849 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 286fbe9..6dad05b 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 d3ad90c..bd3fb6d 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 9722d9d..7a2de67 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 4da4135..b530733 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 313e222..642f3dd 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 8073796..8721521 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 8073796..8721521 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 5f83f3c..34c87db 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 5ae864f..566a9f9 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 914870f..707c012 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 155d768..34e5d1a 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 3f5592d..3449343 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 eb07ba3..25432c0 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 6209686..4437205 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 709b3f4..0d0358d 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 9606840..2504a4a 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 1f238bb..1d53b89 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 706d924..dcf5be4 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 8b251b6..6d841c0 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 c1459fb..7a846cd 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 819bab3..1ec1643 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 3a2b532..d916714 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 f3c1cb8..e5b09c7 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 ddcddeb..468ae81 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 c5b7a19..516dc38 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 5903622..ad9aded6 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 542d119..4732cb1 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 88b4421..80ade47 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 8780e00..ee5dfe7 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 14efbac..807717c 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 b188581..8ec2a18 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 3bd72ba..f127a5e 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 1a27cec..67dd03f 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 73a29cc..045f204 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 2c88f1d..d6473cb 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 1d90260..e711b61 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 4ea0f94..50db4f2 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 b6a809f..ef94164 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 8425210..551595b 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 27e8406..62a9e4e 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 3400fb5..bb5e44a 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 4a97bf4..ca6479a 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 0f68d15..e72653d 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 074dc82..e95d4a9 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 503e6d4..e16e509 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 58f14ce..d835db2 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 f1394ca..8489773 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 b5da10c..dfe82b7 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 df87464..af585fe 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 602522d..a1f9961 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 d03a8db..bff0f19 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 23ad6a4..992341e 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 8de285a..a6b2f61 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 d024d22..98d3f51 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 32678eb..e5cf1ff 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 5cd2d05..db10fad 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 5cd2d05..db10fad 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 2742a1e..09d2278 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 91176da..c0c0f20 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 7871ca0..c5784c6 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 0000000..e2b5389
--- /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 0000000..5e5130a
--- /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 0000000..fe9a1fb
--- /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 0000000..098c455
--- /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 8c594be..c1bbf56 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 8102b45..0505481 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 5cd32bc2..54dfda7 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 b648530..42c51a5 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 b84b728..0db5300 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 6d11548..5e011dc 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 470cd48..50ed1b5 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 3b61ba4..8120bbf 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 1d5d53a..54ccd3c 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 5146f0a..3d19d76 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 5b900d9..e4cc4a9 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 fbc5299..d2c5bd7 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 1825d16..e8306e9 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 ddf96a7..33ffbfe 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 989050e..5d212a7 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 be3199f..51ee1a2 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 f35c719..e47a194 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 52b6ac2..efc7a60 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 fff17a1..5a191ce 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 461b594..dbe703c 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 b283638..462853c 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 d39bf63..527cb79 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 a6d0313..2cde6e9 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 0000000..23bfdc0
--- /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 0000000..e305676
--- /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 0000000..c826182
--- /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 0000000..23774c3
--- /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 54f0cff..cef70ab 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 f63f773..828a5b9 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 9e1ea29..5b9897f 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 721e5da..dd78abc 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 5c8196e..302751a 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 764e3bb..1a7c0b8 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 7389d87..6289d68 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 0000000..6cfcb6d
--- /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 f5fab0f..7a39ce2 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 c2b2b6e..a4b8415 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 9eb4769..46e202c 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 0000000..42a7b7a
--- /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 0000000..16af938
--- /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 0000000..d20ae83
--- /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 0000000..bece9a4
--- /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 0000000..d9a3359
--- /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 0000000..3c739f9
--- /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 0000000..5a94b55
--- /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 0000000..1b00721
--- /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 0000000..4c21d32
--- /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 0000000..067361f
--- /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 0000000..1213821
--- /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 0000000..5505ae7
--- /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 0000000..5fa9940
--- /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 0000000..8fe3d8b
--- /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 0000000..d8a4753
--- /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 0000000..766c366
--- /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 0000000..6b7d69b
--- /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 0000000..5b548b0
--- /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 0000000..9c1356e
--- /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 0000000..f994943
--- /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 0000000..9772be7
--- /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 0000000..12e972f
--- /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 0000000..7bfe758
--- /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 0000000..3bf6d0a
--- /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 0000000..5ddc621
--- /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 0000000..4856142
--- /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 0000000..9383465
--- /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 0000000..49a3c98
--- /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 0000000..384dfc2
--- /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 0000000..ad1f756
--- /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 0000000..aed30dc
--- /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 0000000..b6f57b1
--- /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 0000000..aea79a7
--- /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 0000000..a4c1fbe
--- /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 0000000..9ebd660
--- /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 0000000..988bba8
--- /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 0000000..ad37c01
--- /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 0000000..bdff1d5
--- /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 0000000..a45a59a
--- /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 0000000..59dc017
--- /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 0000000..41aa4e5
--- /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 0000000..6bb1206
--- /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 0000000..bc679dd
--- /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 0000000..8fd0ef1
--- /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 0000000..bb746ad
--- /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 0000000..c4b7d15
--- /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 0000000..14f2aaa
--- /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 0000000..358a463
--- /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 0000000..7c2f223
--- /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 0000000..87ec2cf
--- /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 0000000..d43b905
--- /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 0000000..032961e5
--- /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 0000000..32d0771
--- /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 0000000..bf936ba
--- /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 0000000..5978443
--- /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 0000000..e38af8c
--- /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 0000000..55620db
--- /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 0000000..6b902f3
--- /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 0000000..3062800
--- /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 0000000..685c1e0
--- /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 0000000..c9dff92
--- /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 0000000..137c05d
--- /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 0000000..dce1b3e
--- /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 0000000..1e3fcd8
--- /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 0000000..a739583
--- /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 0000000..df7cf28
--- /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 0000000..eebc5df
--- /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 0000000..866b4d8
--- /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 0000000..dd465f1
--- /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 0000000..1f04efd
--- /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 0000000..591d113
--- /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 0000000..881ac7c0e
--- /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 0000000..b3ef9f3
--- /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 0000000..81cef2b
--- /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 0000000..6becf14
--- /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 0000000..727c1f7
--- /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 0000000..1e5fc69
--- /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 0000000..26d6e86
--- /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 0000000..d099b37
--- /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 0000000..ea15a1e
--- /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 0000000..a48eb14
--- /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 0000000..81bbdab
--- /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 0000000..1fb4db5
--- /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 0000000..68b25b5
--- /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 0000000..5a10474
--- /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 0000000..ab531a1
--- /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 0000000..1c67f94
--- /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 0000000..d67a25c
--- /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 0000000..70370c9
--- /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 0000000..5c9e0e3
--- /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 0000000..7defb61
--- /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 0000000..1c0ccc0
--- /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 0000000..1a0f363
--- /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 0000000..d2253dc
--- /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 0000000..01b44a3
--- /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 0000000..abb1876
--- /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 0000000..554c368
--- /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 0000000..8d7f55d
--- /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 0000000..6255b59
--- /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 0000000..5d3847a
--- /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 0000000..e43fd89
--- /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 0000000..1c323e2
--- /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 0000000..2e32a0b
--- /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 0000000..8de2e6e
--- /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 0000000..ce3a4e9
--- /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 0000000..a529247c
--- /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 0000000..b618867
--- /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 0000000..16d7100
--- /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 0000000..db42381
--- /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 0000000..a529247c
--- /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 0000000..b618867
--- /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 0000000..16d7100
--- /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 0000000..db42381
--- /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 0000000..8de9402
--- /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 0000000..cd1bd89
--- /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 0000000..9983550
--- /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 0000000..437be4c
--- /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 0000000..dce4d94
--- /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 0000000..f6d5c31
--- /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 0000000..b1bbce5
--- /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 0000000..74f53f5
--- /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 0000000..1d69ba7
--- /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 0000000..515a434
--- /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 0000000..81d4933
--- /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 0000000..3354c41
--- /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 0000000..f20bb59
--- /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 0000000..180edab
--- /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 0000000..b979373
--- /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 0000000..d9b858d
--- /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 0000000..5e22ad7
--- /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 0000000..26ed501
--- /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 0000000..8488cf8
--- /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 0000000..274315c
--- /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 0000000..b8fa420
--- /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 0000000..8cb471c
--- /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 0000000..9d7d17f
--- /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 0000000..cb5ce1f
--- /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 0000000..255830e
--- /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 0000000..a575c50
--- /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 0000000..06b51e3
--- /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 0000000..585e6b4
--- /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 0000000..bea875b
--- /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 0000000..91af48c
--- /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 0000000..4504d58
--- /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 0000000..60628b4
--- /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 0000000..81cc52f
--- /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 0000000..dd921a7
--- /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 0000000..5eecb40
--- /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 0000000..b84469f
--- /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 0000000..99c2084
--- /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 0000000..511580f
--- /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 0000000..6a83546
--- /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 0000000..b50e55f
--- /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 0000000..e4ec426
--- /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 0000000..84a79c1
--- /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 0000000..a5938e3
--- /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 0000000..5653292
--- /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 0000000..4dc26f6
--- /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 0000000..8111104
--- /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 0000000..77a454e
--- /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 0000000..e96d47e
--- /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 0000000..71d9006
--- /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 0000000..76c0473
--- /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 0000000..f04af1e
--- /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 0000000..2100eb2
--- /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 0000000..43a40a2
--- /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 0000000..ca2fd18
--- /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 0000000..87059c5
--- /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 0000000..4db0254
--- /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 0000000..e0f2dd7
--- /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 0000000..9fb641c
--- /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 0000000..6150300
--- /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 0000000..3650577
--- /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 0000000..1bc3961
--- /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 0000000..5e6d96c
--- /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 0000000..7ff79bc
--- /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 0000000..e276591
--- /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 0000000..fa89fbe
--- /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 0000000..bb59a83
--- /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 0000000..db7f321
--- /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 0000000..0f96af8
--- /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 0000000..5a08dbf
--- /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 0000000..28c1a68
--- /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 0000000..dc782f7
--- /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 0000000..0db60dc
--- /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 0000000..5c74c2e
--- /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 0000000..6d16a63
--- /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 0000000..7d97ae6
--- /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 0000000..6969a64
--- /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 0000000..cda2eb0
--- /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 0000000..2a735f8
--- /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 0000000..e98df3d
--- /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 0000000..199eda7
--- /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 0000000..27cd0b3
--- /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 0000000..6d672f9
--- /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 0000000..501faf4
--- /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 0000000..18f08cf
--- /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 0000000..e1daba8
--- /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 0000000..69574b7
--- /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 0000000..b5c0eaa
--- /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 0000000..8b5134c
--- /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 0000000..ca5a836
--- /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 0000000..22ae395
--- /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 0000000..1fb963e
--- /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 0000000..8bd624b
--- /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 0000000..97d1e6d
--- /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 0000000..c503e42
--- /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 0000000..df6f912
--- /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 0000000..849be02
--- /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 0000000..342702c
--- /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 0000000..109d597
--- /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 0000000..9a37d95
--- /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 0000000..a24c2cb
--- /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 0000000..a2348ba
--- /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 0000000..2b7abc0
--- /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 0000000..9d86bd5
--- /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 0000000..947118f
--- /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 0000000..62decd9
--- /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 0000000..e34412c
--- /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 0000000..307da5e
--- /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 0000000..1c5752f
--- /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 0000000..5a9cf2e
--- /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 0000000..7a8e5c2
--- /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 0000000..f7948b7
--- /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 0000000..3146a04
--- /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 0000000..ab3f335
--- /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 0000000..d45f1b5
--- /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 0000000..b05a46c
--- /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 0000000..f8c4810
--- /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 0000000..06c919d
--- /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 0000000..ca50e65
--- /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 0000000..68bb424
--- /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 0000000..301ee74
--- /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 0000000..11352322
--- /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 0000000..cf4d2be
--- /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 0000000..671498a
--- /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 0000000..47285cb
--- /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 0000000..98df906
--- /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 0000000..6bbbe2f
--- /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 0000000..dcd8e1c
--- /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 0000000..d5bf804
--- /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 2256a9d..3ca486c 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 c623cf6..f35c699 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 62a6668..418601d 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 2f624f2..ebd2292 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 5fc7189..b4c0b6d 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 9068244..3f00d47 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 da4ae47..0cd18ed 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 ff96073..2a36f62 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 b32887a..d0ba890 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 a8f4cd3..e3bd938 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 1bdb063..2d1eaab 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 a57ebff..0d62769 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 8bb2766..2ce5dc7 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 d2d24b0..8bbdc0f 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 de34258..5d0cff9 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 e212bd3..a41c07d 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 c5ac261..45df646 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 a00a896..09db8cf 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 fdc2b0e..1c520f2 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 805b347..8e34ead 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 620b27b..a0aca63 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 5ffebc9..04a00e2 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 620b27b..a0aca63 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 5ffebc9..04a00e2 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 886f8af..8f4821c 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 da42fb0..cce3ebe 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 55542c5..7703d0c 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 7a1f7b2..010e964 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 ba8f5ff..6f89cdf 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 69ea2de..165ea48 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 afb7b56..ec10f37 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 991e301..7b0b2c2 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 aab8700..fbf320e 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 8db2ac4..fbdd9a6 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 900729c..8fd7ccb 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 72a795f..499a5b0 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 5dc18f8..46ff339 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 837d558..fa9c51b 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 42b53b0..e63360ab 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 8399dc4..470c10d 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 fe2d6cd..29dc375 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 3196893..d1c93f8 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 048c13a..c8d2232 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 402b0d6..7b01073 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 f6afb2a..c62e811 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 7fc4504..03b2c65 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 84e3a52..ba7ab1b 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 0753232..6717349 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 d0efc88..da23d26 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 01b23b1..e98e92a 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 4ec99aa..6e3f908 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 d053307..fa97131 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 34c545c..21b6233 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 bf4638d..02eeb9f 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 71be1f7..e5ea1d9 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 07944ef..d1120c7 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 959e1eb..9d77873 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 343d379..535510ca 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 00ebe45..9d88c01 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 31a1f05..5379d1b 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 bce6d8d..85e0292 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 97562e0..edfae23 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 cc85c2f..121c95b 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 fd8bf1d..21e9f10 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 0000000..9b34c3c
--- /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 0000000..df5967d
--- /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 0000000..13bd0ef
--- /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 0000000..2cab9ed
--- /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 2528c1c..342ba05 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 0124e6f..559ff0d 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 b8c9fbc..3649ecf 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 9f88f38..a359408 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 78c2a3a..328cb76 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 5cd7bd4..bdf91cd 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 bb93d84..f74b23a 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 0000000..c2b67b5
--- /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 0000000..aa62d5a
--- /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 0000000..308c83e
--- /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 0000000..36d3fe3
--- /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 cee819e..e386b6f 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 1e5b290..4c3c6f9 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 e17a69c..41e4ff7 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 0000000..7e6bea6
--- /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 0000000..2a18121
--- /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 0000000..a2b4649
--- /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 3abfa06..66313fd 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 0000000..ac20229
--- /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 0000000..07a503b
--- /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 0000000..cd48a40
--- /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 b8153cd..9f0932d 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 0000000..f495514
--- /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 0000000..8a8b10e
--- /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 0000000..3542947
--- /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 0000000..a417665
--- /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 0000000..f147da5
--- /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 0000000..b52e56e
--- /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 0000000..e9fa541
--- /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 0000000..787a8ba
--- /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 0000000..cbdf205
--- /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 0000000..17f2703
--- /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 0000000..f2328e3
--- /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 0000000..1f04937
--- /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 0000000..22233ef
--- /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 0000000..c1021a4
--- /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 0000000..dc26cae
--- /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 0000000..77c2e5e
--- /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 0000000..74cab59
--- /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 0000000..8438a37
--- /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 0000000..794e2b0
--- /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 0000000..707f58b
--- /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 0000000..b2a5899
--- /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 0000000..822b09e
--- /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 0000000..3225ba4
--- /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 0000000..e7eb8388
--- /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 0000000..87e7061
--- /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 0000000..3753b06
--- /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 0000000..b53defe
--- /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 0000000..e9996206
--- /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 0000000..f249698
--- /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 0000000..4c6ba21
--- /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 0000000..3eba6ff
--- /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 0000000..7f1b534
--- /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 0000000..3982dc0
--- /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 0000000..14ebf5e
--- /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 0000000..54bc5cc
--- /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 0000000..bbff888
--- /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 0000000..c5db3d9
--- /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 0000000..de92eda
--- /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 0000000..4720034
--- /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 0000000..4b17598
--- /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 0000000..8091ad0
--- /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 0000000..22e198f
--- /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 0000000..832ce31
--- /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 0000000..b090e18
--- /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 0000000..58a122b
--- /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 0000000..adc6105
--- /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 0000000..94f9f27
--- /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 0000000..6d90581
--- /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 0000000..9eff6ec
--- /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 0000000..08a6ead
--- /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 0000000..56d5091
--- /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 0000000..83931ad
--- /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 0000000..84a96fd
--- /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 0000000..898e085
--- /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 0000000..96f5b11
--- /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 0000000..7ae9104
--- /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 0000000..dd7d9b78
--- /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 0000000..2feed35
--- /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 0000000..49b8a5a
--- /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 0000000..2dc4d5b
--- /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 0000000..1373db7
--- /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 0000000..e107954
--- /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 0000000..5a97888
--- /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 420ee72..f7015be 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 0000000..57976c3
--- /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 0000000..bd084b9
--- /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 0000000..7bf4573
--- /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 0000000..f3e551fc
--- /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 0000000..6705546
--- /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 0000000..78c2027
--- /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 0000000..fcf6ce8
--- /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 0000000..b7c4a9b
--- /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 0000000..e0c7b8e
--- /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 0000000..e2bce8b
--- /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 0000000..7f52434
--- /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 0000000..c3b865c
--- /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 0000000..0f4b26c
--- /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 0000000..116fe03
--- /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 0000000..3d6f835
--- /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 0000000..0c4236b
--- /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 0000000..b7cce42
--- /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 0000000..d1709ee
--- /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 0000000..171946e
--- /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 0000000..97e2c93
--- /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 0000000..12a2d7a
--- /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 0000000..f4a40cd
--- /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 0000000..7f0339f
--- /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 0000000..be07e50
--- /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 0000000..8221efc
--- /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 0000000..03c85a5
--- /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 0000000..0e99cb0
--- /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 0000000..ab2014f
--- /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 0000000..665dd7f
--- /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 0000000..6148701
--- /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 0000000..0aae99c
--- /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 0000000..fcaeb11
--- /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 0000000..edc2a24
--- /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 0000000..e562f22
--- /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 0000000..6e6a7e0
--- /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 0000000..3078959
--- /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 0000000..ba60b61
--- /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 0000000..be2fdb0
--- /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 0000000..cc90011
--- /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 0000000..8006481
--- /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 0000000..bc704e6
--- /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 0000000..188b268
--- /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 0000000..3bd55d2
--- /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 1f4cf00..9d2a614 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 0000000..8d13ca3
--- /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 0000000..662032b
--- /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 0000000..5d7af63
--- /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 0000000..b5c86ec
--- /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 0000000..900512c
--- /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 0000000..34f3244
--- /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 0000000..ee01530
--- /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 0000000..f338995
--- /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 0000000..1a76d5c
--- /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 0000000..bd21088
--- /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 0000000..35cbe41
--- /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 0000000..e2c5755
--- /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 0000000..8fe780c
--- /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 0000000..5fa44e8
--- /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 0000000..ec305d0
--- /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 0000000..2e24fda
--- /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 0000000..3496789
--- /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 0000000..108fbfc
--- /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 0000000..c7cd347
--- /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 0000000..545fdca
--- /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 0000000..07412d0
--- /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 0000000..59266e2
--- /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 0000000..aa29e638
--- /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 0000000..a89511b
--- /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 0000000..6e61ec8
--- /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 0000000..88f48cf
--- /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 0000000..2c895c5
--- /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 0000000..34cd024
--- /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 0000000..9d61e65
--- /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 0000000..9c5ec95
--- /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 0000000..45bfca1
--- /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 0000000..a312274
--- /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 0000000..94e87d0
--- /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 0000000..af64df8
--- /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 0000000..2f58ddc
--- /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 0000000..184f4df
--- /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 c251972..db88094 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 afafa31..ecdfd5e 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 8881c90..d4a0f31 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 0000000..590ccf8
--- /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 0000000..08c1bf7
--- /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 0000000..746a138
--- /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 0000000..d3034e8
--- /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 0000000..469dee8
--- /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 0000000..354f468
--- /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 0000000..1f68166
--- /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 c1066e1..cca4bd9 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 560b06f..9d09fc3 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 0000000..a9fb10a
--- /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 0000000..702f704
--- /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 0000000..b5f1c46
--- /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 0627b24..0932b80 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 3bd761d..7cbe36b 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 3bd761d..7cbe36b 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 e61eeaa..fbb461b 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 e401f38..14e46cb 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 e48877b..4de9e6a 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 9701f1e..2a6641b 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 75acd71..f766a80 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 94986f1..a6c568b 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 1752416..75c90d8 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 4942e6b..8194330 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 0000000..ba00c96
--- /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 0000000..78c9b5b
--- /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 0000000..afa7d79
--- /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 0000000..5af5ef3
--- /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 bcce080..c3075b0 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 7611f60..234774a 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 874de36..4522d0f 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 0000000..cdef90c
--- /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 0000000..df320f2
--- /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 0000000..5a2c8c9
--- /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 0000000..53b5012
--- /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 181d7ea..9899118 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 f033558..2cd3176 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 5cc50dc..f8ec4c5 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 0000000..fc44a4f
--- /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 0000000..aa73b0a
--- /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 0000000..aa32dfd
--- /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 0000000..390f0d5
--- /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 971db038..8eb1dd6 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 4a3b9ff..0a4dd01 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 cf91c16..2c397b5 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 00b8156..c2a609a 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 daf48ca..80c46c8 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 0000000..44951e4
--- /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 0000000..d272f02d
--- /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 0000000..6863f86
--- /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 0000000..f38b25e
--- /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 0000000..2cc4301
--- /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 0000000..d7a2771
--- /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 0000000..827cdd3
--- /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 0000000..ecb923a
--- /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 4fdd25c..ce404f9 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 b7ed0bd..9216e03 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 df382d6..0c72aa2 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 fede2c5..db393bb 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 5bcfef5..1f3cc9b 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 30efc08..ac16c36 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 cdac572..c6b67f8 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 093dea3..0049ecc 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 5b4c4d3..414bad1 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 0000000..aca5b89
--- /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 0000000..1a91304
--- /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 0000000..fe5b702
--- /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 199a343..032a7fe 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 2700016..aa5a2f7 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 6f1c86d..d7a20bf 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 3f456b7..fdaa8d7 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 e24132c..8b0e6f9 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 889eeb67..5e18357 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 c7ac1e4..2c80f98 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 9df1bad..1c06d1d 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 d68ef4d..9602edf 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 7f5d555..7c61b7a 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 8a14486..4d4fce2 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 0000000..dbf8ea0
--- /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 0000000..b80a3c0
--- /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 0000000..a7644ff
--- /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 0000000..16a3b7e
--- /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 07f3564..3affec0 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 0000000..7714d53
--- /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 0000000..84586d9
--- /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 0000000..97b5631
--- /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 0000000..e26f937
--- /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 39dc521..abd7e86 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 1785b7d..f5fc8d0 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 64b65de..0000000
--- 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 0000000..2fecfe5
--- /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 d44e630..0000000
--- 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 5aa5f17..cfb562f 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 10961b3..a3082dc 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 02128e2..02c0cee 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 0ccd5ce..0000000
--- 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 0000000..858ad2b
--- /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 0000000..2a37289
--- /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 0000000..91451af
--- /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 0000000..a1660b9
--- /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 0000000..d9c19f4
--- /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 0000000..e21c466
--- /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 3159a8b..1cdb7b6 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 ba6900d..25e9c16 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 6f737f2..0000000
--- 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 39b6b5a..0000000
--- 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 e612bc5..f7d2be8 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 6f737f2..0000000
--- 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 39b6b5a..0000000
--- 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 04299cf..e80346d 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 6f737f2..0000000
--- 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 39b6b5a..0000000
--- 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 5bb5133..709c1d7 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 6f737f2..0000000
--- 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 39b6b5a..0000000
--- 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 3801910..e12139c 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 6f737f2..0000000
--- 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 ca7032f..0000000
--- 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 6111aee..0000000
--- 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 39b6b5a..0000000
--- 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 a9278dd..1352145 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 6f737f2..0000000
--- 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 cc63120..0000000
--- 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 39b6b5a..0000000
--- 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 0000000..1ececd4
--- /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 0000000..9915d82
--- /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 0000000..1369ed7
--- /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 300213c..f738afd 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 0db2afc..f33cfb6 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 8782a9c..804011d 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 cdd1f4f..4c87db7 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 dc2fc57..bb61988 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 8fd6a01..ef300ee 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 56b4ab1..5ad3a785 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 9cfc0fb..a56537c 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 87fda45..ac3ae99 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 f5fab0f..7a39ce2 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 c2b2b6e..a4b8415 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 9eb4769..46e202c 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 754a023..7819adc 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 0004d40..3a45fde 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 050c422..fb4a375 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 177370c..b208692 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 d29155b..0000000
--- 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 0664e30..0000000
--- 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 0000000..93ae1cd
--- /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 84870dc..0000000
--- 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 7509d18..7cbd056 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 177370c..b208692 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 eff754d..0000000
--- 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 f1867ed..0000000
--- 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 4f3c6d6..ad79d66 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 177370c..b208692 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 8015a8b..0000000
--- 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 db513f5..3fc4b3c 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 16aed24..0000000
--- 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 38907d9..6f53725 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 97d8db3..0000000
--- 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 84dded2..800ab34 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 5af2096..0000000
--- 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 e7c9838..0000000
--- 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 deea1cb..0000000
--- 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 526e2e5..0000000
--- 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 e94aae3..0000000
--- 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 052e960..0000000
--- 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 c27d14d..0000000
--- 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 5dab87b..0000000
--- 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 0000000..5894dbb
--- /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 0000000..59aad37
--- /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 0000000..933742b
--- /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 0000000..e9fb876
--- /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 0000000..68ffceb
--- /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 0000000..44388bb
--- /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 0000000..a7d8cb3
--- /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 68e18f8..0000000
--- 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 925263c..0000000
--- 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 df7c97d..0000000
--- 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 bbedaca..0000000
--- 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 0000000..17f8b14
--- /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 0000000..5bbb1e4
--- /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 d4854ad..0000000
--- 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 3bf0b44..0000000
--- 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 bdd5bc5..2d88773 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 5728d91..0000000
--- 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 1372be1..0000000
--- 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 e21fac8..04e217b 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 4e743e9..f2dd3ba 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 e210b56..0000000
--- 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 ee7e1d8..0000000
--- 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 4dab8f1..ed04616 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 104c50c..6b9286e 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 8aa64eb..428c09b 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 a0fd8f9..0000000
--- 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 afb7d4d..0000000
--- 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 9a208d7..0000000
--- 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 deea1cb..0000000
--- 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 526e2e5..0000000
--- 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 e94aae3..0000000
--- 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 052e960..0000000
--- 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 c27d14d..0000000
--- 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 0000000..c3637ac
--- /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 5dab87b..0000000
--- 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 6a9380e..5894dbb 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 129b262..59aad37 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 8fc64d3..933742b 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 d8f304d..e9fb876 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 0000000..68ffceb
--- /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 e031b26..44388bb 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 0000000..a7d8cb3
--- /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 0000000..c732aed
--- /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 68e18f8..0000000
--- 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 925263c..0000000
--- 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 df7c97d..0000000
--- 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 c676e19..0000000
--- 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 b0db655..0000000
--- 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 8c4ef0f..0000000
--- 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 0000000..956527b
--- /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 2bcd617..17f8b14 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 4315d78..5bbb1e4 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 934268c..0000000
--- 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 3bf0b44..0000000
--- 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 bdd5bc5..2d88773 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 5728d91..0000000
--- 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 1372be1..0000000
--- 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 e21fac8..04e217b 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 cadb9a3..c4378db 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 84cf7bd..0000000
--- 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 ee7e1d8..0000000
--- 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 0a8439c..8b1b72c 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 177370c..b208692 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 e2d161b..0000000
--- 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 2af13d5..0000000
--- 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 6e83b95..55af6a5 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 480ea39..cf687e3 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 f1839bf..23cf4f2 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 f2bbe66..089b20f 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 f4c095f..22bb717 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 61067ff..f4c84cc 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 c484be9..6287b7c 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 06fe7d3..d879f39 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 088a964..56cc40f 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 836fece..f76ba9f 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 0d65c2e..1b19d44 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 81b9f7f..4e47e67 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 20bd8ae..c914cc6 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 8854d29..dad28be 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 ba91988..ce74691 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 e927b9f..8eb041a 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 b733417..0353bf6 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 0dd3813..b2cd198 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 4a4bbb8..7f94c6f 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 11a7606..7987992 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 8bf7fdf..178bc9f 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 6a66450..b1c39bf 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 e89205f..05b7c7d 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 9f1db25..9a273e1 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 aab64fa..d9940da 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 e8f9b5f..d145bad 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 0f38be6..d8dfd51 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 51eed6d..8e7a971 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 5d29d8e..0e0462a 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 fad9650..730c4ff 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 3f520b8..1569911 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 1f3cd83..ef5568b 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 9d5498f..72031ed 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 fff4df6..8faa30c 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 0000000..15174ed
--- /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 0000000..5919697
--- /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 0000000..82389a5
--- /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 0000000..dd46613
--- /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 872f84c..2d4947e 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 9dca46d..d33a896 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 17f1c5e..53cb609 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 5d3d321..6fd3738 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 83b252f..21b493a9 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 dba0a39..51094ae 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 46763d3..5155a5d 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 eb90008..3cef39b 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 00eb3e4..09dba46 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 089328a..fb27f21 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 bda70ee..f70038b 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 d66d83c..923cc68 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 813d3bf9..101c360 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 61f3d7c..dc06b4d 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 35045fe..bc395e1 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 653025c..368c55a 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 9932a57..d9a1b65 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 fa1ac17..5bc269c 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 d67d92d..9022f51 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 d9effd6..ab7d27d 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 c8bd6ea..467f039 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 854b939..564c4b5 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 0da113f..6cf745e 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 52e5e6f..26faa85 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 b482559..b8414b3 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 4a8e738..08aa0e9 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 cd91083..6f8a1cb 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 7e80ebe..2dce050 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 376b115..83a441c 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 0f0c1f4..69c307a 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 7634918..a92fa83 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 5ff17d2..d6b0528 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 ffe2d9f..e507804 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 4e1a7a1..f694f8d 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 8135fe8..2e780d5 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 64f2836..2233370 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 6bee431..149af4b 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 4f1d6f4..fd667d7 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 3c6bf3a..18c8bc7 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 8928ae4..fecb52e 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 fc61537..d31cbc3 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 d2224ed..523e383 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 cd00cc5..7c8b0c2 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 d82f9f9..b90055f 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 9bff480..2640266 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 7c70613..306c439 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 feb74db..d7865a6 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 162963a..283c2fc 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 6bb3289..5c63ea1 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 9174178..1c912a8 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 48a0078..691f71d 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 2695c20..88d9679 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 48a0078..691f71d 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 2695c20..88d9679 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 f169712..d7d06d2 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 09ed723..8754bd6 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 d05a9a6..ff4fc09 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 cd53928..146b8b5 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 c2d2f2a..99a14cd 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 9134f61..9c45959 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 263319a..775e1c9 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 17e2bdb..69fbacd 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 d477a77..eea46c2 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 4151174..dcad4c9 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 b3ad27c..a4809de 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 3593089..06a92e9 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 f469c68..44ea30c 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 7835ffb..c23b39e 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 dfc91d3..35613fd 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 93100e9..81905b0 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 09c3242..978a29d 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 8ee8510..1ceee48 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 84b4b61..1dbf4d7 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 a06f5c1..ad0cf1e 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 7835ffb..c23b39e 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 09c3242..978a29d 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 ce6720b..e23964d 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 ce6720b..e23964d 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 320b61e..3208bc0 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 79f2a2a..26051c7 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 20bc226..d5221cc 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 7e75955..61ebfaa 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 e1d1d47..87db2b6 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 80b81d1..011d0db 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 fca5f48..53d60ba 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 10d25d7..945e3d6 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 4eb41d8..ab9e9cb 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 938076c..8f24fdc 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 584e9c5..e3b53d3 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 1d231fd..779bbb0 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 349a607..5736888 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 7f1226e..68437e5 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 3a27956..fcff092 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 7cd7a29..d688730 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 6b8d3ed..5d6ceb3 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 02993cc..5616275 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 aef8657..60b8d01 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 743ab66..b19f1e4 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 0000000..927b690
--- /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 0000000..2b1db89
--- /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 0000000..f91458c
--- /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 0000000..262e315
--- /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 bfdbc08..c43bda4 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 ac06a94..ddacd2a 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 4dca482..547f57f 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 4e7a9e8..d508916 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 cce8b7b..ec6c437 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 2004878..485fa64 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 1aa10a5..2d7845b 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 58812c3..1449ee5 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 80b2b24..329b105 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 3bd6340..f5a7665 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 fd4b9b8..983b6f2 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 8d60a90..985496a 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 0ea1bd8..12402b4 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 f337e1c..2b8d69a 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 9a05f91..cdffed5 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 052decc..678e004 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 d18a5bd..05bb44e 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 6a1a103..9dd3001 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 7442e7d..b983551 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 75ab897..333d533 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 33b8d77..dec53bd 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 cce897c..12cd30a 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 2164fc8..cc275ee 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 e1b85b4..cacc84d 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 b46b043..8571c44 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 27d1f08..fb52929 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 cb482bf..de27cc5 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 766bc5a..1318892 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 02dbf5b..5879fbd 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 1d8a72c..979312b 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 1d8a72c..979312b 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 0a18364..bf2262d 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 0a18364..bf2262d 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 26c2dee..1268301 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 02dbf5b..5879fbd 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 7fbfdcb..4df73c3 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 dd783e6..ba2084a 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 bc4a467..9ead806 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 01d6cfe..82f0f6d 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 239347f..f865d41 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 39ea59d..3709c5d 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 48225ec..a77b189 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 c0b36ed..5eea5de 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 6305917..9053127 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 b133f84..a9e7629 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 d09ccf5..fd1ff90 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 220ec7b..fa3783c 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 fd656ab..ec82d88 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 a8f1dbb..3ad92f4 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 00a69a1..ce4f1be 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 87ceaf5..5c75b30 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 99dbc51..aca74a4 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 d8b1246..936bba5 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 8d3e914..67b434c 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 b5be7c1..26effff 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 005bf3f..d7591fc 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 71894eb..8b79e24 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 a7009f2..05b3430 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 71894eb..8b79e24 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 a7009f2..05b3430 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 52e2dfd..596aad7 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 8f5c990..e17cb90 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 24f4262..8d48bfc 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 9fc2a44..b76230f 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 e84188f..24a8c3b 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 d676ae7..a9d9a75 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 0b3d692..254a679 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 7c2fa0a..4e87d7f 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 0289e89..5c343aa 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 359ff77..de7e242 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 30ebe17..830737e 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 84d0c97..ccafbac 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 4e66480..7c8025e 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 4bfa082..9cefa39 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 39f91e0..fa1bf9a 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 181ee81..28dc544 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 edecbd2..acb65dc 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 186f1f3..43d98b6 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 1d5870e..66ca0c0 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 181ee81..28dc544 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 edecbd2..acb65dc 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 f63e723..7cbc60b 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 cf88eaa..7903aca 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 f8f846e..b4f7705 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 c3f9386..fc1b38d 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 60c2bea..f93ae2d 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 7b38dad..2483334 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 ce31d1e..d410b52 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 34b7956..835ed25 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 fcbcbe1..ab52084 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 921d72e..938c86d 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 fe8df61..a585ff8 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 75eea88..8597015 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 86c6997..4abf476 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 d1ea59d..bd3f023 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 52b283a..44a6c85 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 e55d554..ec151f5 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 f5f188a74..ef55de3 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 b24d641..d6114f7 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 51e8f0b..2eb8197 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 8cb3322..0d0329a 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 5ed12bc..5cec56c 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 c3b2875..75a563d 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 4381ccf..9c87606 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 422ee14..4cf9425 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 7417469..0000000
--- 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 e42cd26..56d2467 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 aeeae75..5f2badb 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 4c73934..0f587df 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 aaab24d..dfc641f 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 36b12ac..1349efc 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 4ccf47d..da64047 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 17326dd..15f6fac 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 a2e6217..5b84ea8 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 16b4685..6c3404f 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 cdfdffd..eae47f0 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 5a28f74..68c67d1 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 d9e516e..78d3dcd 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 5d2ce71..ebd78c9 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 e1b423b..85cfff1 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 f2cf641..775fabe 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 acc6fd8..9343a28 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 8687369..93be80f 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 11d1dbe..a41f628 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 e70fce3..530a6c8 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 bf0a0a2..4c8f40c 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 f6bee10..b9a91338 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 f62d5bb..a1e01d2 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 5e591b4..2964ad3 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 8d43a8e..0bf6a16 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 c988964..246e948 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 a4d3cd2..8bd0f0d 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 9a9b339..2d178d3 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 4fdd3a6..83bbb801 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 0554967..6f0eb05 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 5f2530c..9b5e5e1 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 4a0dcbf..b3d4e38 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 5daa8d6..0fb0925 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 8ebd04f..d486c35 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 7666c5f..3d04542 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 4d53dc8..9491734 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 35021a8..0e67b75 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 991b574..7a781a7 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 2078d75..0601728 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 ab0fd07..9077847 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 f872220..135a777 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 c57e354..beef080 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 89ab081..1c9625f 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 574cc01..bd739e9 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 d2f1c42..ba29e9d 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 7b068b0..7870a28 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 49ef3e2..4f55968 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 d3f1bb8..16d798b 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 e1bb83b..d898289c9 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 d93ca2c..25b11c0 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 22a4bbc..c309c93a 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 5f03794..78915e3 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 3fd2a55..86679a0 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 99b0487..ec8b0d8 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 693c2c7..e1fabfa 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 eea3320..077518d 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 18878bd..b180807 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 a4b70df..166b528 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 60d4fcb..23b65e4 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 4b2a72d..00ce3fa 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 75949ac4..6124e2f 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 8daaf7b..f8a726d 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 9dfed2f..10471a3 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 6285258..4c89346 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 883cfa2..8844ae2 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 f5dba40..e5de161 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 2a18ad2..22d8510 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 01ac083..bd76124 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 6cf3658..2fa59f8 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 980e5c7..5a9a4e4 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 4294546..07b0aa4 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 2eefcdf..0000000
--- 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 6b62192..33971a7 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 35076b0..523cb01 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 242ae31..2707166 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 7d6f026..69a1f36 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 9c58a59..14ac79e 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 9c58a59..14ac79e 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 46e6528..e3c4949 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 fd1a56af..b6a922a 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 fd1a56af..b6a922a 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 8cc679c..bcd1f98 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 5158e2d..4ee2843 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 8e8ffd9..83e7fb4 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 3310088..afe6609 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 b9ecb53..efd2c0b 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 089a00f..f5248ed 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 ddf366c..9b339ee 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 1972374..45b4eb4 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 28aa9cf..d3333bc 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 4490705..cca363c 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 d738ae2..96893f7 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 f3d2234..576ddbb 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 327c4b1..50065ba 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 1f98ad7..48e9111 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 4dc2a03..2d31e73 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 5f7ca7c..133d6d3 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 68c6179..3f941d4 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 cc99023..1d448c3 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 e209110..3c8ae07 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 b825488..2016d99 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 172b002..176e99f 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 eb09aa4..13cac0c 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 c735f89..11406b7 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 3444122..ac86714 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 3444122..ac86714 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 fce2ab7..6b5e99b 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 5b52f9a..5e55ce8 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 f8e8876..4781088 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 5b52f9a..5e55ce8 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 f8e8876..4781088 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 a1b1e81..20a69b5 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 f2ba898..adb96d7 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 791dcb0..bbfe110 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 9fb1922..5bd8ae3 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 e2a2a44..25d6a6e 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 f700047..d2e913c 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 f700047..d2e913c 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 e2a2a44..25d6a6e 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 e2a2a44..25d6a6e 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 9b45334..c91397a 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 54715fe..85cad59 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 312bc49..c8072b9 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 db5fb0e..e9a0e3f 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 1868a41..afc8e13 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 b8dda18..3a8f3b7 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 aa6fd48..74714f8 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 7f09006..5729c67 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 1fc3956..f4b182e 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 88ea0b39..f507f25 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 7d7b9a8..89340d1 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 23ef63c..2ade707 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 a8edaf0..d6e2b1a 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 2badcf3..b4ab3a6 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 f7d37e2..9bb6278 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 d4fe0e991..546b6ab 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 21aeea4..4aa83e2 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 9102a0a..cdf6caa4 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 0df7d19..7629900 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 b14eeef..849551f 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 6bfd90e..dee3c82 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 893df92..42f54ce 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 cd97ff2..e8b394f 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 ee05999..f0ff2fd 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 78e7063..f0dafb9 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 187fdaf..f63b226 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 2949c0a..ff92100 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 8e19fbb..0d196cf 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 84772a6..670a90d 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 9075888..8839463 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 9075888..8839463 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 2fb4e0d..bba2d35 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 84c825a..8d4be41 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 a045e77..c9ee61b 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 2708615..2b3f0f8 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 e4ea09c..988e2b7 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 6da8b26..8dbca91 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 8e63916..77c46f1 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 301ba79..ce61ff0 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 837530b..522a765 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 a0019aa..25ed9f3 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 2251428..42949bb 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 751e90a..c0ef5cb 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 7ef70c1..29e5773 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 736a902..e33d334 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 feccae0..6c716d3 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 aff67f1..ff9b69f 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 1b8df09..c464c49 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 7ab1bc1..4bdb5bc 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 c6a8b45..7aa1131 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 8140c66..2b32010 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 441dcac..e2d5469 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 cb6c798..6675b85 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 c1fc722..9ff1e85 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 a5774af..dfb0369 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 2ae1b68..9bee9e2 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 a5774af..dfb0369 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 2ae1b68..9bee9e2 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 17de77d..9e7bc3d 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 d3d34df..411b29e 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 5e3431e..2755c9b 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 3206c2b..1bc7c24 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 770ad7c..377a196 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 b1cfa2e..d1c52f6 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 ad20e3e..74e0775 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 95e4e2c..514b392 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 d2a9ca4..e6b25ea 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 3187780..fbcf2dc 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 da034bd..ca44b13 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 e54224f..aec0e3d 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 d7ec03d..740931a 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 6d3f348..7d87488 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 c04cd61..1e83895 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 af51418..80a1822 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 33fb4fc..c138ffd 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 7f0b90a..0ec4441 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 b0895bf..6c7f3e8 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 869cd05..54cb257 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 d072dae864..2f782e4 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 9b1d554..2321e53 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 0bd9b09..e7334ee 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 0000000..8972914
--- /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 0000000..6dee1be
--- /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 0000000..30ce69b
--- /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 0000000..94be8cd
--- /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 0000000..6c7c618
--- /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 0000000..156e212
--- /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 0000000..2eadd05
--- /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 0000000..e5abd06
--- /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 0000000..fdfc9e7
--- /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 0000000..45699fd
--- /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 0000000..bb5591e
--- /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 0000000..7c8ccf3
--- /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 0000000..b4f28a4
--- /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 0000000..d8e295d
--- /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 0000000..c248b87
--- /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 0000000..a250881
--- /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 0000000..491834f
--- /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 0000000..621631c
--- /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 0000000..cea5c05
--- /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 0000000..57b017e
--- /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 0000000..a52299b
--- /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 0000000..c9ecbfc
--- /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 0000000..496d12b
--- /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 d707117..a4c2cce 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 eea6477..f921330 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 0000000..93729e3
--- /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 d423538..7bc9577 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 cdf7411..eb008cf 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 0000000..7f0e5a7
--- /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 0000000..965c009
--- /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 0000000..48a0a68
--- /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 0000000..d654cfa
--- /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 0000000..866e7bd
--- /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 f39b9a7..1cbedcb 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 6d43578..f768de2 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 6b36e2e..b1a5b1f 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 df07fb9..3e3df59 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 0f11274..acd7677 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 0b0dfcb..7232339 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 e8d1947..f6e16b1 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 6737fb2..dae67ad 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 d519978..278fe31 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 81497b3..6651443 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 8aa1a78..8107c55 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 8023179..2e61a02 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 e4429d1..e2c7d3e 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 aae66c5..e6d9793 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 383d88e..f18221d 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 afd8240..01eee6b 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 749f7c6..155c65f 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 f9c0855..3b4f45a 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 e81eef6..405edd0 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 190a218..bf1d4b6 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 7689744..ad25dce 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 de126aa..fb0cead 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 5ac1467..b79c8a7 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 c1752aa..31ad449 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 1cb0635..41f7cb1 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 2d29609..37f9e85 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 600f766..376696b 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 60053eb..485bf03 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 6ac2e65..297e3b6 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 2fec5cc2..bfbe8bd 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 0000000..0aa06b0
--- /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 0000000..873bbb8
--- /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 0000000..3a434eb
--- /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 0000000..c9d35bf
--- /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 0000000..37cc50e
--- /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 a1434fd..4f1fc03 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 ce5703e..da82d2d 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 6499d8d..c1d9898 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 df07fb9..3e3df59 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 78b03c8..edccfc3 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 0000000..65f6765
--- /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 9178fba..c48ab3b 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 7971d51..a318ff3 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 a8e2412..1e315aa 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 03d2ea4..565f037 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 54c65a7..8ec35c2 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 5148071..176eab4 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 27da828..59c584e 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 76f82e4..896a4fc 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 8ab2d11..6f5acb5 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 145df29..a5dab4b 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 b97f88c..ac39ccf 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 b8626c7..66e10bf 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 9a95231e..797085e 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 19a1242..f4411d9 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 02ba828..f9a72c9 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 02ba828..f9a72c9 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 a844797..0616af3 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 c7fa24b..a42f17b 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 b6e6924..494d81f 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 d84be9f..bd42ec6 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 e52d112..63a0f42 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 0b2531a..3dfc2f9 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 0000000..f7cf79e
--- /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 0000000..bd485ca
--- /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 0000000..18f426d
--- /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 0000000..a6cb89e
--- /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 3d60229..e4968f6 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 78c347e..7f140e9 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 846b06e..e41d9ff 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 846b06e..e41d9ff 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 56b1e56..e1b6e19 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 78c347e..7f140e9 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 624d41a..26dacbd 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 33fd40c..c41deb2 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 5c57ef8..3cfe200 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 11bdb26..cd9791d 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 d2fae3e..5ced34db 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 2f14342..a2dfa1c 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 938cea0..6d32099 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 0247a3c..07f7006 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 f1a1e09..d0dc9ea 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 3979144..0aceb74 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 4a2c523..d24bd87 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 bce560d..14ca8f7 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 ae8b74f..9b5a737 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 b6d44ef..f4123c6 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 8fcd643..92ff213 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 edd556f..96ece32 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 df125bd..70e7f58 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 7ecd62c..0206b62 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 cf80c56..7f48091 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 05624ea..5a20c65 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 d26b286..a432c9a 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 1a09eb4..0729768 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 04bf848..902a574 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 7e5703e..4da0601 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 9a21384..0110cfd 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 48e1cb3..7a3423b 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 b851b69..185d824 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 9d60d6c..36750c0 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 d91a858..3a0c64f 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 8e67789..98095b4 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 60727ec..a30994b 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 5f82052..3a24404 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 49a6645..5dfcd8f 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 f171d13..b5e853a 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 f88eb59..f356168 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 fc9c837..b86acf9a 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 9cba929..1a880d2 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 1d8ae3e..2bac671 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 9df0efa..b939870 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 977be8a..b695264 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 f4db55a..48732b7 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 0000000..764a923
--- /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 0000000..a618471
--- /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 0000000..1d43548
--- /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 0000000..4a6d628
--- /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 866e91d..0d0fc78 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 a092518..f6908f0 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 23c7679..7ec0540 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 1038abf..eb9d4f8 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 3f44fbb..93e376e 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 489ce87..d41ebe9 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 2ebf477..416e64c 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 938b979..0dd4ee0 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 0ba8b01..2bcde91 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 e078618..9fa3e75 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 1d581e1..8ad102e 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 ba67fcb..3bcc0ccc 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 e49d432..d1da847 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 c0be308..d910165 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 ac4d7cd..e5a1a30 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 944ef13..3635142 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 892a543..f119374 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 1ea9736..b102d16 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 46f5879..d88f52f 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 5badea7..255f3d6 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 aa5dcc4..92351b0 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 6852e12..2aa984e 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 0e3459c..1b9974d 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 a25e4c9..8279b0f 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 b85b5d3..d757d70 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 f7258e1..d1d3b48 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 d21df53..8d315ac 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 46caa04..85e1f89 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 5cac9f7..199e583 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 dab8668..6e97349 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 fade6b1..0bcca30 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 52d6875..6d77e78 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 c7c654f..e4fd89a 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 821154b..6054168 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 df35996..dc83fd7 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 43dca7f..1d7ac13 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 9021cb6..e70fa16 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 6a56647..e7df1a8 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 0a72856..1483455 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 7566259..1f04cc7 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 7c9829e..6a0e589 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 5c8603b..8390958 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 7c01a34..c17fd0f 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 0000000..bc9a327
--- /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 0000000..fef5871
--- /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 0000000..6a5b906
--- /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 0e96e21..711b8e5 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 860abe4..caa26b0 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 9c896fe..69a816b 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 d9ff4b7..c9fed00 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 bc29267..63841ab 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 42cb430..8eb5d2a 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 0000000..f79b5de
--- /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 0000000..06c9a62
--- /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 0000000..75c2de6
--- /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 0000000..e1a775c
--- /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 b3fb94f..4cf2ae1 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 0000000..b1d7036
--- /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 0000000..b1c8a27
--- /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 0000000..8d54a8f
--- /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 0000000..1a1af67
--- /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 0000000..5e750fc
--- /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 0000000..f6dee76
--- /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 0000000..fcb5245
--- /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 0000000..f9dfe74
--- /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 ab4f3bb..2e7333e 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 5346068b..d6be0fa 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 cfe6f65..9bd61f5 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 5b52c44..3dac804 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 3580a29..c19456e 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 26e5573..f5b3f95 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 326b32b..5ffc5df 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 0000000..75e6a6a
--- /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 0000000..1a4c5e2
--- /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 0000000..9ce2690
--- /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 0000000..22845d1
--- /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 702b4cc..52ef3d2 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 0000000..13fbd41
--- /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 0000000..94794a9
--- /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 0000000..9ba4ce9
--- /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 0000000..66a230a
--- /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 ea0807a..d0bbdf5 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 dc87c1f..48a5cfa 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 a235202..88d7c07 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 d92e10b..141e7e9 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 8cf8e2d..771fd22 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 0000000..a568291
--- /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 0000000..9c74d44
--- /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 0000000..32c1fea
--- /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 0000000..6a6ab38
--- /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 8d0b31c..0320b72 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 b01a9d7..004b3f4 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 eaab4f0..e0691f4 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 0b0dfcb..7232339 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 e8d1947..f6e16b1 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 6737fb2..dae67ad 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 2a3a863..a1f97fa 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 a7ef92b..2901f7d 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 9b4cdf1..bfae868 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 d519978..278fe31 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 81497b3..6651443 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 8aa1a78..8107c55 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 8023179..2e61a02 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 e4429d1..e2c7d3e 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 aae66c5..e6d9793 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 383d88e..f18221d 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 afd8240..01eee6b 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 749f7c6..155c65f 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 f9c0855..3b4f45a 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 e81eef6..405edd0 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 190a218..bf1d4b6 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 7689744..ad25dce 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 de126aa..fb0cead 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 5ac1467..b79c8a7 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 c1752aa..31ad449 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 1cb0635..41f7cb1 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 2d29609..37f9e85 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 600f766..376696b 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 60053eb..485bf03 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 7e2258d..ec7be06 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 3f28e3e..cbf5306 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 0000000..e1306e9
--- /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 0000000..7c38b72
--- /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 0000000..484a780
--- /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 0000000..485085d
--- /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 19cb88b..18e9609 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 924d928..4b8ca66 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 4e67cd6..40801ef 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 a8019d1..644c7d0 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 1e1b76d..97829af 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 3b335d6..149b112 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 0afa5dcc..ef0c52d 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 9d080e5..0f7476f 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 99d739b..5303ab3 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 28b43ee..e8331f7 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 0000000..ef8cde3
--- /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 0000000..6e3bafd
--- /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 0000000..6ddfde6
--- /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 0000000..b10aee8
--- /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 e19c84d..d3c195d 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 d0cebbe..3eb4f29 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 ab45347..eba6ee7 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 7e6ac5f..5f56498 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 f4d70fa..15e2ff0 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 8a07053..aba9aeb 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 ffae78f..dfb0c56 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 bed51ef..2907434 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 0000000..3ea2a4e
--- /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 0000000..9bca631
--- /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 0000000..5e2d936
--- /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 0000000..f1bec6c
--- /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 fd33cd2..ad5f380 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 240e370..d43e06d 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 0000000..868ad2b
--- /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 0000000..56ea2a1
--- /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 0000000..5c95299
--- /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 1cf8e16..0d75618 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 c3bb494..ac3ea91 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 b535b53..e81e677 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 2d1625a..ed34120 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 aedf75a..e7c4121 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 2d36c71..9906979 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 4bcfd78..a8aa370 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 8d92d53..b60d87f 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 0000000..14edaf1
--- /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 0000000..e35b268
--- /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 0000000..489e963
--- /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 0000000..da73d63
--- /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 f5633b2..f77b763 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 fab2016..09165d2 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 775bbe2..bb4a0bb 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 27a5b86..02cd5e7 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 b1a68d6..d23a71c 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 1624e6f..16db7aa 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 c907b2c..1ca51a4 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 33799cb..9466123 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 a315b25..f67e9b3 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 f9c1f0c..bf41327 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 bde46e8..fc50029 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 59cea97..c5f6edf 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 0b38b6c..f2354cb 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 bde2dc7..a6b299c 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 cadd0e9..d1b76b1 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 a60b97f..d889c87 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 0d18d2c..981c0b1 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 470ddc9..fd8033c 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 bc25aa2..1e01974 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 d2ffb54..af1e59f 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 30f3fb1..52ee380 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 ecf2baf..bea450f 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 c30e821..ec2c747 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 3572e83..1fc6f8a 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 b046bdd..639b909 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 a72ff33..61f4d63 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 d714c4c..b1c01a7 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 a463f80..131619d 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 c329995..5ca94b9 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 f118618..d2f5755 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 e62d0217..ef788af 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 9a54677..055dee0 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 20a8650..d0e384e 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 9b99d19..8a38635 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 9b99d19..8a38635 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 2378bd132..cf33fd9 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 6c42b5c..3201461 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 d27e697..c62f89d 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 5c518b9..2f9d41d 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 e515c44..b5c7db7 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 0000000..105d797
--- /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 0000000..126b130
--- /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 0000000..e412c39
--- /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 0000000..bfa14ba
--- /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 0000000..5b12495
--- /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 0000000..cdef9f0
--- /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 d5ac584..d2a7beb 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 4f474fc..34797b6 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 c28b629..038557e 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 0000000..e6e4062
--- /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 0000000..8e57a7d
--- /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 0000000..56ac853
--- /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 0000000..7f234dc
--- /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 522ad0a..a129829 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 ac9cf95..e071004 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 0000000..ba1da4f
--- /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 0000000..8d4d2db
--- /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 0000000..fe7caeb
--- /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 0000000..ee0808e
--- /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 31f547d..1a414af 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 7019894..245e129 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 7019894..245e129 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 7019894..245e129 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 31f547d..1a414af 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 7019894..245e129 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 7019894..245e129 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 7019894..245e129 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 7019894..245e129 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 ae053ee..927d80a 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 ae053ee..927d80a 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 397308e..6a29f27 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 bdae80d..97ed7b1 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 cd85ba5..a27bb99 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 f4bb6fb..b513b81 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 6ca157c..465b985 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 6726adf..c0339ed 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 27cb088..62891b6 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 5b29ff8..cba2f78 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 dcb2669..6b9af7b 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 0000000..2579201
--- /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 0000000..d018aca
--- /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 a934f8f..f7f69cc 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 0000000..d0bf831
--- /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 0000000..ee971b2
--- /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 0000000..3e2398c
--- /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 0000000..508ec72
--- /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 0000000..76c578b
--- /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 0000000..a901870
--- /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 0000000..22dcef5
--- /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 0000000..0822c92
--- /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 0319868..03efb67 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 5abb952..bc29775 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 d06cf47..f46f0a8 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 ca2b410..7fb8963 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 fdbc759..f4138b7 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 f1de917..1f84ddb 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 d1ddadf..3c8e787 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 a30b32e..9b11eb0 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 c70f21a..de3ea75 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 550ca30..2c63d77 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 bd27087..65cc796 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 3bad9a0..bb8bf3b 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 0000000..c57f370
--- /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 0000000..841df86
--- /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 0000000..a43d9c9
--- /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 0000000..7bea875
--- /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 8f9c9ec..eae965a 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 08576db..5f63d02 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 c0f6548..cd0b402 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 73f0deb..7c852b9 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 fd7568c..f8e8b57 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 517a414..2f984bb 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 20580d8..54f2732 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 b3a1d50..abdecb7 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 40d1d51..65c4dc4 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 d5c1548..9915dec 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 a8a5780..7fe4919 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 59603c1..24c0ab2 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 ec3568c..ba86a7f 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 04f3733..b2020c1 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 a9cc51f..43dea7b 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 5bed68f..0000000
--- 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 2c6a7f8..2f09596 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 0000000..2f6878d
--- /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 0000000..c7fcdbe
--- /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 0000000..39649db
--- /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 0000000..ccbbd75
--- /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 0000000..b90e0d8
--- /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 0000000..5c4664f
--- /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 0000000..0f4ee01
--- /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 0000000..c7663f7
--- /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 0b50160..ba1db15 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 a8099ad..4b12f1f 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 145ee5e..6b996ca 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 1dcfe03..f4a9c28 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 768b334..e4a52e9 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 5126723..71c6e58 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 70baaf9..0000000
--- 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 eb751f9..6e609b4 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 66d7cdc..132bdd2 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 0000000..fb533e7
--- /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 0000000..8979732
--- /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 0000000..f8549ce
--- /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 0000000..03c0301
--- /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 b81e24a..02f6ad9 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 6a52df9..dee2747 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 f33155e..9765424 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 0000000..2b51d6a
--- /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 0000000..d29fc2e
--- /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 0000000..cbd3017
--- /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 0000000..83c0a16
--- /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 4f3df1a..68ee8a7 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 0000000..b93018a
--- /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 0000000..9a02781
--- /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 0000000..f8549ce
--- /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 0000000..6c9724d
--- /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 0000000..2476778
--- /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 0000000..91cdedea
--- /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 0000000..f8549ce
--- /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 0000000..55b4a93
--- /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 0000000..fc9f3e0
--- /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 0000000..852a685
--- /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 0000000..f8549ce
--- /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 0000000..ae0c9e9
--- /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 b27d814..44281ff 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 0000000..e39458f
--- /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 0000000..8131963
--- /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 0000000..f8549ce
--- /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 0000000..1d6c42c
--- /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 8df3462..b5acfcc 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 15344dd..213b4b0 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 290e6e8..326954f 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 57bd3ec..5251665 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 663e96d..cbafecc 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 bfd82da..1eb1292 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 5d0a5fd..ec500c5 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 4146673..6c64242 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 dadd822..8c9236c 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 0000000..1deca97
--- /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 0000000..41328b8
--- /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 0000000..76f5a9c
--- /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 0000000..aa4938c
--- /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 be0cf22..eb1d403 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 004fe88..dde3974 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 79c8b60..9f0fd2f 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 c9ed7bf..0000000
--- 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 0d68762..7c11016 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 d21706f..edee2b7 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 59603c1..a1594e5 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 eb8b911..0000000
--- 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 f7de24f..cf9ae09 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 0000000..1807dab
--- /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 0000000..16afcb5
--- /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 0000000..f8549ce
--- /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 0000000..e614a47
--- /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 c5148c3..c66d736 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 0000000..782af42
--- /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 0000000..0670e15
--- /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 0000000..3a73d2e
--- /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 0000000..d17bf9d
--- /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 0000000..092103b
--- /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 0000000..8a6e741
--- /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 0000000..0bed19e
--- /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 4777bc6..37fb7a4 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 3eed22e..f27350e 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 efe6946..77f5bdf 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 0000000..357153c
--- /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 0000000..3d45d86
--- /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 0000000..b3b220a
--- /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 2417f2c..87189a3 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 9353ef4..0556dcf 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 1690931..6d8dfed 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 4a90ff4..95f40bd 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 d4a229b..34370c3 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 18d3dd2..580cda8 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 8240ef9..3fa1423 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 db8e930..f247e87 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 876dae4..0a08c13 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 65db56e..19488cd 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 0000000..e2b5389
--- /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 0000000..5e5130a
--- /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 0000000..fe9a1fb
--- /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 0000000..098c455
--- /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 8e77497..c89fbe4 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 c8bb9a8..1a8c530 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 eb74aa0..4f60420 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 82c442d..1b4db7c 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 465aa8b..2b82af3 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 dfd1078..dc7649f 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 dd18038..4ba271e 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 d4496ce..cbe22c2 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 3e1e871..82dce432 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 a69ed7b..4faf99e 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 c30f81c..2e2ba0a 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 0000000..8204957
--- /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 0000000..638a4e4
--- /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 0000000..c363d52
--- /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 0000000..44d8728
--- /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 b8faa07..06e4d83 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 8d37084..acea2ef 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 6f55489..11a68cd 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 2c4257d4..b7d67d9 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 8cd426d..abdea88 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 37028a7..1b6abf3 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 0100ed2..97e05ef 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 0000000..0815c22
--- /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 0000000..a44ea32
--- /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 0000000..3b5914e
--- /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 0000000..13c2f1d
--- /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 0000000..208c23a
--- /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 0000000..ea16d44
--- /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 0000000..129d232
--- /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 0000000..7b90206
--- /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 4e3610b..36bd6c5 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 425e4e9b..10f93f7 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 ca4b5a2..ec99459 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 0000000..f06f3af
--- /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 0000000..00ced5d
--- /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 0000000..813b21c
--- /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 0000000..0b7b618
--- /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 7cfa50a..7099a19 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 0000000..be801f3
--- /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 0000000..f326dfb
--- /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 0000000..28688a4
--- /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 0000000..527067a
--- /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 0000000..3f6c751
--- /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 0000000..43941f4
--- /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 0000000..949c3fd
--- /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 26c22bd..fcdf95b 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 ba6427d..2f1f933 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 56c77cf..50e51db 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 58acda3..1b9cf5a 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 56c77cf..50e51db 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 58acda3..1b9cf5a 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 0000000..258bc19
--- /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 0000000..f648424
--- /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 0000000..15df1d2
--- /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 0000000..39e8858
--- /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 61ff5c0..8a197c2 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 e1076d6..867ab86 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 bcf5b6e..975116bb 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 4fe0d09..6a3dd5e 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 6137128..c3597c3 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 7573694..c89206e 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 0000000..e6342c3
--- /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 0000000..2a6dde2
--- /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 0000000..b93ee76
--- /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 0000000..1135a62
--- /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 0000000..c622be3
--- /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 0000000..fa64dda
--- /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 0000000..1c4a92a
--- /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 0000000..61b64df
--- /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 0000000..effe063
--- /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 0000000..34b2e13
--- /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 0000000..4c4683b
--- /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 0000000..64ada8d
--- /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 0000000..70a9ca7
--- /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 0000000..f872272
--- /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 0000000..b4016ff
--- /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 b9eafd6..0038f31 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 9055f07..45d9f90 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 b4b651a..49f8695 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 8629107..032136f 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 0000000..33b7cf2
--- /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 0000000..77a9c7b
--- /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 0000000..98f9ecd
--- /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 f647398..401a7d8 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 78322de..85b7948 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 d883178..c1d6fe3 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 3e73979..418b37d 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 fbcf304..f2442f9 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 e19513f..c15967f 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 c9ef86c..4b81e8c 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 004959b..23066a1 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 c5dc871..d4284ca 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 a37c6c7..3376bc1 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 0000000..c9fbcd9
--- /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 0000000..91d9f1b
--- /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 0000000..a32dc10
--- /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 0000000..2b8601c
--- /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 61bcfc3..6feb854 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 f8c522c..5e0d52c 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 0db1337..a0fac25 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 0000000..fef7e25
--- /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 0000000..a38e0b8
--- /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 0000000..94edb58
--- /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 0000000..4aa2da5
--- /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 0000000..ef09510
--- /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 0000000..82ff7aa
--- /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 0000000..b447f4e
--- /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 0000000..2f51064
--- /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 50d7f2b..9c47165 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 26e17b9..0f371c7 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 317da62..3743314 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 4afe5aa..e8f337f 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 cef5bd1..568e9c3 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 7c2674a..ae4e6c5 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 3c1ee35..65689b3 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 bf40d3b..fb5c79a 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 1ae50d1..f213401 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 f567448..03b6a04 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 5d4bb3d..f150603 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 3bdd025..2952984 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 4ea344f..be6e7ed 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 5d1c9a6..4b43de4 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 15448f5..2cd3cda 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 a801829..1ceea61 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 0817e45..7e87b29 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 cc404a7..22f5230 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 0000000..627fd24
--- /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 0000000..62ad1a0
--- /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 0000000..af297f6
--- /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 0000000..dd7d172
--- /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 ceb6eb5..0f423b2 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 5a823f3..1cf58ba 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 1e91a7e..4841ffa 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 0000000..65007f1
--- /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 0000000..9573c12
--- /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 0000000..5d60b7d
--- /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 bed57cf..8a3ab27 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 803be8a..6e6eaa7 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 5bc7383..21dba0a 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 c50574b..47d78ad 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 1e0a524..8755679 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 0000000..5199eee
--- /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 0000000..fdbf553
--- /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 0000000..ad2c037
--- /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 fae9d56..110812d 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 4889fe3..5b06711 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 0000000..debaed2
--- /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 0000000..a53229f
--- /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 0000000..df006bc
--- /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 0000000..a2c9f61
--- /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 0000000..c42a2c7
--- /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 0000000..a4c9443
--- /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 0000000..8183cbf
--- /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 0000000..ebbcd5c
--- /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 25a99b6..ab4b631 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 d9b578d..97b109a 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 8fc9127..09a28e2 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 27cfeb4..5ad86f0 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 12e085f..d304ab9 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 0000000..83492f2
--- /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 0000000..eee5df6
--- /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 0000000..3dbd7590
--- /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 0000000..1eb7294
--- /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 0000000..23bfdc0
--- /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 0000000..e305676
--- /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 0000000..c826182
--- /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 0000000..23774c3
--- /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 47ad16e..4f4580d 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 0000000..481facc
--- /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 0000000..44a00f4
--- /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 0000000..2eb54f0
--- /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 0000000..384401d
--- /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 0000000..fd4c90e
--- /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 0000000..95d3317
--- /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 0000000..4c1b31b
--- /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 977db85..c1108c6 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 7b514db..d3cf70c 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 4eb6c08..6afc3bb 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 7dbc737..c707e6c 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 0000000..cc6795e
--- /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 0000000..c8d887a
--- /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 0000000..119267f
--- /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 0000000..df1f644
--- /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 83a862a..3466a9f 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 0000000..57e5bcf
--- /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 0000000..21665c4
--- /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 0000000..47fbf37
--- /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 d0b6119..1e57403 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 0000000..6a5f604
--- /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 0000000..e8ed35d
--- /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 0000000..686fb0e
--- /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 8be4d3d..9a2fd04 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 0000000..fbf4b6d
--- /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 0000000..d1ca40c
--- /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 0000000..325a228
--- /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 0000000..c070b49
--- /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 0000000..21228ae
--- /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 0000000..422010e
--- /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 0000000..b8a221d
--- /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 0000000..83b0099
--- /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 0000000..d250490
--- /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 0000000..5c9daf9
--- /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 0000000..576b1d3
--- /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 0000000..6e6c88b
--- /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 0000000..1f6a300
--- /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 0000000..5610c99
--- /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 0000000..933072d
--- /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 fd6b527..56a6677 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 0000000..afffb62
--- /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 0000000..c99bb87
--- /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 0000000..fb8c203
--- /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 0000000..af76d09
--- /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 0000000..1f265b8
--- /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 0000000..0d51b68
--- /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 0000000..eddd0ca
--- /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 3907fde..93ad2d6 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 0000000..fcf8b6a
--- /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 0000000..3be185f
--- /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 0000000..f9c9a99
--- /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 0000000..e997f23
--- /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 0000000..e398a87
--- /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 0000000..bd62c4e
--- /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 0000000..e7d7d4f
--- /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 0000000..3ee9a94
--- /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 0000000..e9313a6
--- /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 0000000..2f3628c
--- /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 0000000..070a66a
--- /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 0000000..4d9afff2c
--- /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 0000000..0d54aba
--- /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 0000000..6ffd6b2
--- /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 0000000..5050dc0
--- /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 0000000..8bc28ed
--- /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 0000000..8ccf4c7
--- /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 0000000..ad29f35
--- /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 0aeb7c4..8e4bc9f 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 0000000..3b6abc2
--- /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 0000000..8a92b72
--- /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 0000000..59d4ff7
--- /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 0000000..148debc
--- /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 0000000..95916a3
--- /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 0000000..715738d
--- /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 0000000..4add51b
--- /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 0000000..4371db2
--- /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 0000000..8c08136
--- /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 0000000..81b04a7
--- /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 0000000..872e332
--- /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 0000000..410f261
--- /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 f103787..9e258e0 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 9c43310..7f05baa 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 584ee89..4031752 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 28920cd..b591de6 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 e150820..5d94718 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 b3d4bc3..23ead8b 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 0000000..9dae7d2
--- /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 0000000..9b2bde2
--- /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 0000000..9c764d1
--- /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 0000000..0665ed7
--- /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 0000000..13deb0d
--- /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 0000000..801363a
--- /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 0000000..63e6fd1
--- /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 090547d..a6473cf 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 f6d647c..0757c79 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 0000000..0a7f721
--- /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 0000000..fa9c283
--- /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 0000000..e2cda80
--- /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 0000000..651fc44
--- /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 0000000..e4d70f2
--- /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 0000000..9f19276
--- /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 0000000..fd10663
--- /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 0000000..6e43f4e
--- /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 0000000..9d294688
--- /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 0000000..7e09392
--- /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 e893d52..75041ae 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 0000000..c8c8454
--- /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 0000000..5e173ed
--- /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 0000000..7ef86f8
--- /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 1c737d1..40f1ce0 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 0000000..54c0efc
--- /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 0000000..bab5c1b
--- /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 0000000..2ef9ec7
--- /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 0000000..10905a2
--- /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 0000000..d10a186
--- /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 0000000..70c1d87
--- /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 0000000..495f443
--- /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 9c40419..bcf6ece 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 0000000..14882d8
--- /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 0000000..89f85b3
--- /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 0000000..fce5573
--- /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 294a1dc..d81112b 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 0000000..d807980
--- /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 0000000..7f1a7af
--- /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 0000000..d93652d
--- /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 0000000..be4469d
--- /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 0000000..ce46307
--- /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 0000000..ce84f56
--- /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 ffaa9c1..847b7a6 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 0000000..6c81d07
--- /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 0000000..e044034
--- /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 0000000..28b5236
--- /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 0000000..d946aac
--- /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 0000000..cb6ad0d
--- /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 0000000..a350ba3
--- /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 0000000..e1b9002
--- /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 0000000..875d06f
--- /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 7275cd2..7e1a89e 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 f320d10..ca088c0 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 0000000..2abf419
--- /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 0000000..31c0d15
--- /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 0000000..38143a4
--- /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 0000000..f376cf0
--- /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 0000000..0d0380a
--- /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 0000000..800b852
--- /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 0000000..7aa1f18
--- /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 502c5b9..5a58229 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 4ab2ffc..05e72a0 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 0000000..c599b44
--- /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 0000000..a1d2499
--- /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 0000000..c93a929
--- /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 0000000..2231261
--- /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 7e15f10..e32b283 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 0000000..1ba6c25
--- /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 0000000..34c95c2
--- /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 0000000..7f7540d
--- /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 0000000..4d87441
--- /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 0000000..baa6753
--- /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 0000000..ea77ec5
--- /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 63031a6..26fd0d8 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 0000000..b5edabc
--- /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 0000000..d145736
--- /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 0000000..585549a
--- /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 0000000..77c5b31
--- /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 0000000..4b31fda
--- /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 0000000..150dd47
--- /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 0000000..ca408e1
--- /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 0000000..9d163bb
--- /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 2a0f87f..4e9e985 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 371c927..337248b 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 0000000..050a3ab
--- /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 0000000..022e7a0
--- /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 0000000..965f1f9
--- /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 0000000..da5f545
--- /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 0000000..bb368e9
--- /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 0000000..b69bd77
--- /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 0000000..a7c2f0e
--- /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 0000000..a73c424
--- /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 0000000..4674c0d
--- /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 0000000..d199a6b
--- /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 0000000..45ddab8
--- /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 f1fbde1..92f3f5c 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 7db6c35..67a16d1 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 0000000..9bd0d42
--- /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 0000000..eedec05
--- /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 0000000..6c19ace
--- /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 0000000..c8f4c3a
--- /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 d1985db..8e19697 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 611a475..ba90479 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 aba3953..3fb6a44 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 44dfe4e..2e027bd 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 1d252d1..bb939ee 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 5599cec..2c66402 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 0000000..1df59bb
--- /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 0000000..bbe7fcf
--- /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 0000000..459b6c97
--- /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 0000000..cd59bc2
--- /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 0000000..06ed7fc
--- /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 0000000..524dee8
--- /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 0000000..6542cdc
--- /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 0000000..442fb64
--- /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 0000000..1bb60ed
--- /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 0000000..e0bb5bc
--- /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 0000000..05bc2a4
--- /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 0000000..81f6c42
--- /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 0000000..5744a5a
--- /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 0000000..f9e4211
--- /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 0000000..ef07c6d
--- /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 1d00f8c..45ee2a8 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 f12e21d..9761d40 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 4323320..0000000
--- 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 83e8503..0000000
--- 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 b7218bd..0000000
--- 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 d1b90e4..0000000
--- 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 69f1eb2..0000000
--- 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 7d2bb0b..0000000
--- 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 21c89aa..0000000
--- 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 20affa2..0000000
--- 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 f8bba66..0000000
--- 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 70119d9..0000000
--- 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 5aab743..0000000
--- 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 2d12831..0000000
--- 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 316b3ba..0000000
--- 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 02d5c29..0000000
--- 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 5c5dcc0..0000000
--- 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 eba3ba6..0000000
--- 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 e58113d..0000000
--- 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 804b06c..0000000
--- 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 f85503b..0000000
--- 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 9db3ac3..0000000
--- 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 3677662..80a1d8f 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 b7f6be7..0000000
--- 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 0000000..2cfa351
--- /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 0000000..4c499da
--- /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 0000000..9bd1d3f
--- /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 e84d9f6..95893fb 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 0000000..42b3757
--- /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 0000000..86bca85
--- /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 0000000..4a69cd4
--- /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 0000000..004d78f2
--- /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 0000000..2415797
--- /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 0000000..f12de05
--- /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 0000000..2ffa20de
--- /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 0000000..f058ba1
--- /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 0000000..759cb9d
--- /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 0000000..bc93bd5
--- /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 0000000..c0dbbdc
--- /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 0000000..02941e0
--- /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 896a854..4876154 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 0000000..cef614e
--- /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 0000000..590dca6
--- /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 0000000..a8f57cc
--- /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 153091c..3a303dd 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 c5e1732..02bf99a 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 c86647e..77c7571 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 0000000..06c625b
--- /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 0000000..f7807bd
--- /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 0000000..4a2f4dd
--- /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 0000000..1989596
--- /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 0000000..d1b9a6b
--- /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 0000000..bf9c8ce
--- /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 0000000..ef0f6e4
--- /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 0000000..7927276
--- /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 0000000..91eb1b1
--- /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 0000000..fadb6f4
--- /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 0000000..2214a51
--- /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 0000000..c17a1d2
--- /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 0000000..da1d4e7
--- /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 375132d..1c97386 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 618c6c6..5dd59e9 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 a273385..767f028 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 755228d..53a6f43 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 0000000..a1278ea
--- /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 0000000..8628054
--- /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 0000000..d106591
--- /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 0000000..7fa9e3a
--- /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 f5ce6d1..da281e4 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 fbaa403..ea4ee97 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 316072c..58871d2 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 b659e92..6b2e2d9 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 c04d230..2ec699a 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 5502d35..1fe1099 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 1490260..baa3521 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 5bbb58e..8a09c15 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 0000000..f26644f
--- /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 0000000..bf8a79c
--- /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 0000000..bdbb142
--- /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 0000000..58297f5
--- /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 0000000..b7aeefe6
--- /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 0000000..83bdd9a
--- /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 0000000..0f73574
--- /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 0000000..cef7fe3
--- /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 0000000..e755bb22
--- /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 0000000..bfc0700
--- /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 0000000..b682db4
--- /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 0000000..d09e4b0
--- /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 8958779..a345fab 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 0000000..ef4ac25
--- /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 0000000..91adfc3
--- /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 0000000..9b70d0d
--- /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 0000000..321ab1b
--- /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 200cea6..201fedf 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 8821b39..945d939 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 0000000..329840c
--- /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 0000000..56af4c3
--- /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 0000000..9383874
--- /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 b005f70..b4106d7 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 b41a83046..e985a66 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 eb5e7ec..c958800 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 d6708b2..71e3760 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 f701142..ff1c3e1 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 747ae7c..f79f74d 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 3328b7d..b3c41c9 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 0000000..509a9a0
--- /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 0000000..be97616
--- /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 0000000..90b6ad8
--- /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 0000000..55608d3
--- /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 0000000..c222d03
--- /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 0000000..6b3d08e
--- /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 0000000..fae5d2a
--- /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 0000000..e07601e
--- /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 bba5f4b..2d88e46 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 2012ae6..acd5960 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 0000000..6dee29c
--- /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 0000000..b04774c
--- /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 0000000..a3a12fb
--- /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 0000000..6ec758b
--- /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 0000000..2ce5dab
--- /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 0000000..5fa630b
--- /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 0000000..cf1f2dd
--- /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 7a58482..3757ddbd 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 abdb96f..d79e1e1 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 0000000..f210903
--- /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 0000000..450cba2
--- /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 0000000..235d83f
--- /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 0000000..ef0e332
--- /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 0000000..56c0509
--- /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 0000000..ec1faf4
--- /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 648a409..8d48dc9 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 0000000..34e7c66
--- /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 0000000..540f453
--- /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 0000000..61d21c5
--- /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 cebc63b..09e74a7 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 ee14e2e..0eabd54 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 ad036ba..bee2571 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 ad036ba..bee2571 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 f270dca..e7af401 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 3fd2aed..b014892 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 1a13b80..c284617 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 c7d353d..52154a0 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 336291c..2a2cab6 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