aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorflz <flz@FreeBSD.org>2007-05-20 04:36:56 +0800
committerflz <flz@FreeBSD.org>2007-05-20 04:36:56 +0800
commit87f4d471fb27b9547c1a0de221b51f4c31684157 (patch)
treedfc4d7ae0fdd043d231bab6f4e98fccbbad14665 /x11
parent5ae66b41b712e5f34c78308a97f7511fc0b1539e (diff)
downloadfreebsd-ports-gnome-87f4d471fb27b9547c1a0de221b51f4c31684157.tar.gz
freebsd-ports-gnome-87f4d471fb27b9547c1a0de221b51f4c31684157.tar.zst
freebsd-ports-gnome-87f4d471fb27b9547c1a0de221b51f4c31684157.zip
- Welcome X.org 7.2 \o/.
- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}. - Bump PORTREVISION for ports intalling files in ${X11BASE}.
Diffstat (limited to 'x11')
-rw-r--r--x11/3ddesktop/Makefile2
-rw-r--r--x11/9box/Makefile3
-rw-r--r--x11/9menu/Makefile1
-rw-r--r--x11/9term/Makefile1
-rw-r--r--x11/Makefile131
-rw-r--r--x11/Terminal/Makefile2
-rw-r--r--x11/Terminal/pkg-plist1
-rw-r--r--x11/XFree86-4-clients/Makefile2
-rw-r--r--x11/XFree86-4-documents/Makefile1
-rw-r--r--x11/XFree86-4-libraries/Makefile3
-rw-r--r--x11/XFree86-4-manuals/Makefile1
-rw-r--r--x11/XFree86-4/Makefile1
-rw-r--r--x11/accessx/Makefile2
-rw-r--r--x11/alltray/Makefile2
-rw-r--r--x11/alltray/pkg-plist1
-rw-r--r--x11/appres/Makefile21
-rw-r--r--x11/appres/distinfo3
-rw-r--r--x11/appres/pkg-descr4
-rw-r--r--x11/apwal/Makefile2
-rw-r--r--x11/aterm/Makefile2
-rw-r--r--x11/bbappconf/Makefile1
-rw-r--r--x11/bbdock/Makefile1
-rw-r--r--x11/bbrun/Makefile2
-rw-r--r--x11/bbuname/Makefile1
-rw-r--r--x11/beforelight/Makefile20
-rw-r--r--x11/beforelight/distinfo3
-rw-r--r--x11/beforelight/pkg-descr5
-rw-r--r--x11/beforelight/pkg-plist3
-rw-r--r--x11/bgrot/Makefile1
-rw-r--r--x11/bigreqsproto/Makefile17
-rw-r--r--x11/bigreqsproto/distinfo3
-rw-r--r--x11/bigreqsproto/pkg-descr4
-rw-r--r--x11/bigreqsproto/pkg-plist3
-rw-r--r--x11/bitmap/Makefile19
-rw-r--r--x11/bitmap/distinfo3
-rw-r--r--x11/bitmap/pkg-descr5
-rw-r--r--x11/bitmap/pkg-plist20
-rw-r--r--x11/blast/Makefile1
-rw-r--r--x11/bricons/Makefile1
-rw-r--r--x11/brightside/Makefile2
-rw-r--r--x11/buttonbox/Makefile1
-rw-r--r--x11/chameleon/Makefile2
-rw-r--r--x11/cnslock/Makefile2
-rw-r--r--x11/compositeext/Makefile2
-rw-r--r--x11/compositeproto/Makefile17
-rw-r--r--x11/compositeproto/distinfo3
-rw-r--r--x11/compositeproto/pkg-descr4
-rw-r--r--x11/compositeproto/pkg-plist4
-rw-r--r--x11/damageext/Makefile2
-rw-r--r--x11/damageproto/Makefile18
-rw-r--r--x11/damageproto/distinfo3
-rw-r--r--x11/damageproto/pkg-descr5
-rw-r--r--x11/damageproto/pkg-plist6
-rw-r--r--x11/decurs/Makefile2
-rw-r--r--x11/deskmenu/Makefile2
-rw-r--r--x11/dgs/Makefile4
-rw-r--r--x11/dgs/pkg-plist31
-rw-r--r--x11/dmenu/Makefile1
-rw-r--r--x11/dmxproto/Makefile17
-rw-r--r--x11/dmxproto/distinfo3
-rw-r--r--x11/dmxproto/pkg-descr4
-rw-r--r--x11/dmxproto/pkg-plist4
-rw-r--r--x11/docker/Makefile2
-rw-r--r--x11/dxpc/Makefile1
-rw-r--r--x11/dynamag/Makefile1
-rw-r--r--x11/e17-module-calendar/Makefile2
-rw-r--r--x11/e17-module-cpu/Makefile2
-rw-r--r--x11/e17-module-deskshow/Makefile2
-rw-r--r--x11/e17-module-devian/Makefile1
-rw-r--r--x11/e17-module-engage/Makefile2
-rw-r--r--x11/e17-module-eveil/Makefile2
-rw-r--r--x11/e17-module-flame/Makefile2
-rw-r--r--x11/e17-module-flame/pkg-plist2
-rw-r--r--x11/e17-module-language/Makefile2
-rw-r--r--x11/e17-module-mail/Makefile2
-rw-r--r--x11/e17-module-mem/Makefile2
-rw-r--r--x11/e17-module-mem/pkg-plist2
-rw-r--r--x11/e17-module-mixer/Makefile1
-rw-r--r--x11/e17-module-moon/Makefile2
-rw-r--r--x11/e17-module-rain/Makefile2
-rw-r--r--x11/e17-module-rain/pkg-plist2
-rw-r--r--x11/e17-module-screenshot/Makefile2
-rw-r--r--x11/e17-module-screenshot/pkg-plist2
-rw-r--r--x11/e17-module-slideshow/Makefile2
-rw-r--r--x11/e17-module-slideshow/pkg-plist2
-rw-r--r--x11/e17-module-snow/Makefile2
-rw-r--r--x11/e17-module-snow/pkg-plist2
-rw-r--r--x11/e17-module-uptime/Makefile2
-rw-r--r--x11/e17-module-uptime/pkg-plist2
-rw-r--r--x11/e17-module-weather/Makefile2
-rw-r--r--x11/e17-module-winselector/Makefile1
-rw-r--r--x11/ebuttons/Makefile2
-rw-r--r--x11/ecore/Makefile2
-rw-r--r--x11/editres/Makefile20
-rw-r--r--x11/editres/distinfo3
-rw-r--r--x11/editres/pkg-descr5
-rw-r--r--x11/editres/pkg-plist4
-rw-r--r--x11/electricsheep/Makefile2
-rw-r--r--x11/elicit/Makefile1
-rw-r--r--x11/emu/Makefile9
-rw-r--r--x11/enity/Makefile2
-rw-r--r--x11/enterminus/Makefile1
-rw-r--r--x11/erun/Makefile2
-rw-r--r--x11/eterm/Makefile2
-rw-r--r--x11/etoile-iterm/Makefile2
-rw-r--r--x11/etoile-xwindowserverkit/Makefile1
-rw-r--r--x11/etoile/Makefile2
-rw-r--r--x11/evieext/Makefile17
-rw-r--r--x11/evieext/distinfo3
-rw-r--r--x11/evieext/pkg-descr4
-rw-r--r--x11/evieext/pkg-plist3
-rw-r--r--x11/examine/Makefile1
-rw-r--r--x11/fast-user-switch-applet/Makefile1
-rw-r--r--x11/fast-user-switch-applet/pkg-plist30
-rw-r--r--x11/fbdesk/Makefile2
-rw-r--r--x11/fbpanel/Makefile2
-rw-r--r--x11/fbsd-icons/Makefile2
-rw-r--r--x11/fireflies/Makefile2
-rw-r--r--x11/fixesext/Makefile2
-rw-r--r--x11/fixesproto/Makefile17
-rw-r--r--x11/fixesproto/distinfo3
-rw-r--r--x11/fixesproto/pkg-descr5
-rw-r--r--x11/fixesproto/pkg-plist4
-rw-r--r--x11/fluxbg/Makefile2
-rw-r--r--x11/fpc-x11/Makefile2
-rw-r--r--x11/fstobdf/Makefile22
-rw-r--r--x11/fstobdf/distinfo3
-rw-r--r--x11/fstobdf/pkg-descr5
-rw-r--r--x11/gcb/Makefile2
-rw-r--r--x11/gcb/pkg-plist1
-rw-r--r--x11/gcursor/Makefile2
-rw-r--r--x11/gdesklets-tasklist/Makefile2
-rw-r--r--x11/gdkxft/Makefile2
-rw-r--r--x11/gdm/Makefile1
-rw-r--r--x11/gdm/pkg-plist36
-rw-r--r--x11/ggiterm/Makefile2
-rw-r--r--x11/glproto/Makefile17
-rw-r--r--x11/glproto/distinfo3
-rw-r--r--x11/glproto/pkg-descr4
-rw-r--r--x11/glproto/pkg-plist9
-rw-r--r--x11/gmessage/Makefile2
-rw-r--r--x11/gmrun/Makefile2
-rw-r--r--x11/gnome-applets/Makefile2
-rw-r--r--x11/gnome-applets/pkg-plist36
-rw-r--r--x11/gnome-clipboard-daemon/Makefile2
-rw-r--r--x11/gnome-desktop/Makefile2
-rw-r--r--x11/gnome-desktop/pkg-plist40
-rw-r--r--x11/gnome-launch-box/Makefile2
-rw-r--r--x11/gnome-libs/Makefile2
-rw-r--r--x11/gnome-libs/pkg-plist34
-rw-r--r--x11/gnome-menus/Makefile1
-rw-r--r--x11/gnome-menus/pkg-plist36
-rw-r--r--x11/gnome-panel/Makefile2
-rw-r--r--x11/gnome-panel/pkg-plist38
-rw-r--r--x11/gnome-screensaver/Makefile1
-rw-r--r--x11/gnome-screensaver/pkg-plist30
-rw-r--r--x11/gnome-session/Makefile2
-rw-r--r--x11/gnome-session/pkg-plist38
-rw-r--r--x11/gnome-swallow/Makefile2
-rw-r--r--x11/gnome-terminal/Makefile1
-rw-r--r--x11/gnome-terminal/pkg-plist36
-rw-r--r--x11/gnome2-fifth-toe/Makefile2
-rw-r--r--x11/gnome2-lite/Makefile2
-rw-r--r--x11/gnome2-power-tools/Makefile2
-rw-r--r--x11/gnome2/Makefile2
-rw-r--r--x11/gnustep-app/Makefile2
-rw-r--r--x11/gpctool/Makefile1
-rw-r--r--x11/grabc/Makefile2
-rw-r--r--x11/gromit/Makefile2
-rw-r--r--x11/gskrab/Makefile1
-rw-r--r--x11/gsynaptics/Makefile14
-rw-r--r--x11/gsynaptics/pkg-plist5
-rw-r--r--x11/gtk-launch/Makefile2
-rw-r--r--x11/gtk-theme-switch/Makefile2
-rw-r--r--x11/gtk-theme-switch2/Makefile2
-rw-r--r--x11/gtk-themepreview/Makefile2
-rw-r--r--x11/gtkchtheme/Makefile2
-rw-r--r--x11/gtkterm2/Makefile2
-rw-r--r--x11/gtstarter/Makefile1
-rw-r--r--x11/gxset/Makefile2
-rw-r--r--x11/iceauth/Makefile22
-rw-r--r--x11/iceauth/distinfo3
-rw-r--r--x11/iceauth/pkg-descr5
-rw-r--r--x11/ico/Makefile22
-rw-r--r--x11/ico/distinfo3
-rw-r--r--x11/ico/pkg-descr5
-rw-r--r--x11/idesk/Makefile2
-rw-r--r--x11/imwheel/Makefile1
-rw-r--r--x11/innerspace/Makefile1
-rw-r--r--x11/inputproto/Makefile17
-rw-r--r--x11/inputproto/distinfo3
-rw-r--r--x11/inputproto/pkg-descr4
-rw-r--r--x11/inputproto/pkg-plist5
-rw-r--r--x11/ipager/Makefile2
-rw-r--r--x11/kb2mb2/Makefile2
-rw-r--r--x11/kbproto/Makefile17
-rw-r--r--x11/kbproto/distinfo3
-rw-r--r--x11/kbproto/pkg-descr4
-rw-r--r--x11/kbproto/pkg-plist7
-rw-r--r--x11/kde3/Makefile1
-rw-r--r--x11/kde4-baseapps/Makefile2
-rw-r--r--x11/kde4-runtime/Makefile2
-rw-r--r--x11/kde4-workspace/Makefile2
-rw-r--r--x11/kde4/Makefile1
-rw-r--r--x11/kdebase3/Makefile2
-rw-r--r--x11/kdebase4-runtime/Makefile2
-rw-r--r--x11/kdebase4-workspace/Makefile2
-rw-r--r--x11/kdebase4/Makefile2
-rw-r--r--x11/kdelibs3/Makefile2
-rw-r--r--x11/kdelibs4/Makefile2
-rw-r--r--x11/keylaunch/Makefile2
-rw-r--r--x11/kxgenerator/Makefile1
-rw-r--r--x11/libICE/Makefile20
-rw-r--r--x11/libICE/distinfo6
-rw-r--r--x11/libICE/pkg-plist1
-rw-r--r--x11/libSM/Makefile20
-rw-r--r--x11/libSM/distinfo6
-rw-r--r--x11/libX11/Makefile36
-rw-r--r--x11/libX11/distinfo6
-rw-r--r--x11/libX11/files/patch-src_ImUtil.c87
-rw-r--r--x11/libX11/manpages614
-rw-r--r--x11/libX11/pkg-plist222
-rw-r--r--x11/libXScrnSaver/Makefile31
-rw-r--r--x11/libXScrnSaver/distinfo3
-rw-r--r--x11/libXScrnSaver/pkg-descr5
-rw-r--r--x11/libXScrnSaver/pkg-plist5
-rw-r--r--x11/libXTrap/Makefile21
-rw-r--r--x11/libXTrap/distinfo3
-rw-r--r--x11/libXTrap/pkg-descr4
-rw-r--r--x11/libXTrap/pkg-plist5
-rw-r--r--x11/libXau/Makefile23
-rw-r--r--x11/libXau/distinfo6
-rw-r--r--x11/libXau/pkg-plist1
-rw-r--r--x11/libXcomposite/Makefile21
-rw-r--r--x11/libXcomposite/distinfo6
-rw-r--r--x11/libXcursor/Makefile24
-rw-r--r--x11/libXcursor/distinfo6
-rw-r--r--x11/libXdamage/Makefile20
-rw-r--r--x11/libXdamage/distinfo6
-rw-r--r--x11/libXdmcp/Makefile27
-rw-r--r--x11/libXdmcp/distinfo9
-rw-r--r--x11/libXdmcp/pkg-plist3
-rw-r--r--x11/libXevie/Makefile25
-rw-r--r--x11/libXevie/distinfo3
-rw-r--r--x11/libXevie/pkg-descr4
-rw-r--r--x11/libXevie/pkg-plist6
-rw-r--r--x11/libXext/Makefile81
-rw-r--r--x11/libXext/distinfo6
-rw-r--r--x11/libXfixes/Makefile20
-rw-r--r--x11/libXfixes/distinfo6
-rw-r--r--x11/libXfixes/pkg-plist2
-rw-r--r--x11/libXi/Makefile59
-rw-r--r--x11/libXi/distinfo6
-rw-r--r--x11/libXinerama/Makefile22
-rw-r--r--x11/libXinerama/distinfo6
-rw-r--r--x11/libXinerama/pkg-plist1
-rw-r--r--x11/libXp/Makefile57
-rw-r--r--x11/libXp/distinfo6
-rw-r--r--x11/libXp/pkg-plist2
-rw-r--r--x11/libXpm/Makefile21
-rw-r--r--x11/libXpm/distinfo6
-rw-r--r--x11/libXpm/files/patch-xpm-sec.patch4473
-rw-r--r--x11/libXpm/pkg-plist1
-rw-r--r--x11/libXprintAppUtil/Makefile21
-rw-r--r--x11/libXprintAppUtil/distinfo3
-rw-r--r--x11/libXprintAppUtil/pkg-descr5
-rw-r--r--x11/libXprintAppUtil/pkg-plist7
-rw-r--r--x11/libXprintUtil/Makefile21
-rw-r--r--x11/libXprintUtil/distinfo3
-rw-r--r--x11/libXprintUtil/pkg-descr5
-rw-r--r--x11/libXprintUtil/pkg-plist7
-rw-r--r--x11/libXrandr/Makefile40
-rw-r--r--x11/libXrandr/distinfo6
-rw-r--r--x11/libXrender/Makefile23
-rw-r--r--x11/libXrender/distinfo6
-rw-r--r--x11/libXres/Makefile29
-rw-r--r--x11/libXres/distinfo6
-rw-r--r--x11/libXres/files/patch-Makefile.in7
-rw-r--r--x11/libXres/pkg-plist4
-rw-r--r--x11/libXtrans/Makefile2
-rw-r--r--x11/libXtst/Makefile21
-rw-r--r--x11/libXtst/distinfo3
-rw-r--r--x11/libXtst/pkg-descr6
-rw-r--r--x11/libXtst/pkg-plist6
-rw-r--r--x11/libXv/Makefile39
-rw-r--r--x11/libXv/distinfo6
-rw-r--r--x11/libXv/pkg-plist2
-rw-r--r--x11/libXvMC/Makefile18
-rw-r--r--x11/libXvMC/distinfo3
-rw-r--r--x11/libXvMC/pkg-descr6
-rw-r--r--x11/libXvMC/pkg-plist10
-rw-r--r--x11/libXxf86/Makefile3
-rw-r--r--x11/libXxf86dga/Makefile40
-rw-r--r--x11/libXxf86dga/distinfo3
-rw-r--r--x11/libXxf86dga/pkg-descr6
-rw-r--r--x11/libXxf86dga/pkg-plist6
-rw-r--r--x11/libXxf86misc/Makefile28
-rw-r--r--x11/libXxf86misc/distinfo3
-rw-r--r--x11/libXxf86misc/pkg-descr6
-rw-r--r--x11/libXxf86misc/pkg-plist6
-rw-r--r--x11/libXxf86vm/Makefile41
-rw-r--r--x11/libXxf86vm/distinfo3
-rw-r--r--x11/libXxf86vm/pkg-descr6
-rw-r--r--x11/libXxf86vm/pkg-plist6
-rw-r--r--x11/libcapplet/Makefile2
-rw-r--r--x11/libdmx/Makefile36
-rw-r--r--x11/libdmx/distinfo3
-rw-r--r--x11/libdmx/pkg-descr6
-rw-r--r--x11/libdmx/pkg-plist6
-rw-r--r--x11/libdnd/Makefile1
-rw-r--r--x11/libexo/Makefile2
-rw-r--r--x11/libexo/pkg-plist1
-rw-r--r--x11/libgnome-java/Makefile1
-rw-r--r--x11/libgnome/Makefile2
-rw-r--r--x11/libgnome/pkg-plist36
-rw-r--r--x11/libgnomekbd/Makefile1
-rw-r--r--x11/libgnomemm/Makefile2
-rw-r--r--x11/libgnomemm26/Makefile1
-rw-r--r--x11/liboldX/Makefile21
-rw-r--r--x11/liboldX/distinfo3
-rw-r--r--x11/liboldX/pkg-descr6
-rw-r--r--x11/liboldX/pkg-plist6
-rw-r--r--x11/libsx/Makefile1
-rw-r--r--x11/libsynaptics/Makefile1
-rw-r--r--x11/libxcb/Makefile10
-rw-r--r--x11/libxcb/files/patch-xcb.pc.in11
-rw-r--r--x11/libxfce4mcs/Makefile1
-rw-r--r--x11/libxkbfile/Makefile25
-rw-r--r--x11/libxkbfile/distinfo6
-rw-r--r--x11/libxkbfile/files/patch-Imakefile34
-rw-r--r--x11/libxkbfile/pkg-plist3
-rw-r--r--x11/libxkbui/Makefile18
-rw-r--r--x11/libxkbui/distinfo3
-rw-r--r--x11/libxkbui/pkg-descr6
-rw-r--r--x11/libxkbui/pkg-plist7
-rw-r--r--x11/libxklavier/Makefile7
-rw-r--r--x11/listres/Makefile22
-rw-r--r--x11/listres/distinfo3
-rw-r--r--x11/listres/pkg-descr5
-rw-r--r--x11/luit/Makefile39
-rw-r--r--x11/luit/distinfo3
-rw-r--r--x11/luit/files/patch-luit.c175
-rw-r--r--x11/luit/pkg-descr5
-rw-r--r--x11/lupe/Makefile1
-rw-r--r--x11/lxpanel/Makefile1
-rw-r--r--x11/mgapdesk/Makefile4
-rw-r--r--x11/mkcomposecache/Makefile23
-rw-r--r--x11/mkcomposecache/distinfo3
-rw-r--r--x11/mkcomposecache/pkg-descr4
-rw-r--r--x11/mlterm/Makefile1
-rw-r--r--x11/mrxvt-devel/Makefile1
-rw-r--r--x11/mrxvt/Makefile1
-rw-r--r--x11/multi-aterm/Makefile1
-rw-r--r--x11/multi-gnome-terminal/Makefile2
-rw-r--r--x11/mxico/Makefile1
-rw-r--r--x11/numlockx/Makefile1
-rw-r--r--x11/nvidia-driver/Makefile26
-rw-r--r--x11/nvidia-driver/pkg-plist31
-rw-r--r--x11/nvidia-settings/Makefile3
-rw-r--r--x11/oclock/Makefile20
-rw-r--r--x11/oclock/distinfo3
-rw-r--r--x11/oclock/pkg-descr5
-rw-r--r--x11/oclock/pkg-plist3
-rw-r--r--x11/oooqs/Makefile2
-rw-r--r--x11/oooqs2/Makefile2
-rw-r--r--x11/p5-Clipboard/Makefile1
-rw-r--r--x11/p5-X11-GUITest/Makefile1
-rw-r--r--x11/p5-X11-IdleTime/Makefile1
-rw-r--r--x11/padkey/Makefile1
-rw-r--r--x11/panoramixext/Makefile1
-rw-r--r--x11/peeper/Makefile2
-rw-r--r--x11/portoseguro/Makefile2
-rw-r--r--x11/powershell/Makefile2
-rw-r--r--x11/printext/Makefile1
-rw-r--r--x11/printproto/Makefile17
-rw-r--r--x11/printproto/distinfo3
-rw-r--r--x11/printproto/pkg-descr4
-rw-r--r--x11/printproto/pkg-plist4
-rw-r--r--x11/props/Makefile1
-rw-r--r--x11/props/pkg-plist2
-rw-r--r--x11/py-qt4-opengl/Makefile1
-rw-r--r--x11/qrash/Makefile2
-rw-r--r--x11/qt4-inputmethods/Makefile2
-rw-r--r--x11/qt4-opengl/Makefile2
-rw-r--r--x11/randrext/Makefile1
-rw-r--r--x11/randrproto/Makefile17
-rw-r--r--x11/randrproto/distinfo3
-rw-r--r--x11/randrproto/pkg-descr4
-rw-r--r--x11/randrproto/pkg-plist6
-rw-r--r--x11/recordproto/Makefile17
-rw-r--r--x11/recordproto/distinfo3
-rw-r--r--x11/recordproto/pkg-descr4
-rw-r--r--x11/recordproto/pkg-plist4
-rw-r--r--x11/rendercheck/Makefile11
-rw-r--r--x11/rendercheck/distinfo6
-rw-r--r--x11/renderext/Makefile2
-rw-r--r--x11/renderproto/Makefile17
-rw-r--r--x11/renderproto/distinfo3
-rw-r--r--x11/renderproto/pkg-descr4
-rw-r--r--x11/renderproto/pkg-plist4
-rw-r--r--x11/resourceext/Makefile2
-rw-r--r--x11/resourceproto/Makefile17
-rw-r--r--x11/resourceproto/distinfo3
-rw-r--r--x11/resourceproto/pkg-descr4
-rw-r--r--x11/resourceproto/pkg-plist3
-rw-r--r--x11/rgb/Makefile24
-rw-r--r--x11/rgb/distinfo3
-rw-r--r--x11/rgb/pkg-descr6
-rw-r--r--x11/rox-wallpaper/Makefile1
-rw-r--r--x11/roxbg/Makefile1
-rw-r--r--x11/rsibreak-kde4/Makefile1
-rw-r--r--x11/rsibreak-kde4/pkg-plist16
-rw-r--r--x11/rsibreak/Makefile1
-rw-r--r--x11/rsibreak/pkg-plist16
-rw-r--r--x11/rstart/Makefile20
-rw-r--r--x11/rstart/distinfo3
-rw-r--r--x11/rstart/pkg-descr5
-rw-r--r--x11/rstart/pkg-plist17
-rw-r--r--x11/ruby-gnome2-all/Makefile1
-rw-r--r--x11/ruby-gnome2/Makefile1
-rw-r--r--x11/ruby-gtktrayicon/Makefile2
-rw-r--r--x11/rxvt-devel/Makefile2
-rw-r--r--x11/rxvt-unicode/Makefile1
-rw-r--r--x11/rxvt/Makefile2
-rw-r--r--x11/scripts/Makefile20
-rw-r--r--x11/scripts/distinfo3
-rw-r--r--x11/scripts/pkg-descr1
-rw-r--r--x11/scripts/pkg-plist4
-rw-r--r--x11/scrnsaverproto/Makefile17
-rw-r--r--x11/scrnsaverproto/distinfo3
-rw-r--r--x11/scrnsaverproto/pkg-descr4
-rw-r--r--x11/scrnsaverproto/pkg-plist5
-rw-r--r--x11/sessreg/Makefile22
-rw-r--r--x11/sessreg/distinfo3
-rw-r--r--x11/sessreg/files/patch-sessreg.h10
-rw-r--r--x11/sessreg/pkg-descr5
-rw-r--r--x11/setxkbmap/Makefile24
-rw-r--r--x11/setxkbmap/distinfo3
-rw-r--r--x11/setxkbmap/pkg-descr5
-rw-r--r--x11/silo/Makefile2
-rw-r--r--x11/sisctrl/Makefile1
-rw-r--r--x11/slim/Makefile2
-rw-r--r--x11/slock/Makefile1
-rw-r--r--x11/smproxy/Makefile22
-rw-r--r--x11/smproxy/distinfo3
-rw-r--r--x11/smproxy/pkg-descr5
-rw-r--r--x11/stalonetray/Makefile1
-rw-r--r--x11/startup-notification/Makefile1
-rw-r--r--x11/sxpc/Makefile1
-rw-r--r--x11/temperature.app/Makefile2
-rw-r--r--x11/terminal.app/Makefile1
-rw-r--r--x11/thinglaunch/Makefile1
-rw-r--r--x11/tilda/Makefile1
-rw-r--r--x11/tilda/pkg-plist1
-rw-r--r--x11/tkXwin/Makefile2
-rw-r--r--x11/tkgoodstuff/Makefile2
-rw-r--r--x11/trapproto/Makefile19
-rw-r--r--x11/trapproto/distinfo3
-rw-r--r--x11/trapproto/pkg-descr4
-rw-r--r--x11/trapproto/pkg-plist9
-rw-r--r--x11/trayer/Makefile1
-rw-r--r--x11/tycoon/Makefile1
-rw-r--r--x11/vdesk/Makefile1
-rw-r--r--x11/videoproto/Makefile17
-rw-r--r--x11/videoproto/distinfo3
-rw-r--r--x11/videoproto/pkg-descr4
-rw-r--r--x11/videoproto/pkg-plist7
-rw-r--r--x11/viewres/Makefile20
-rw-r--r--x11/viewres/distinfo3
-rw-r--r--x11/viewres/pkg-descr5
-rw-r--r--x11/viewres/pkg-plist3
-rw-r--r--x11/wbar/Makefile1
-rw-r--r--x11/wdm/Makefile2
-rw-r--r--x11/widgetfactory/Makefile1
-rw-r--r--x11/wmappl/Makefile2
-rw-r--r--x11/wmblob/Makefile2
-rw-r--r--x11/wmbutton/Makefile1
-rw-r--r--x11/wmcliphist/Makefile2
-rw-r--r--x11/wmctrl/Makefile2
-rw-r--r--x11/wmdrawer/Makefile2
-rw-r--r--x11/wmfstatus/Makefile1
-rw-r--r--x11/wmmatrix/Makefile2
-rw-r--r--x11/wmmenu/Makefile2
-rw-r--r--x11/wmmsg/Makefile2
-rw-r--r--x11/wmoldmenu2new/Makefile1
-rw-r--r--x11/wmxss/Makefile1
-rw-r--r--x11/workrave/Makefile1
-rw-r--r--x11/wrapper/Makefile2
-rw-r--r--x11/wterm/Makefile2
-rw-r--r--x11/x11perf/Makefile22
-rw-r--r--x11/x11perf/distinfo3
-rw-r--r--x11/x11perf/pkg-descr4
-rw-r--r--x11/x11perf/pkg-plist7
-rw-r--r--x11/x3270/Makefile1
-rw-r--r--x11/xaniroc/Makefile1
-rw-r--r--x11/xantfarm/Makefile1
-rw-r--r--x11/xauth/Makefile22
-rw-r--r--x11/xauth/distinfo3
-rw-r--r--x11/xauth/pkg-descr4
-rw-r--r--x11/xautolock/Makefile1
-rw-r--r--x11/xautomation/Makefile1
-rw-r--r--x11/xballoon/Makefile1
-rw-r--r--x11/xbanner/Makefile1
-rw-r--r--x11/xbelld/Makefile1
-rw-r--r--x11/xbiff/Makefile20
-rw-r--r--x11/xbiff/distinfo3
-rw-r--r--x11/xbiff/pkg-descr6
-rw-r--r--x11/xbindkeys/Makefile1
-rw-r--r--x11/xbindkeys_config/Makefile2
-rw-r--r--x11/xbitmaps/Makefile21
-rw-r--r--x11/xbitmaps/distinfo3
-rw-r--r--x11/xbitmaps/pkg-descr2
-rw-r--r--x11/xbitmaps/pkg-plist71
-rw-r--r--x11/xcalc/Makefile20
-rw-r--r--x11/xcalc/distinfo3
-rw-r--r--x11/xcalc/pkg-descr5
-rw-r--r--x11/xcalc/pkg-plist4
-rw-r--r--x11/xcalib/Makefile2
-rw-r--r--x11/xcb-proto/pkg-plist1
-rw-r--r--x11/xcb/Makefile1
-rw-r--r--x11/xclick/Makefile1
-rw-r--r--x11/xclip/Makefile1
-rw-r--r--x11/xclipboard/Makefile20
-rw-r--r--x11/xclipboard/distinfo3
-rw-r--r--x11/xclipboard/pkg-descr4
-rw-r--r--x11/xclipboard/pkg-plist4
-rw-r--r--x11/xclock/Makefile20
-rw-r--r--x11/xclock/distinfo3
-rw-r--r--x11/xclock/pkg-descr5
-rw-r--r--x11/xclock/pkg-plist4
-rw-r--r--x11/xcmd/Makefile1
-rw-r--r--x11/xcmiscproto/Makefile17
-rw-r--r--x11/xcmiscproto/distinfo3
-rw-r--r--x11/xcmiscproto/pkg-descr4
-rw-r--r--x11/xcmiscproto/pkg-plist3
-rw-r--r--x11/xcmsdb/Makefile22
-rw-r--r--x11/xcmsdb/distinfo3
-rw-r--r--x11/xcmsdb/pkg-descr5
-rw-r--r--x11/xco/Makefile2
-rw-r--r--x11/xcoloredit/Makefile1
-rw-r--r--x11/xcolors/Makefile1
-rw-r--r--x11/xcolorsel/Makefile3
-rw-r--r--x11/xconsole/Makefile20
-rw-r--r--x11/xconsole/distinfo3
-rw-r--r--x11/xconsole/pkg-descr5
-rw-r--r--x11/xconsole/pkg-plist3
-rw-r--r--x11/xcurs/Makefile2
-rw-r--r--x11/xcursorgen/Makefile24
-rw-r--r--x11/xcursorgen/distinfo3
-rw-r--r--x11/xcursorgen/pkg-descr5
-rw-r--r--x11/xcut/Makefile2
-rw-r--r--x11/xdbedizzy/Makefile22
-rw-r--r--x11/xdbedizzy/distinfo3
-rw-r--r--x11/xdbedizzy/pkg-descr5
-rw-r--r--x11/xdialog/Makefile2
-rw-r--r--x11/xditview/Makefile20
-rw-r--r--x11/xditview/distinfo3
-rw-r--r--x11/xditview/pkg-descr5
-rw-r--r--x11/xditview/pkg-plist7
-rw-r--r--x11/xdm/Makefile21
-rw-r--r--x11/xdm/distinfo3
-rw-r--r--x11/xdm/files/patch-greeter-greet.c19
-rw-r--r--x11/xdm/pkg-descr4
-rw-r--r--x11/xdm/pkg-plist23
-rw-r--r--x11/xdpyinfo/Makefile22
-rw-r--r--x11/xdpyinfo/distinfo3
-rw-r--r--x11/xdpyinfo/pkg-descr5
-rw-r--r--x11/xdriinfo/Makefile23
-rw-r--r--x11/xdriinfo/distinfo3
-rw-r--r--x11/xdriinfo/pkg-descr5
-rw-r--r--x11/xdtm/Makefile1
-rw-r--r--x11/xedit/Makefile20
-rw-r--r--x11/xedit/distinfo3
-rw-r--r--x11/xedit/pkg-descr4
-rw-r--r--x11/xedit/pkg-plist24
-rw-r--r--x11/xev/Makefile22
-rw-r--r--x11/xev/distinfo3
-rw-r--r--x11/xev/pkg-descr4
-rw-r--r--x11/xextensions/Makefile2
-rw-r--r--x11/xextproto/Makefile17
-rw-r--r--x11/xextproto/distinfo3
-rw-r--r--x11/xextproto/pkg-descr4
-rw-r--r--x11/xextproto/pkg-plist38
-rw-r--r--x11/xeyes/Makefile22
-rw-r--r--x11/xeyes/distinfo3
-rw-r--r--x11/xeyes/pkg-descr4
-rw-r--r--x11/xf86dga/Makefile22
-rw-r--r--x11/xf86dga/distinfo3
-rw-r--r--x11/xf86dga/pkg-descr5
-rw-r--r--x11/xf86dgaproto/Makefile17
-rw-r--r--x11/xf86dgaproto/distinfo3
-rw-r--r--x11/xf86dgaproto/pkg-descr4
-rw-r--r--x11/xf86dgaproto/pkg-plist6
-rw-r--r--x11/xf86driproto/Makefile17
-rw-r--r--x11/xf86driproto/distinfo3
-rw-r--r--x11/xf86driproto/pkg-descr4
-rw-r--r--x11/xf86driproto/pkg-plist7
-rw-r--r--x11/xf86ext/Makefile1
-rw-r--r--x11/xf86miscproto/Makefile17
-rw-r--r--x11/xf86miscproto/distinfo3
-rw-r--r--x11/xf86miscproto/pkg-descr4
-rw-r--r--x11/xf86miscproto/pkg-plist4
-rw-r--r--x11/xf86rushproto/Makefile17
-rw-r--r--x11/xf86rushproto/distinfo3
-rw-r--r--x11/xf86rushproto/pkg-descr4
-rw-r--r--x11/xf86rushproto/pkg-plist4
-rw-r--r--x11/xf86vidmodeproto/Makefile17
-rw-r--r--x11/xf86vidmodeproto/distinfo3
-rw-r--r--x11/xf86vidmodeproto/pkg-descr4
-rw-r--r--x11/xf86vidmodeproto/pkg-plist4
-rw-r--r--x11/xfce4-clipman-plugin/Makefile2
-rw-r--r--x11/xfce4-quicklauncher-plugin/Makefile2
-rw-r--r--x11/xfce4-screenshooter-plugin/Makefile2
-rw-r--r--x11/xfce4-taskmanager/Makefile2
-rw-r--r--x11/xfce4-xfapplet-plugin/Makefile2
-rw-r--r--x11/xfce4-xfapplet-plugin/pkg-plist1
-rw-r--r--x11/xfd/Makefile24
-rw-r--r--x11/xfd/distinfo3
-rw-r--r--x11/xfd/pkg-descr5
-rw-r--r--x11/xfd/pkg-plist3
-rw-r--r--x11/xfindproxy/Makefile22
-rw-r--r--x11/xfindproxy/distinfo3
-rw-r--r--x11/xfindproxy/pkg-descr5
-rw-r--r--x11/xfishtank/Makefile1
-rw-r--r--x11/xfree86_xkb_xml/Makefile2
-rw-r--r--x11/xfwp/Makefile22
-rw-r--r--x11/xfwp/distinfo3
-rw-r--r--x11/xfwp/pkg-descr4
-rw-r--r--x11/xgamma/Makefile22
-rw-r--r--x11/xgamma/distinfo3
-rw-r--r--x11/xgamma/pkg-descr5
-rw-r--r--x11/xgc/Makefile20
-rw-r--r--x11/xgc/distinfo3
-rw-r--r--x11/xgc/pkg-descr5
-rw-r--r--x11/xgc/pkg-plist3
-rw-r--r--x11/xgrab/Makefile7
-rw-r--r--x11/xhost/Makefile22
-rw-r--r--x11/xhost/distinfo3
-rw-r--r--x11/xhost/pkg-descr5
-rw-r--r--x11/xidle/Makefile1
-rw-r--r--x11/xineramaproto/Makefile17
-rw-r--r--x11/xineramaproto/distinfo3
-rw-r--r--x11/xineramaproto/pkg-descr4
-rw-r--r--x11/xineramaproto/pkg-plist5
-rw-r--r--x11/xinit/Makefile23
-rw-r--r--x11/xinit/distinfo3
-rw-r--r--x11/xinit/pkg-descr4
-rw-r--r--x11/xinput/Makefile1
-rw-r--r--x11/xkbcomp/Makefile22
-rw-r--r--x11/xkbcomp/distinfo3
-rw-r--r--x11/xkbcomp/pkg-descr4
-rw-r--r--x11/xkbctrl/Makefile1
-rw-r--r--x11/xkbevd/Makefile22
-rw-r--r--x11/xkbevd/distinfo3
-rw-r--r--x11/xkbevd/pkg-descr4
-rw-r--r--x11/xkbprint/Makefile22
-rw-r--r--x11/xkbprint/distinfo3
-rw-r--r--x11/xkbprint/pkg-descr5
-rw-r--r--x11/xkbset/Makefile2
-rw-r--r--x11/xkbutils/Makefile18
-rw-r--r--x11/xkbutils/distinfo3
-rw-r--r--x11/xkbutils/pkg-descr1
-rw-r--r--x11/xkbutils/pkg-plist3
-rw-r--r--x11/xkeyboard-config/Makefile36
-rw-r--r--x11/xkeyboard-config/distinfo3
-rw-r--r--x11/xkeyboard-config/pkg-descr10
-rw-r--r--x11/xkeyboard-config/pkg-plist312
-rw-r--r--x11/xkeycaps/Makefile3
-rw-r--r--x11/xkeywrap/Makefile1
-rw-r--r--x11/xkill/Makefile22
-rw-r--r--x11/xkill/distinfo3
-rw-r--r--x11/xkill/pkg-descr5
-rw-r--r--x11/xload/Makefile20
-rw-r--r--x11/xload/distinfo3
-rw-r--r--x11/xload/pkg-descr5
-rw-r--r--x11/xload/pkg-plist3
-rw-r--r--x11/xloadimage/Makefile2
-rw-r--r--x11/xlockmore/Makefile1
-rw-r--r--x11/xlogo/Makefile20
-rw-r--r--x11/xlogo/distinfo3
-rw-r--r--x11/xlogo/pkg-descr4
-rw-r--r--x11/xlogo/pkg-plist4
-rw-r--r--x11/xlogout/Makefile1
-rw-r--r--x11/xlsatoms/Makefile22
-rw-r--r--x11/xlsatoms/distinfo3
-rw-r--r--x11/xlsatoms/pkg-descr5
-rw-r--r--x11/xlsclients/Makefile22
-rw-r--r--x11/xlsclients/distinfo3
-rw-r--r--x11/xlsclients/pkg-descr5
-rw-r--r--x11/xlupe/Makefile1
-rw-r--r--x11/xmag/Makefile20
-rw-r--r--x11/xmag/distinfo3
-rw-r--r--x11/xmag/pkg-descr5
-rw-r--r--x11/xmag/pkg-plist3
-rw-r--r--x11/xman/Makefile20
-rw-r--r--x11/xman/distinfo3
-rw-r--r--x11/xman/pkg-descr5
-rw-r--r--x11/xman/pkg-plist4
-rw-r--r--x11/xmangekyou/Makefile2
-rw-r--r--x11/xmascot/Makefile2
-rw-r--r--x11/xmessage/Makefile20
-rw-r--r--x11/xmessage/distinfo3
-rw-r--r--x11/xmessage/pkg-descr5
-rw-r--r--x11/xmessage/pkg-plist4
-rw-r--r--x11/xmh/Makefile20
-rw-r--r--x11/xmh/distinfo3
-rw-r--r--x11/xmh/pkg-descr5
-rw-r--r--x11/xmh/pkg-plist6
-rw-r--r--x11/xmodmap/Makefile22
-rw-r--r--x11/xmodmap/distinfo3
-rw-r--r--x11/xmodmap/pkg-descr5
-rw-r--r--x11/xmold/Makefile1
-rw-r--r--x11/xmon/Makefile1
-rw-r--r--x11/xmore/Makefile20
-rw-r--r--x11/xmore/distinfo3
-rw-r--r--x11/xmore/pkg-descr5
-rw-r--r--x11/xmore/pkg-plist3
-rw-r--r--x11/xmotd/Makefile1
-rw-r--r--x11/xmove/Makefile1
-rw-r--r--x11/xmsg/Makefile1
-rw-r--r--x11/xmx/Makefile1
-rw-r--r--x11/xnee/Makefile1
-rw-r--r--x11/xnodecor/Makefile1
-rw-r--r--x11/xorg-apps/Makefile118
-rw-r--r--x11/xorg-apps/pkg-descr6
-rw-r--r--x11/xorg-apps/pkg-plist2
-rw-r--r--x11/xorg-cf-files/Makefile18
-rw-r--r--x11/xorg-cf-files/distinfo3
-rw-r--r--x11/xorg-cf-files/files/patch-FreeBSD.cf64
-rw-r--r--x11/xorg-cf-files/files/patch-Imake.rules29
-rw-r--r--x11/xorg-cf-files/files/patch-Imake.tmpl20
-rw-r--r--x11/xorg-cf-files/files/patch-Library.tmpl11
-rw-r--r--x11/xorg-cf-files/pkg-descr1
-rw-r--r--x11/xorg-cf-files/pkg-plist122
-rw-r--r--x11/xorg-docs/Makefile20
-rw-r--r--x11/xorg-docs/distinfo3
-rw-r--r--x11/xorg-docs/pkg-descr4
-rw-r--r--x11/xorg-docs/pkg-plist112
-rw-r--r--x11/xorg-edit/Makefile1
-rw-r--r--x11/xorg-libraries/Makefile115
-rw-r--r--x11/xorg-libraries/distinfo9
-rw-r--r--x11/xorg-libraries/files/XThrStub-Imakefile35
-rw-r--r--x11/xorg-libraries/files/nls-Compose-microsoft-cp125115
-rw-r--r--x11/xorg-libraries/files/patch-Compose-Imakefile10
-rw-r--r--x11/xorg-libraries/files/patch-GL-GL-Imakefile20
-rw-r--r--x11/xorg-libraries/files/patch-GL-Imakefile11
-rw-r--r--x11/xorg-libraries/files/patch-GL-dri-drm-Imakefile11
-rw-r--r--x11/xorg-libraries/files/patch-GL-glx-Imakefile10
-rw-r--r--x11/xorg-libraries/files/patch-X11-Imakefile12
-rw-r--r--x11/xorg-libraries/files/patch-Xau-Imakefile11
-rw-r--r--x11/xorg-libraries/files/patch-Xcomposite-Imakefile11
-rw-r--r--x11/xorg-libraries/files/patch-Xcursor-Imakefile11
-rw-r--r--x11/xorg-libraries/files/patch-Xdamage-Imakefile11
-rw-r--r--x11/xorg-libraries/files/patch-Xdmcp-Imakefile17
-rw-r--r--x11/xorg-libraries/files/patch-Xevie-Imakefile11
-rw-r--r--x11/xorg-libraries/files/patch-Xfixes-Imakefile11
-rw-r--r--x11/xorg-libraries/files/patch-XlcDL.c16
-rw-r--r--x11/xorg-libraries/files/patch-Xrender-Imakefile11
-rw-r--r--x11/xorg-libraries/files/patch-dps-Imakefile30
-rw-r--r--x11/xorg-libraries/files/patch-lib-Imakefile22
-rw-r--r--x11/xorg-libraries/pkg-plist785
-rw-r--r--x11/xorg-libraries/scripts/configure12
-rw-r--r--x11/xorg-protos/Makefile56
-rw-r--r--x11/xorg-protos/pkg-descr6
-rw-r--r--x11/xorg-protos/pkg-plist2
-rw-r--r--x11/xorg/Makefile62
-rw-r--r--x11/xphelloworld/Makefile26
-rw-r--r--x11/xphelloworld/distinfo3
-rw-r--r--x11/xphelloworld/pkg-descr5
-rw-r--r--x11/xplsprinters/Makefile22
-rw-r--r--x11/xplsprinters/distinfo3
-rw-r--r--x11/xplsprinters/pkg-descr5
-rw-r--r--x11/xpr/Makefile22
-rw-r--r--x11/xpr/distinfo3
-rw-r--r--x11/xpr/pkg-descr4
-rw-r--r--x11/xprehashprinterlist/Makefile22
-rw-r--r--x11/xprehashprinterlist/distinfo3
-rw-r--r--x11/xprehashprinterlist/pkg-descr5
-rw-r--r--x11/xprompt/Makefile1
-rw-r--r--x11/xprop/Makefile22
-rw-r--r--x11/xprop/distinfo3
-rw-r--r--x11/xprop/pkg-descr5
-rw-r--r--x11/xproto/Makefile13
-rw-r--r--x11/xproto/distinfo6
-rw-r--r--x11/xproto/pkg-plist8
-rw-r--r--x11/xproxymanagementprotocol/Makefile17
-rw-r--r--x11/xproxymanagementprotocol/distinfo3
-rw-r--r--x11/xproxymanagementprotocol/pkg-descr6
-rw-r--r--x11/xproxymanagementprotocol/pkg-plist4
-rw-r--r--x11/xrandr/Makefile22
-rw-r--r--x11/xrandr/distinfo3
-rw-r--r--x11/xrandr/pkg-descr5
-rw-r--r--x11/xrdb/Makefile22
-rw-r--r--x11/xrdb/distinfo3
-rw-r--r--x11/xrdb/pkg-descr4
-rw-r--r--x11/xrefresh/Makefile22
-rw-r--r--x11/xrefresh/distinfo3
-rw-r--r--x11/xrefresh/pkg-descr5
-rw-r--r--x11/xrestop/Makefile1
-rw-r--r--x11/xrootconsole/Makefile1
-rw-r--r--x11/xrsh/Makefile1
-rw-r--r--x11/xrsi/Makefile1
-rw-r--r--x11/xrx/Makefile24
-rw-r--r--x11/xrx/distinfo3
-rw-r--r--x11/xrx/pkg-descr6
-rw-r--r--x11/xrx/pkg-plist9
-rw-r--r--x11/xscreensaver-gnome-hacks/Makefile2
-rw-r--r--x11/xscreensaver-gnome/Makefile2
-rw-r--r--x11/xscreensaver-gnome/pkg-plist18
-rw-r--r--x11/xscreensaver-kde/Makefile2
-rw-r--r--x11/xscreensaver.app/Makefile2
-rw-r--r--x11/xscreensaver/Makefile2
-rw-r--r--x11/xscreensaver/pkg-plist1
-rw-r--r--x11/xsel/Makefile2
-rw-r--r--x11/xset/Makefile22
-rw-r--r--x11/xset/distinfo3
-rw-r--r--x11/xset/pkg-descr5
-rw-r--r--x11/xsetmode/Makefile22
-rw-r--r--x11/xsetmode/distinfo3
-rw-r--r--x11/xsetmode/pkg-descr5
-rw-r--r--x11/xsetpointer/Makefile22
-rw-r--r--x11/xsetpointer/distinfo3
-rw-r--r--x11/xsetpointer/pkg-descr5
-rw-r--r--x11/xsetroot/Makefile20
-rw-r--r--x11/xsetroot/distinfo3
-rw-r--r--x11/xsetroot/pkg-descr6
-rw-r--r--x11/xskyroot/Makefile1
-rw-r--r--x11/xsm/Makefile20
-rw-r--r--x11/xsm/distinfo3
-rw-r--r--x11/xsm/pkg-descr4
-rw-r--r--x11/xsm/pkg-plist5
-rw-r--r--x11/xsnow/Makefile2
-rw-r--r--x11/xstarroll/Makefile1
-rw-r--r--x11/xstdcmap/Makefile22
-rw-r--r--x11/xstdcmap/distinfo3
-rw-r--r--x11/xstdcmap/pkg-descr4
-rw-r--r--x11/xstroke/Makefile2
-rw-r--r--x11/xtacy/Makefile1
-rw-r--r--x11/xterm/Makefile1
-rw-r--r--x11/xtermcontrol/Makefile1
-rw-r--r--x11/xtermset/Makefile1
-rw-r--r--x11/xtestpicture/Makefile1
-rw-r--r--x11/xtoolwait/Makefile1
-rw-r--r--x11/xtrans/Makefile17
-rw-r--r--x11/xtrans/distinfo3
-rw-r--r--x11/xtrans/pkg-descr6
-rw-r--r--x11/xtrans/pkg-plist13
-rw-r--r--x11/xtrap/Makefile27
-rw-r--r--x11/xtrap/distinfo3
-rw-r--r--x11/xtrap/pkg-descr6
-rw-r--r--x11/xtrap/pkg-plist7
-rw-r--r--x11/xtrlock/Makefile1
-rw-r--r--x11/xvattr/Makefile2
-rw-r--r--x11/xvidtune/Makefile20
-rw-r--r--x11/xvidtune/distinfo3
-rw-r--r--x11/xvidtune/pkg-descr1
-rw-r--r--x11/xvidtune/pkg-plist3
-rw-r--r--x11/xvinfo/Makefile22
-rw-r--r--x11/xvinfo/distinfo3
-rw-r--r--x11/xvinfo/pkg-descr6
-rw-r--r--x11/xvkbd/Makefile2
-rw-r--r--x11/xwatchwin/Makefile2
-rw-r--r--x11/xwd/Makefile22
-rw-r--r--x11/xwd/distinfo3
-rw-r--r--x11/xwd/pkg-descr4
-rw-r--r--x11/xwininfo/Makefile22
-rw-r--r--x11/xwininfo/distinfo3
-rw-r--r--x11/xwininfo/pkg-descr5
-rw-r--r--x11/xwit/Makefile1
-rw-r--r--x11/xwud/Makefile22
-rw-r--r--x11/xwud/distinfo3
-rw-r--r--x11/xwud/pkg-descr4
-rw-r--r--x11/xxkb/Makefile1
-rw-r--r--x11/xzoom/Makefile1
-rw-r--r--x11/yakuake-kde4/Makefile1
-rw-r--r--x11/yakuake/Makefile1
-rw-r--r--x11/yalias/Makefile2
-rw-r--r--x11/yelp/Makefile1
-rw-r--r--x11/yelp/pkg-plist40
-rw-r--r--x11/zenity/Makefile1
-rw-r--r--x11/zenity/pkg-plist36
881 files changed, 6977 insertions, 2952 deletions
diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile
index 5cac9f7eaf14..199e58308c16 100644
--- a/x11/3ddesktop/Makefile
+++ b/x11/3ddesktop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= 3ddesktop
PORTVERSION= 0.2.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= desk3d
diff --git a/x11/9box/Makefile b/x11/9box/Makefile
index dab866808cec..6e97349b015b 100644
--- a/x11/9box/Makefile
+++ b/x11/9box/Makefile
@@ -7,7 +7,7 @@
PORTNAME= 9box
PORTVERSION= 0.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= thierry
@@ -19,6 +19,7 @@ PLIST_FILES= bin/9box
USE_XLIB= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_XORG= xbitmaps
BUILD_WRKSRC= ${WRKSRC}/src
diff --git a/x11/9menu/Makefile b/x11/9menu/Makefile
index fade6b153f12..0bcca303ff19 100644
--- a/x11/9menu/Makefile
+++ b/x11/9menu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= 9menu
PORTVERSION= 1.8
+PORTREVISION= 1
CATEGORIES= x11 plan9
MASTER_SITES= ftp://freefriends.org/arnold/Source/ \
${MASTER_SITE_NETBSD}
diff --git a/x11/9term/Makefile b/x11/9term/Makefile
index 52d687512324..6d77e7854666 100644
--- a/x11/9term/Makefile
+++ b/x11/9term/Makefile
@@ -7,6 +7,7 @@
PORTNAME= 9term
PORTVERSION= 1.6.3
+PORTREVISION= 1
CATEGORIES= x11 plan9
MASTER_SITES= ftp://ftp.cs.usyd.edu.au/matty/unicode/
DISTNAME= ${PORTNAME}.${PORTVERSION}
diff --git a/x11/Makefile b/x11/Makefile
index c7c654f0f3e1..e4fd89a372cf 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -15,13 +15,17 @@
SUBDIR += XFree86-4-manuals
SUBDIR += accessx
SUBDIR += alltray
+ SUBDIR += appres
SUBDIR += apwal
SUBDIR += aterm
SUBDIR += bbappconf
SUBDIR += bbdock
SUBDIR += bbrun
SUBDIR += bbuname
+ SUBDIR += beforelight
SUBDIR += bgrot
+ SUBDIR += bigreqsproto
+ SUBDIR += bitmap
SUBDIR += blast
SUBDIR += bricons
SUBDIR += brightside
@@ -29,11 +33,14 @@
SUBDIR += chameleon
SUBDIR += cnslock
SUBDIR += compositeext
+ SUBDIR += compositeproto
SUBDIR += damageext
+ SUBDIR += damageproto
SUBDIR += decurs
SUBDIR += deskmenu
SUBDIR += dgs
SUBDIR += dmenu
+ SUBDIR += dmxproto
SUBDIR += docker
SUBDIR += dxpc
SUBDIR += dynamag
@@ -58,6 +65,7 @@
SUBDIR += e17-module-winselector
SUBDIR += ebuttons
SUBDIR += ecore
+ SUBDIR += editres
SUBDIR += electricsheep
SUBDIR += elicit
SUBDIR += emu
@@ -68,6 +76,7 @@
SUBDIR += etoile
SUBDIR += etoile-iterm
SUBDIR += etoile-xwindowserverkit
+ SUBDIR += evieext
SUBDIR += examine
SUBDIR += fast-user-switch-applet
SUBDIR += fbdesk
@@ -75,14 +84,17 @@
SUBDIR += fbsd-icons
SUBDIR += fireflies
SUBDIR += fixesext
+ SUBDIR += fixesproto
SUBDIR += fluxbg
SUBDIR += fpc-x11
+ SUBDIR += fstobdf
SUBDIR += gcb
SUBDIR += gcursor
SUBDIR += gdesklets-tasklist
SUBDIR += gdkxft
SUBDIR += gdm
SUBDIR += ggiterm
+ SUBDIR += glproto
SUBDIR += gmessage
SUBDIR += gmrun
SUBDIR += gnome-applets
@@ -115,11 +127,15 @@
SUBDIR += gtkterm2
SUBDIR += gtstarter
SUBDIR += gxset
+ SUBDIR += iceauth
+ SUBDIR += ico
SUBDIR += idesk
SUBDIR += imwheel
SUBDIR += innerspace
+ SUBDIR += inputproto
SUBDIR += ipager
SUBDIR += kb2mb2
+ SUBDIR += kbproto
SUBDIR += kde-lite
SUBDIR += kde3
SUBDIR += kde3-apireference
@@ -128,29 +144,38 @@
SUBDIR += kdelibs3-nocups
SUBDIR += keylaunch
SUBDIR += kxgenerator
- SUBDIR += libGL
SUBDIR += libICE
SUBDIR += libSM
SUBDIR += libX11
+ SUBDIR += libXScrnSaver
+ SUBDIR += libXTrap
SUBDIR += libXau
SUBDIR += libXcomposite
SUBDIR += libXcursor
SUBDIR += libXdamage
SUBDIR += libXdmcp
+ SUBDIR += libXevie
SUBDIR += libXext
SUBDIR += libXfixes
- SUBDIR += libXfont
SUBDIR += libXi
SUBDIR += libXinerama
SUBDIR += libXp
SUBDIR += libXpm
+ SUBDIR += libXprintAppUtil
+ SUBDIR += libXprintUtil
SUBDIR += libXrandr
SUBDIR += libXrender
SUBDIR += libXres
SUBDIR += libXtrans
+ SUBDIR += libXtst
SUBDIR += libXv
+ SUBDIR += libXvMC
SUBDIR += libXxf86
+ SUBDIR += libXxf86dga
+ SUBDIR += libXxf86misc
+ SUBDIR += libXxf86vm
SUBDIR += libcapplet
+ SUBDIR += libdmx
SUBDIR += libdnd
SUBDIR += libexo
SUBDIR += libgnome
@@ -159,17 +184,22 @@
SUBDIR += libgnomekbd
SUBDIR += libgnomemm
SUBDIR += libgnomemm26
+ SUBDIR += liboldX
SUBDIR += libsx
SUBDIR += libsynaptics
SUBDIR += libxcb
SUBDIR += libxfce4mcs
SUBDIR += libxfce4util
SUBDIR += libxkbfile
+ SUBDIR += libxkbui
SUBDIR += libxklavier
SUBDIR += linux-xorg-libs
+ SUBDIR += listres
+ SUBDIR += luit
SUBDIR += lupe
SUBDIR += lxpanel
SUBDIR += mgapdesk
+ SUBDIR += mkcomposecache
SUBDIR += mlterm
SUBDIR += mrxvt
SUBDIR += mrxvt-devel
@@ -182,6 +212,7 @@
SUBDIR += nvidia-driver-9631
SUBDIR += nvidia-settings
SUBDIR += nvidia-xconfig
+ SUBDIR += oclock
SUBDIR += oooqs
SUBDIR += oooqs2
SUBDIR += p5-Clipboard
@@ -194,18 +225,25 @@
SUBDIR += portoseguro
SUBDIR += powershell
SUBDIR += printext
+ SUBDIR += printproto
SUBDIR += props
SUBDIR += py-qt4-opengl
SUBDIR += qrash
SUBDIR += qt4-inputmethods
SUBDIR += qt4-opengl
SUBDIR += randrext
+ SUBDIR += randrproto
+ SUBDIR += recordproto
SUBDIR += rendercheck
SUBDIR += renderext
+ SUBDIR += renderproto
SUBDIR += resourceext
+ SUBDIR += resourceproto
+ SUBDIR += rgb
SUBDIR += rox-wallpaper
SUBDIR += roxbg
SUBDIR += rsibreak
+ SUBDIR += rstart
SUBDIR += ruby-X11
SUBDIR += ruby-gnome2
SUBDIR += ruby-gnome2-all
@@ -213,11 +251,16 @@
SUBDIR += rxvt
SUBDIR += rxvt-devel
SUBDIR += rxvt-unicode
+ SUBDIR += scripts
+ SUBDIR += scrnsaverproto
+ SUBDIR += sessreg
SUBDIR += settitle
+ SUBDIR += setxkbmap
SUBDIR += silo
SUBDIR += sisctrl
SUBDIR += slim
SUBDIR += slock
+ SUBDIR += smproxy
SUBDIR += stalonetray
SUBDIR += startup-notification
SUBDIR += sxpc
@@ -227,9 +270,12 @@
SUBDIR += tilda
SUBDIR += tkXwin
SUBDIR += tkgoodstuff
+ SUBDIR += trapproto
SUBDIR += trayer
SUBDIR += tycoon
SUBDIR += vdesk
+ SUBDIR += videoproto
+ SUBDIR += viewres
SUBDIR += wbar
SUBDIR += wdm
SUBDIR += widgetfactory
@@ -248,55 +294,104 @@
SUBDIR += workrave
SUBDIR += wrapper
SUBDIR += wterm
+ SUBDIR += x11perf
SUBDIR += x3270
SUBDIR += xaniroc
SUBDIR += xantfarm
+ SUBDIR += xauth
SUBDIR += xautolock
SUBDIR += xautomation
SUBDIR += xballoon
SUBDIR += xbanner
SUBDIR += xbelld
+ SUBDIR += xbiff
SUBDIR += xbindkeys
SUBDIR += xbindkeys_config
+ SUBDIR += xbitmaps
+ SUBDIR += xcalc
SUBDIR += xcalib
SUBDIR += xcb
SUBDIR += xcb-proto
SUBDIR += xclick
SUBDIR += xclip
+ SUBDIR += xclipboard
+ SUBDIR += xclock
SUBDIR += xcmd
+ SUBDIR += xcmiscproto
+ SUBDIR += xcmsdb
SUBDIR += xco
SUBDIR += xcoloredit
SUBDIR += xcolors
SUBDIR += xcolorsel
+ SUBDIR += xconsole
SUBDIR += xcurs
+ SUBDIR += xcursorgen
SUBDIR += xcut
+ SUBDIR += xdbedizzy
SUBDIR += xdialog
+ SUBDIR += xditview
+ SUBDIR += xdm
+ SUBDIR += xdpyinfo
+ SUBDIR += xdriinfo
SUBDIR += xdtm
+ SUBDIR += xedit
+ SUBDIR += xev
SUBDIR += xextensions
+ SUBDIR += xextproto
+ SUBDIR += xeyes
+ SUBDIR += xf86dga
+ SUBDIR += xf86dgaproto
+ SUBDIR += xf86driproto
SUBDIR += xf86ext
+ SUBDIR += xf86miscproto
+ SUBDIR += xf86rushproto
+ SUBDIR += xf86vidmodeproto
SUBDIR += xfce4-clipman-plugin
SUBDIR += xfce4-quicklauncher-plugin
SUBDIR += xfce4-screenshooter-plugin
SUBDIR += xfce4-taskmanager
SUBDIR += xfce4-xfapplet-plugin
+ SUBDIR += xfd
+ SUBDIR += xfindproxy
SUBDIR += xfishtank
SUBDIR += xfree86_xkb_xml
+ SUBDIR += xfwp
+ SUBDIR += xgamma
+ SUBDIR += xgc
SUBDIR += xgrab
+ SUBDIR += xhost
SUBDIR += xidle
+ SUBDIR += xineramaproto
+ SUBDIR += xinit
SUBDIR += xinput
+ SUBDIR += xkbcomp
SUBDIR += xkbctrl
+ SUBDIR += xkbevd
+ SUBDIR += xkbprint
SUBDIR += xkbset
+ SUBDIR += xkbutils
+ SUBDIR += xkeyboard-config
SUBDIR += xkeycaps
SUBDIR += xkeywrap
- SUBDIR += xlibs
+ SUBDIR += xkill
+ SUBDIR += xload
SUBDIR += xloadimage
SUBDIR += xlockmore
+ SUBDIR += xlogo
SUBDIR += xlogout
+ SUBDIR += xlsatoms
+ SUBDIR += xlsclients
SUBDIR += xlupe
+ SUBDIR += xmag
+ SUBDIR += xman
SUBDIR += xmangekyou
SUBDIR += xmascot
+ SUBDIR += xmessage
+ SUBDIR += xmh
+ SUBDIR += xmodmap
SUBDIR += xmold
SUBDIR += xmon
+ SUBDIR += xmore
SUBDIR += xmotd
SUBDIR += xmove
SUBDIR += xmsg
@@ -304,26 +399,43 @@
SUBDIR += xnee
SUBDIR += xnodecor
SUBDIR += xorg
- SUBDIR += xorg-clients
- SUBDIR += xorg-documents
+ SUBDIR += xorg-apps
+ SUBDIR += xorg-cf-files
+ SUBDIR += xorg-docs
SUBDIR += xorg-edit
SUBDIR += xorg-libraries
- SUBDIR += xorg-manpages
+ SUBDIR += xorg-protos
+ SUBDIR += xphelloworld
+ SUBDIR += xplsprinters
+ SUBDIR += xpr
+ SUBDIR += xprehashprinterlist
SUBDIR += xprompt
+ SUBDIR += xprop
SUBDIR += xproto
+ SUBDIR += xproxymanagementprotocol
+ SUBDIR += xrandr
+ SUBDIR += xrdb
+ SUBDIR += xrefresh
SUBDIR += xrestop
SUBDIR += xrootconsole
SUBDIR += xrsh
SUBDIR += xrsi
+ SUBDIR += xrx
SUBDIR += xscreensaver
SUBDIR += xscreensaver-gnome
SUBDIR += xscreensaver-gnome-hacks
SUBDIR += xscreensaver-kde
SUBDIR += xscreensaver.app
SUBDIR += xsel
+ SUBDIR += xset
+ SUBDIR += xsetmode
+ SUBDIR += xsetpointer
+ SUBDIR += xsetroot
SUBDIR += xskyroot
+ SUBDIR += xsm
SUBDIR += xsnow
SUBDIR += xstarroll
+ SUBDIR += xstdcmap
SUBDIR += xstroke
SUBDIR += xtacy
SUBDIR += xtattr
@@ -332,12 +444,19 @@
SUBDIR += xtermset
SUBDIR += xtestpicture
SUBDIR += xtoolwait
+ SUBDIR += xtrans
+ SUBDIR += xtrap
SUBDIR += xtrlock
SUBDIR += xtset
SUBDIR += xvattr
+ SUBDIR += xvidtune
+ SUBDIR += xvinfo
SUBDIR += xvkbd
SUBDIR += xwatchwin
+ SUBDIR += xwd
+ SUBDIR += xwininfo
SUBDIR += xwit
+ SUBDIR += xwud
SUBDIR += xxkb
SUBDIR += xzoom
SUBDIR += yakuake
diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index 821154bc75eb..605416813e24 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Terminal
PORTVERSION= 0.2.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITES_XFCE}
DIST_SUBDIR= xfce4
diff --git a/x11/Terminal/pkg-plist b/x11/Terminal/pkg-plist
index df3599687e8e..dc83fd7c0b0d 100644
--- a/x11/Terminal/pkg-plist
+++ b/x11/Terminal/pkg-plist
@@ -125,7 +125,6 @@ share/locale/uk/LC_MESSAGES/Terminal.mo
share/locale/zh_CN/LC_MESSAGES/Terminal.mo
share/locale/zh_TW/LC_MESSAGES/Terminal.mo
share/pixmaps/terminal.xpm
-@dirrmtry share/pixmaps
@dirrmtry share/icons/hicolor/scalable
@dirrmtry share/icons/hicolor/24x24/stock/navigation
@dirrmtry share/icons/hicolor/24x24/stock
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 43dca7f5761c..1d7ac13361a7 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -7,7 +7,7 @@
PORTNAME= clients
PORTVERSION= 4.5.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= ${PORTVERSION}
diff --git a/x11/XFree86-4-documents/Makefile b/x11/XFree86-4-documents/Makefile
index 9021cb691f65..e70fa16fb0cc 100644
--- a/x11/XFree86-4-documents/Makefile
+++ b/x11/XFree86-4-documents/Makefile
@@ -7,6 +7,7 @@
PORTNAME= documents
PORTVERSION= 4.5.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= ${PORTVERSION}
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 6a5664750ace..e7df1a8d6181 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libraries
PORTVERSION= 4.5.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= ${PORTVERSION}
@@ -34,7 +35,7 @@ CONFLICTS= Mesa-[0-9]* libX11-[0-9]* libGL-[0-9]* libGLU-[0-9]* \
USE_X_PREFIX= no
PREFIX?= ${X11BASE}
-MTREE_FILE= /etc/mtree/BSD.x11-4.dist
+MTREE_FILE= ${PORTSDIR}/Templates/BSD.local.dist
INSTALLS_SHLIB= yes
SCRIPTS_ENV= DebuggableLibraries=${DebuggableLibraries}
MAN3= FontCacheChangeCacheSettings.3 \
diff --git a/x11/XFree86-4-manuals/Makefile b/x11/XFree86-4-manuals/Makefile
index 0a72856ae9a4..148345523265 100644
--- a/x11/XFree86-4-manuals/Makefile
+++ b/x11/XFree86-4-manuals/Makefile
@@ -7,6 +7,7 @@
PORTNAME= manuals
PORTVERSION= 4.5.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= ${PORTVERSION}
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 7566259bd886..1f04cc7c7f99 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= XFree86
PORTVERSION= 4.5.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= # none
diff --git a/x11/accessx/Makefile b/x11/accessx/Makefile
index 7c9829e5710a..6a0e5890210d 100644
--- a/x11/accessx/Makefile
+++ b/x11/accessx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= accessx
PORTVERSION= 0.951
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 accessibility
MASTER_SITES= http://www.disability.uiuc.edu/accessx/software/
DISTNAME= accessx${PORTVERSION:S/.//g}
diff --git a/x11/alltray/Makefile b/x11/alltray/Makefile
index 5c8603b8e65b..8390958579e8 100644
--- a/x11/alltray/Makefile
+++ b/x11/alltray/Makefile
@@ -7,7 +7,7 @@
PORTNAME= alltray
PORTVERSION= 0.69
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11/alltray/pkg-plist b/x11/alltray/pkg-plist
index 7c01a3423e78..c17fd0f3e0f9 100644
--- a/x11/alltray/pkg-plist
+++ b/x11/alltray/pkg-plist
@@ -5,4 +5,3 @@ lib/liballtray.so.0
share/applications/alltray.desktop
share/pixmaps/alltray.png
@dirrmtry share/applications
-@dirrmtry share/pixmaps
diff --git a/x11/appres/Makefile b/x11/appres/Makefile
new file mode 100644
index 000000000000..bc9a32721fdb
--- /dev/null
+++ b/x11/appres/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for: appres
+# Date Created: 15 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= appres
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Program to list application's resources
+
+XORG_CAT= app
+USE_XORG= x11 xt
+
+MAN1= appres.1
+PLIST_FILES= bin/appres
+
+.include <bsd.port.mk>
diff --git a/x11/appres/distinfo b/x11/appres/distinfo
new file mode 100644
index 000000000000..fef58715f111
--- /dev/null
+++ b/x11/appres/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/appres-1.0.1.tar.bz2) = 420e6cdf38bb771ec8b00228bf09e8ff
+SHA256 (xorg/app/appres-1.0.1.tar.bz2) = 15fef83a202b8dcee3420c88dba4aeed1f8fc840ab537487fb5411b99a2eb962
+SIZE (xorg/app/appres-1.0.1.tar.bz2) = 85320
diff --git a/x11/appres/pkg-descr b/x11/appres/pkg-descr
new file mode 100644
index 000000000000..6a5b906d2e75
--- /dev/null
+++ b/x11/appres/pkg-descr
@@ -0,0 +1,4 @@
+The appres program prints the resources seen by an application (or
+subhierarchy of an application) with the specified class and instance
+names. It can be used to determine which resources a particular
+program will load.
diff --git a/x11/apwal/Makefile b/x11/apwal/Makefile
index 0e96e21a634a..711b8e5ff415 100644
--- a/x11/apwal/Makefile
+++ b/x11/apwal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apwal
PORTVERSION= 0.4.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://apwal.free.fr/download/
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 860abe42fe6e..caa26b0377c6 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= aterm
PORTVERSION= 1.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES+= x11 # `+=' is for slave ports
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11/bbappconf/Makefile b/x11/bbappconf/Makefile
index 9c896fed7926..69a816b25d1c 100644
--- a/x11/bbappconf/Makefile
+++ b/x11/bbappconf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bbappconf
PORTVERSION= 0.0.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://bbtools.windsofstorm.net/sources/
diff --git a/x11/bbdock/Makefile b/x11/bbdock/Makefile
index d9ff4b73ddd0..c9fed00f405e 100644
--- a/x11/bbdock/Makefile
+++ b/x11/bbdock/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bbdock
PORTVERSION= 0.2.8
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://bbdock.nethence.com/download/
diff --git a/x11/bbrun/Makefile b/x11/bbrun/Makefile
index bc292676bfe5..63841ab25b11 100644
--- a/x11/bbrun/Makefile
+++ b/x11/bbrun/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bbrun
PORTVERSION= 1.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= http://www.bsd-geek.de/FreeBSD/distfiles/
diff --git a/x11/bbuname/Makefile b/x11/bbuname/Makefile
index 42cb43084bfe..8eb5d2a39d4b 100644
--- a/x11/bbuname/Makefile
+++ b/x11/bbuname/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bbuname
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://spiritisdigital.com/download/linux/bbuname/
diff --git a/x11/beforelight/Makefile b/x11/beforelight/Makefile
new file mode 100644
index 000000000000..f79b5def73d5
--- /dev/null
+++ b/x11/beforelight/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: beforelight
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= beforelight
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= A sample screen saver for X
+
+XORG_CAT= app
+USE_XORG= x11 xscrnsaver xt xaw7 xt
+
+MAN1= beforelight.1
+
+.include <bsd.port.mk>
diff --git a/x11/beforelight/distinfo b/x11/beforelight/distinfo
new file mode 100644
index 000000000000..06c9a62d2edd
--- /dev/null
+++ b/x11/beforelight/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/beforelight-1.0.2.tar.bz2) = 8bc2e35cdcd2e6a80eab1b77c41f2a46
+SHA256 (xorg/app/beforelight-1.0.2.tar.bz2) = 00e217559c93779fe04fd948017820af118a3981d6b4371ace95107cb3b047a7
+SIZE (xorg/app/beforelight-1.0.2.tar.bz2) = 85526
diff --git a/x11/beforelight/pkg-descr b/x11/beforelight/pkg-descr
new file mode 100644
index 000000000000..75c2de6b27ab
--- /dev/null
+++ b/x11/beforelight/pkg-descr
@@ -0,0 +1,5 @@
+This package contains a sample screen saver for the X Window System called
+"beforelight".
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/beforelight/pkg-plist b/x11/beforelight/pkg-plist
new file mode 100644
index 000000000000..e1a775c5b7fa
--- /dev/null
+++ b/x11/beforelight/pkg-plist
@@ -0,0 +1,3 @@
+bin/beforelight
+share/X11/app-defaults/Beforelight
+@dirrmtry share/X11/app-defaults
diff --git a/x11/bgrot/Makefile b/x11/bgrot/Makefile
index b3fb94f70987..4cf2ae1c8e6a 100644
--- a/x11/bgrot/Makefile
+++ b/x11/bgrot/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bgrot
PORTVERSION= 1.30
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.over-yonder.net/~fullermd/projects/bgrot/ \
http://www.centralmiss.com/~matt/distfiles/
diff --git a/x11/bigreqsproto/Makefile b/x11/bigreqsproto/Makefile
new file mode 100644
index 000000000000..b1d7036899f8
--- /dev/null
+++ b/x11/bigreqsproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: bigreqsproto
+# Date Created: 07 Aug 2005
+# Whom: Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= bigreqsproto
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= BigReqs extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/bigreqsproto/distinfo b/x11/bigreqsproto/distinfo
new file mode 100644
index 000000000000..b1c8a2736651
--- /dev/null
+++ b/x11/bigreqsproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/bigreqsproto-1.0.2.tar.bz2) = 95c29d9d10bf2868996c0c47a3b9a8dc
+SHA256 (xorg/proto/bigreqsproto-1.0.2.tar.bz2) = 30da0098a24578e645193464526cc4d5c2c7fecaf476d1b9dabe68118850adee
+SIZE (xorg/proto/bigreqsproto-1.0.2.tar.bz2) = 36676
diff --git a/x11/bigreqsproto/pkg-descr b/x11/bigreqsproto/pkg-descr
new file mode 100644
index 000000000000..8d54a8f300f0
--- /dev/null
+++ b/x11/bigreqsproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org BigReqs extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/bigreqsproto/pkg-plist b/x11/bigreqsproto/pkg-plist
new file mode 100644
index 000000000000..1a1af677b0cd
--- /dev/null
+++ b/x11/bigreqsproto/pkg-plist
@@ -0,0 +1,3 @@
+include/X11/extensions/bigreqstr.h
+libdata/pkgconfig/bigreqsproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile
new file mode 100644
index 000000000000..5e750fc2ffc0
--- /dev/null
+++ b/x11/bitmap/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for: bitmap
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= bitmap
+PORTVERSION= 1.0.3
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Bitmap editor and converter utilities for X
+
+XORG_CAT= app
+USE_XORG= x11 xmu x11 xbitmaps xt xaw xbitmaps
+MAN1= atobm.1 bitmap.1 bmtoa.1
+
+.include <bsd.port.mk>
diff --git a/x11/bitmap/distinfo b/x11/bitmap/distinfo
new file mode 100644
index 000000000000..f6dee763e9f8
--- /dev/null
+++ b/x11/bitmap/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/bitmap-1.0.3.tar.bz2) = 98200c358e5401d648b980564d9ae39d
+SHA256 (xorg/app/bitmap-1.0.3.tar.bz2) = 863f673518af19f9ae35ee221b30bf8c8b695c76c543d18b3ac400a51b855c41
+SIZE (xorg/app/bitmap-1.0.3.tar.bz2) = 129364
diff --git a/x11/bitmap/pkg-descr b/x11/bitmap/pkg-descr
new file mode 100644
index 000000000000..fcb5245535ce
--- /dev/null
+++ b/x11/bitmap/pkg-descr
@@ -0,0 +1,5 @@
+This package contains bitmap, which is a tool for creating or editing
+rectangual images made up of 1's and 0's.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/bitmap/pkg-plist b/x11/bitmap/pkg-plist
new file mode 100644
index 000000000000..f9dfe747269b
--- /dev/null
+++ b/x11/bitmap/pkg-plist
@@ -0,0 +1,20 @@
+bin/atobm
+bin/bitmap
+bin/bmtoa
+include/X11/bitmaps/Dashes
+include/X11/bitmaps/Down
+include/X11/bitmaps/Excl
+include/X11/bitmaps/FlipHoriz
+include/X11/bitmaps/FlipVert
+include/X11/bitmaps/Fold
+include/X11/bitmaps/Left
+include/X11/bitmaps/Right
+include/X11/bitmaps/RotateLeft
+include/X11/bitmaps/RotateRight
+include/X11/bitmaps/Stipple
+include/X11/bitmaps/Term
+include/X11/bitmaps/Up
+share/X11/app-defaults/Bitmap
+share/X11/app-defaults/Bitmap-color
+share/X11/app-defaults/Bitmap-nocase
+@dirrmtry share/X11/app-defaults
diff --git a/x11/blast/Makefile b/x11/blast/Makefile
index ab4f3bb66e08..2e7333e5983b 100644
--- a/x11/blast/Makefile
+++ b/x11/blast/Makefile
@@ -7,6 +7,7 @@
PORTNAME= blast
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/b/blast
diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile
index 5346068baa55..d6be0fa327db 100644
--- a/x11/bricons/Makefile
+++ b/x11/bricons/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bricons
PORTVERSION= 3.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.x.org/R5contrib/
DISTNAME= ${PORTNAME}
diff --git a/x11/brightside/Makefile b/x11/brightside/Makefile
index cfe6f657ff68..9bd61f528d3f 100644
--- a/x11/brightside/Makefile
+++ b/x11/brightside/Makefile
@@ -7,7 +7,7 @@
PORTNAME= brightside
PORTVERSION= 1.4.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://files.catmur.co.uk/brightside/
diff --git a/x11/buttonbox/Makefile b/x11/buttonbox/Makefile
index 5b52c4433579..3dac8044c74a 100644
--- a/x11/buttonbox/Makefile
+++ b/x11/buttonbox/Makefile
@@ -7,6 +7,7 @@
PORTNAME= buttonbox
PORTVERSION= 0.03
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= trevor
diff --git a/x11/chameleon/Makefile b/x11/chameleon/Makefile
index 3580a29b06c8..c19456eae8c8 100644
--- a/x11/chameleon/Makefile
+++ b/x11/chameleon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= chameleon
PORTVERSION= 1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://ftp.us.debian.org/debian/pool/main/c/chameleon/ \
ftp://carroll.aset.psu.edu/pub/linux/distributions/debian/pool/main/c/chameleon/ \
diff --git a/x11/cnslock/Makefile b/x11/cnslock/Makefile
index 26e55732283f..f5b3f95e3fe3 100644
--- a/x11/cnslock/Makefile
+++ b/x11/cnslock/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cnslock
PORTVERSION= 1.02
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 windowmaker
MASTER_SITES= http://www.dockapps.com/files/123/181/ \
http://freebsd.nsu.ru/distfiles/
diff --git a/x11/compositeext/Makefile b/x11/compositeext/Makefile
index 326b32b1af80..5ffc5df336ca 100644
--- a/x11/compositeext/Makefile
+++ b/x11/compositeext/Makefile
@@ -7,7 +7,7 @@
PORTNAME= compositeext
PORTVERSION= 2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
diff --git a/x11/compositeproto/Makefile b/x11/compositeproto/Makefile
new file mode 100644
index 000000000000..75e6a6a203ed
--- /dev/null
+++ b/x11/compositeproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: compositeproto
+# Date Created: 08 Aug 2005
+# Whom: Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= compositeproto
+PORTVERSION= 0.3.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Composite extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/compositeproto/distinfo b/x11/compositeproto/distinfo
new file mode 100644
index 000000000000..1a4c5e25086f
--- /dev/null
+++ b/x11/compositeproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/compositeproto-0.3.1.tar.bz2) = 54f1fbd567f57093df054f8440a60a5e
+SHA256 (xorg/proto/compositeproto-0.3.1.tar.bz2) = c7608611a7e42604777bdf7db20d17e7f4b62da98f154da762d12c735812e0cf
+SIZE (xorg/proto/compositeproto-0.3.1.tar.bz2) = 37322
diff --git a/x11/compositeproto/pkg-descr b/x11/compositeproto/pkg-descr
new file mode 100644
index 000000000000..9ce26903ea4d
--- /dev/null
+++ b/x11/compositeproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org Composite extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/compositeproto/pkg-plist b/x11/compositeproto/pkg-plist
new file mode 100644
index 000000000000..22845d18c4b8
--- /dev/null
+++ b/x11/compositeproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/composite.h
+include/X11/extensions/compositeproto.h
+libdata/pkgconfig/compositeproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/damageext/Makefile b/x11/damageext/Makefile
index 702b4cc237e6..52ef3d2c95db 100644
--- a/x11/damageext/Makefile
+++ b/x11/damageext/Makefile
@@ -7,7 +7,7 @@
PORTNAME= damageext
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
diff --git a/x11/damageproto/Makefile b/x11/damageproto/Makefile
new file mode 100644
index 000000000000..13fbd41b7039
--- /dev/null
+++ b/x11/damageproto/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for: damageproto
+# Date Created: 08 Aug 2005
+# Whom: Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= damageproto
+PORTVERSION= 1.1.0
+PORTREVISION= 2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Damage extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/damageproto/distinfo b/x11/damageproto/distinfo
new file mode 100644
index 000000000000..94794a9b8037
--- /dev/null
+++ b/x11/damageproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/damageproto-1.1.0.tar.bz2) = 33ee591e0b1ca5ad7902934541db7d24
+SHA256 (xorg/proto/damageproto-1.1.0.tar.bz2) = 9d2684fac835e9cdf78befff2a58292f54db90094acbfb9f2ed5316fa30d641d
+SIZE (xorg/proto/damageproto-1.1.0.tar.bz2) = 41449
diff --git a/x11/damageproto/pkg-descr b/x11/damageproto/pkg-descr
new file mode 100644
index 000000000000..9ba4ce9c9d65
--- /dev/null
+++ b/x11/damageproto/pkg-descr
@@ -0,0 +1,5 @@
+This package contains X.Org Damage extension protocol specification
+and header files.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/damageproto/pkg-plist b/x11/damageproto/pkg-plist
new file mode 100644
index 000000000000..66a230ae830d
--- /dev/null
+++ b/x11/damageproto/pkg-plist
@@ -0,0 +1,6 @@
+include/X11/extensions/damageproto.h
+include/X11/extensions/damagewire.h
+libdata/pkgconfig/damageproto.pc
+share/doc/damageproto/damageproto.txt
+@dirrm share/doc/damageproto
+@dirrmtry include/X11/extensions
diff --git a/x11/decurs/Makefile b/x11/decurs/Makefile
index ea0807a37534..d0bbdf5c1555 100644
--- a/x11/decurs/Makefile
+++ b/x11/decurs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= decurs
PORTVERSION= 0.55.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11
MASTER_SITES= http://varg.dyndns.org/psi/files/
diff --git a/x11/deskmenu/Makefile b/x11/deskmenu/Makefile
index dc87c1fb33a1..48a5cfa2623e 100644
--- a/x11/deskmenu/Makefile
+++ b/x11/deskmenu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= deskmenu
PORTVERSION= 1.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://matt.peterson.org/FreeBSD/ports/ \
http://gd.tuwien.ac.at/opsys/linux/gentoo/distfiles/
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index a235202eb580..88d7c07bf131 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dgs
PORTVERSION= 0.5.9.1
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= dgs
@@ -52,7 +52,7 @@ post-patch:
.if ${X_WINDOW_SYSTEM:L} == xorg
INSTALLDIRS+= DPS/clients/makepsres DPS/clients/pswrap DPS/demos/texteroids \
- DPS/lib/dpstk DPS/lib/psres
+ DPS/lib/dpstk DPS/lib/psres DPS/lib/dps DPS/include/DPS
MANN+= makepsres.man
PLIST_SUB+= WITH_XFREE4=""
.else
diff --git a/x11/dgs/pkg-plist b/x11/dgs/pkg-plist
index d92e10bc038f..141e7e9d3f54 100644
--- a/x11/dgs/pkg-plist
+++ b/x11/dgs/pkg-plist
@@ -6,6 +6,36 @@ bin/dpsnx.agent
%%WITH_XFREE4%%bin/pswrap
%%WITH_XFREE4%%bin/texteroids
bin/xepsf
+%%WITH_XFREE4%%include/DPS/ColorSB.h
+%%WITH_XFREE4%%include/DPS/ColorSBP.h
+%%WITH_XFREE4%%include/DPS/DPSScrollW.h
+%%WITH_XFREE4%%include/DPS/DPSScrollWP.h
+%%WITH_XFREE4%%include/DPS/FontCreatP.h
+%%WITH_XFREE4%%include/DPS/FontCreato.h
+%%WITH_XFREE4%%include/DPS/FontSB.h
+%%WITH_XFREE4%%include/DPS/FontSBP.h
+%%WITH_XFREE4%%include/DPS/FontSamplP.h
+%%WITH_XFREE4%%include/DPS/FontSample.h
+%%WITH_XFREE4%%include/DPS/PSres.h
+%%WITH_XFREE4%%include/DPS/XDPS.h
+%%WITH_XFREE4%%include/DPS/XDPSlib.h
+%%WITH_XFREE4%%include/DPS/XDPSproto.h
+%%WITH_XFREE4%%include/DPS/dpsNXargs.h
+%%WITH_XFREE4%%include/DPS/dpsXclient.h
+%%WITH_XFREE4%%include/DPS/dpsXcommon.h
+%%WITH_XFREE4%%include/DPS/dpsXpreview.h
+%%WITH_XFREE4%%include/DPS/dpsXshare.h
+%%WITH_XFREE4%%include/DPS/dpsXuserpath.h
+%%WITH_XFREE4%%include/DPS/dpsclient.h
+%%WITH_XFREE4%%include/DPS/dpsconfig.h
+%%WITH_XFREE4%%include/DPS/dpsexcept.h
+%%WITH_XFREE4%%include/DPS/dpsfriends.h
+%%WITH_XFREE4%%include/DPS/dpsops.h
+%%WITH_XFREE4%%include/DPS/psops.h
+%%WITH_XFREE4%%lib/libdps.a
+%%WITH_XFREE4%%lib/libdps.la
+%%WITH_XFREE4%%lib/libdps.so
+%%WITH_XFREE4%%lib/libdps.so.0
%%WITH_XFREE4%%lib/libdpstk.a
%%WITH_XFREE4%%lib/libdpstk.la
%%WITH_XFREE4%%lib/libdpstk.so
@@ -84,6 +114,7 @@ share/ghostscript/5.50/gs_typ32.ps
share/ghostscript/5.50/gs_typ42.ps
share/ghostscript/5.50/gs_type1.ps
share/ghostscript/5.50/gs_wan_e.ps
+%%WITH_XFREE4%%@dirrm include/DPS
@dirrmtry share/ghostscript/5.50/doc
@dirrmtry share/ghostscript/5.50/examples
@dirrmtry share/ghostscript/5.50
diff --git a/x11/dmenu/Makefile b/x11/dmenu/Makefile
index 8cf8e2d754d8..771fd228a7bc 100644
--- a/x11/dmenu/Makefile
+++ b/x11/dmenu/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dmenu
PORTVERSION= 3.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.suckless.org/download/ \
http://schot.a-eskwadraat.nl/files/
diff --git a/x11/dmxproto/Makefile b/x11/dmxproto/Makefile
new file mode 100644
index 000000000000..a568291d4cf1
--- /dev/null
+++ b/x11/dmxproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: dmxproto
+# Date Created: 06 Feb 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= dmxproto
+PORTVERSION= 2.2.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= DMX extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/dmxproto/distinfo b/x11/dmxproto/distinfo
new file mode 100644
index 000000000000..9c74d443d02e
--- /dev/null
+++ b/x11/dmxproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/dmxproto-2.2.2.tar.bz2) = d80acad88411e7944b9b085463d53302
+SHA256 (xorg/proto/dmxproto-2.2.2.tar.bz2) = aaa6d9c9d5ec58f733ca4d7413c541413482bce666217267e5bf88442e35fce2
+SIZE (xorg/proto/dmxproto-2.2.2.tar.bz2) = 39380
diff --git a/x11/dmxproto/pkg-descr b/x11/dmxproto/pkg-descr
new file mode 100644
index 000000000000..32c1fea20bec
--- /dev/null
+++ b/x11/dmxproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org DMXProto protocol headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/dmxproto/pkg-plist b/x11/dmxproto/pkg-plist
new file mode 100644
index 000000000000..6a6ab38e4e10
--- /dev/null
+++ b/x11/dmxproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/dmxext.h
+include/X11/extensions/dmxproto.h
+libdata/pkgconfig/dmxproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/docker/Makefile b/x11/docker/Makefile
index 8d0b31cf6f69..0320b72b5c37 100644
--- a/x11/docker/Makefile
+++ b/x11/docker/Makefile
@@ -7,7 +7,7 @@
PORTNAME= docker
PORTVERSION= 1.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= http://www.kerneled.org/files/FreeBSD-ports/ \
http://icculus.org/openbox/2/docker/
diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile
index b01a9d7e6a4e..004b3f4600b1 100644
--- a/x11/dxpc/Makefile
+++ b/x11/dxpc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dxpc
PORTVERSION= 3.9.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.vigor.nu/dxpc/%SUBDIR%/
MASTER_SITE_SUBDIR= ${PORTVERSION}
diff --git a/x11/dynamag/Makefile b/x11/dynamag/Makefile
index eaab4f00152e..e0691f4e7370 100644
--- a/x11/dynamag/Makefile
+++ b/x11/dynamag/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dynamag
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11 accessibility
MASTER_SITES= ftp://trace.wisc.edu/pub/access_utils/unix/
DISTNAME= unwindows
diff --git a/x11/e17-module-calendar/Makefile b/x11/e17-module-calendar/Makefile
index 0b0dfcbc44c0..72323396da12 100644
--- a/x11/e17-module-calendar/Makefile
+++ b/x11/e17-module-calendar/Makefile
@@ -7,7 +7,7 @@
PORTNAME= calendar
PORTVERSION= 20060926
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= http://sunner.elcomnet.ru/~stas/
diff --git a/x11/e17-module-cpu/Makefile b/x11/e17-module-cpu/Makefile
index e8d1947ec084..f6e16b1af42b 100644
--- a/x11/e17-module-cpu/Makefile
+++ b/x11/e17-module-cpu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cpu
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11/e17-module-deskshow/Makefile b/x11/e17-module-deskshow/Makefile
index 6737fb2fa962..dae67ad0b679 100644
--- a/x11/e17-module-deskshow/Makefile
+++ b/x11/e17-module-deskshow/Makefile
@@ -7,7 +7,7 @@
PORTNAME= deskshow
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11/e17-module-devian/Makefile b/x11/e17-module-devian/Makefile
index 2a3a8639abc4..a1f97faa7568 100644
--- a/x11/e17-module-devian/Makefile
+++ b/x11/e17-module-devian/Makefile
@@ -7,6 +7,7 @@
PORTNAME= devian
PORTVERSION= 20060926
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= http://sunner.elcomnet.ru/~stas/
diff --git a/x11/e17-module-engage/Makefile b/x11/e17-module-engage/Makefile
index a7ef92b84a7b..2901f7dbbf26 100644
--- a/x11/e17-module-engage/Makefile
+++ b/x11/e17-module-engage/Makefile
@@ -7,7 +7,7 @@
PORTNAME= engage
PORTVERSION= 20060719
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://mbsd.msk.ru/dist/
PKGNAMEPREFIX= e17-module-
diff --git a/x11/e17-module-eveil/Makefile b/x11/e17-module-eveil/Makefile
index 9b4cdf15164c..bfae868c09cc 100644
--- a/x11/e17-module-eveil/Makefile
+++ b/x11/e17-module-eveil/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eveil
PORTVERSION= 20060926
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://sunner.elcomnet.ru/~stas/
PKGNAMEPREFIX= e17-module-
diff --git a/x11/e17-module-flame/Makefile b/x11/e17-module-flame/Makefile
index d519978d532c..278fe318b88c 100644
--- a/x11/e17-module-flame/Makefile
+++ b/x11/e17-module-flame/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flame
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11/e17-module-flame/pkg-plist b/x11/e17-module-flame/pkg-plist
index 81497b3558fb..6651443c6b32 100644
--- a/x11/e17-module-flame/pkg-plist
+++ b/x11/e17-module-flame/pkg-plist
@@ -7,8 +7,6 @@ lib/enlightenment/modules/flame/module.edj
%%NLS%%share/locale/fi/LC_MESSAGES/flame.mo
%%NLS%%share/locale/it/LC_MESSAGES/flame.mo
%%NLS%%share/locale/ja/LC_MESSAGES/flame.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
@dirrm lib/enlightenment/modules/flame/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/flame
@dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-language/Makefile b/x11/e17-module-language/Makefile
index 8aa1a785a725..8107c559daaf 100644
--- a/x11/e17-module-language/Makefile
+++ b/x11/e17-module-language/Makefile
@@ -7,7 +7,7 @@
PORTNAME= language
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11/e17-module-mail/Makefile b/x11/e17-module-mail/Makefile
index 80231798718e..2e61a02d11ef 100644
--- a/x11/e17-module-mail/Makefile
+++ b/x11/e17-module-mail/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mail
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11/e17-module-mem/Makefile b/x11/e17-module-mem/Makefile
index e4429d12de3a..e2c7d3e74d4b 100644
--- a/x11/e17-module-mem/Makefile
+++ b/x11/e17-module-mem/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mem
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11/e17-module-mem/pkg-plist b/x11/e17-module-mem/pkg-plist
index aae66c519dca..e6d9793970a2 100644
--- a/x11/e17-module-mem/pkg-plist
+++ b/x11/e17-module-mem/pkg-plist
@@ -11,8 +11,6 @@ lib/enlightenment/modules/mem/module_icon.png
%%NLS%%share/locale/ja/LC_MESSAGES/mem.mo
%%NLS%%share/locale/ru/LC_MESSAGES/mem.mo
%%NLS%%share/locale/sv/LC_MESSAGES/mem.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
@dirrm lib/enlightenment/modules/mem/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/mem
@dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-mixer/Makefile b/x11/e17-module-mixer/Makefile
index 383d88e5b9ec..f18221d40a69 100644
--- a/x11/e17-module-mixer/Makefile
+++ b/x11/e17-module-mixer/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mixer
PORTVERSION= 20070223
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11/e17-module-moon/Makefile b/x11/e17-module-moon/Makefile
index afd824050568..01eee6b51d99 100644
--- a/x11/e17-module-moon/Makefile
+++ b/x11/e17-module-moon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= moon
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11/e17-module-rain/Makefile b/x11/e17-module-rain/Makefile
index 749f7c611194..155c65f629b1 100644
--- a/x11/e17-module-rain/Makefile
+++ b/x11/e17-module-rain/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rain
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11/e17-module-rain/pkg-plist b/x11/e17-module-rain/pkg-plist
index f9c08552a331..3b4f45a09cfc 100644
--- a/x11/e17-module-rain/pkg-plist
+++ b/x11/e17-module-rain/pkg-plist
@@ -13,8 +13,6 @@ lib/enlightenment/modules/rain/module.edj
%%NLS%%share/locale/it/LC_MESSAGES/rain.mo
%%NLS%%share/locale/ja/LC_MESSAGES/rain.mo
%%NLS%%share/locale/sv/LC_MESSAGES/rain.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
@dirrm lib/enlightenment/modules/rain/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/rain
@dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-screenshot/Makefile b/x11/e17-module-screenshot/Makefile
index e81eef644530..405edd0fda9f 100644
--- a/x11/e17-module-screenshot/Makefile
+++ b/x11/e17-module-screenshot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= screenshot
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11/e17-module-screenshot/pkg-plist b/x11/e17-module-screenshot/pkg-plist
index 190a2187bff1..bf1d4b69764d 100644
--- a/x11/e17-module-screenshot/pkg-plist
+++ b/x11/e17-module-screenshot/pkg-plist
@@ -12,8 +12,6 @@ lib/enlightenment/modules/screenshot/screenshot.edj
%%NLS%%share/locale/ja/LC_MESSAGES/screenshot.mo
%%NLS%%share/locale/ru/LC_MESSAGES/screenshot.mo
%%NLS%%share/locale/sv/LC_MESSAGES/screenshot.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
@dirrm lib/enlightenment/modules/screenshot/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/screenshot
@dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-slideshow/Makefile b/x11/e17-module-slideshow/Makefile
index 7689744ff0e3..ad25dcef43df 100644
--- a/x11/e17-module-slideshow/Makefile
+++ b/x11/e17-module-slideshow/Makefile
@@ -7,7 +7,7 @@
PORTNAME= slideshow
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11/e17-module-slideshow/pkg-plist b/x11/e17-module-slideshow/pkg-plist
index de126aa1c465..fb0ceadcb818 100644
--- a/x11/e17-module-slideshow/pkg-plist
+++ b/x11/e17-module-slideshow/pkg-plist
@@ -11,8 +11,6 @@ lib/enlightenment/modules/slideshow/slideshow.edj
%%NLS%%share/locale/it/LC_MESSAGES/slideshow.mo
%%NLS%%share/locale/ja/LC_MESSAGES/slideshow.mo
%%NLS%%share/locale/sv/LC_MESSAGES/slideshow.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
@dirrm lib/enlightenment/modules/slideshow/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/slideshow
@dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-snow/Makefile b/x11/e17-module-snow/Makefile
index 5ac1467b5ce1..b79c8a7dd8c2 100644
--- a/x11/e17-module-snow/Makefile
+++ b/x11/e17-module-snow/Makefile
@@ -7,7 +7,7 @@
PORTNAME= snow
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11/e17-module-snow/pkg-plist b/x11/e17-module-snow/pkg-plist
index c1752aa10628..31ad449eeda5 100644
--- a/x11/e17-module-snow/pkg-plist
+++ b/x11/e17-module-snow/pkg-plist
@@ -13,8 +13,6 @@ lib/enlightenment/modules/snow/tree.png
%%NLS%%share/locale/it/LC_MESSAGES/snow.mo
%%NLS%%share/locale/ja/LC_MESSAGES/snow.mo
%%NLS%%share/locale/sv/LC_MESSAGES/snow.mo
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
@dirrm lib/enlightenment/modules/snow/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/snow
@dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-uptime/Makefile b/x11/e17-module-uptime/Makefile
index 1cb0635f052f..41f7cb1d2e4e 100644
--- a/x11/e17-module-uptime/Makefile
+++ b/x11/e17-module-uptime/Makefile
@@ -7,7 +7,7 @@
PORTNAME= uptime
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11/e17-module-uptime/pkg-plist b/x11/e17-module-uptime/pkg-plist
index 2d2960917bac..37f9e851da0e 100644
--- a/x11/e17-module-uptime/pkg-plist
+++ b/x11/e17-module-uptime/pkg-plist
@@ -13,8 +13,6 @@ share/locale/ja/LC_MESSAGES/uptime.mo
share/locale/sv/LC_MESSAGES/uptime.mo
share/nls/POSIX
share/nls/en_US.US-ASCII
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
@dirrmtry lib/enlightenment/modules/uptime/%%E17_ARCH%%
@dirrmtry lib/enlightenment/modules/uptime
@dirrmtry lib/enlightenment/modules
diff --git a/x11/e17-module-weather/Makefile b/x11/e17-module-weather/Makefile
index 600f766a78b0..376696b84436 100644
--- a/x11/e17-module-weather/Makefile
+++ b/x11/e17-module-weather/Makefile
@@ -7,7 +7,7 @@
PORTNAME= weather
PORTVERSION= 20070223
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11/e17-module-winselector/Makefile b/x11/e17-module-winselector/Makefile
index 60053eb75610..485bf032a019 100644
--- a/x11/e17-module-winselector/Makefile
+++ b/x11/e17-module-winselector/Makefile
@@ -8,6 +8,7 @@
PORTNAME= winselector
PORTVERSION= 20070223
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
PKGNAMEPREFIX= e17-module-
diff --git a/x11/ebuttons/Makefile b/x11/ebuttons/Makefile
index 7e2258dc1089..ec7be06191eb 100644
--- a/x11/ebuttons/Makefile
+++ b/x11/ebuttons/Makefile
@@ -7,7 +7,7 @@
PORTNAME= E-buttons
PORTVERSION= 0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \
http://mirror2.unixfreunde.de/
diff --git a/x11/ecore/Makefile b/x11/ecore/Makefile
index 3f28e3ec9304..cbf530616cce 100644
--- a/x11/ecore/Makefile
+++ b/x11/ecore/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ecore
PORTVERSION= 20070223
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11/editres/Makefile b/x11/editres/Makefile
new file mode 100644
index 000000000000..e1306e904635
--- /dev/null
+++ b/x11/editres/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: editres
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= editres
+PORTVERSION= 1.0.3
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Dynamic resource editor for X Toolkit Applications
+
+XORG_CAT= app
+USE_XORG= x11 xt xmu xaw
+
+MAN1= editres.1
+
+.include <bsd.port.mk>
diff --git a/x11/editres/distinfo b/x11/editres/distinfo
new file mode 100644
index 000000000000..7c38b72c4e1e
--- /dev/null
+++ b/x11/editres/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/editres-1.0.3.tar.bz2) = a25f931cc6c8d03daaed434f5db5df2d
+SHA256 (xorg/app/editres-1.0.3.tar.bz2) = a2a56b32eaa92ad6f667853f023177ffad9128cfa0361afc2872323598aeceae
+SIZE (xorg/app/editres-1.0.3.tar.bz2) = 127231
diff --git a/x11/editres/pkg-descr b/x11/editres/pkg-descr
new file mode 100644
index 000000000000..484a780e362f
--- /dev/null
+++ b/x11/editres/pkg-descr
@@ -0,0 +1,5 @@
+This package contains editres, a dynamic resource editor for X Toolkit
+Applications.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/editres/pkg-plist b/x11/editres/pkg-plist
new file mode 100644
index 000000000000..485085d2767f
--- /dev/null
+++ b/x11/editres/pkg-plist
@@ -0,0 +1,4 @@
+bin/editres
+share/X11/app-defaults/Editres-color
+share/X11/app-defaults/Editres
+@dirrmtry share/X11/app-defaults
diff --git a/x11/electricsheep/Makefile b/x11/electricsheep/Makefile
index 19cb88b55ea8..18e960934893 100644
--- a/x11/electricsheep/Makefile
+++ b/x11/electricsheep/Makefile
@@ -7,7 +7,7 @@
PORTNAME= electricsheep
PORTVERSION= 2.6.8
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= http://electricsheep.org/
diff --git a/x11/elicit/Makefile b/x11/elicit/Makefile
index 924d92801a02..4b8ca6638738 100644
--- a/x11/elicit/Makefile
+++ b/x11/elicit/Makefile
@@ -8,6 +8,7 @@
PORTNAME= elicit
PORTVERSION= 20070223
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11/emu/Makefile b/x11/emu/Makefile
index 4e67cd6cd501..40801ef47941 100644
--- a/x11/emu/Makefile
+++ b/x11/emu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emu
PORTVERSION= 1.31
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
@@ -18,12 +18,9 @@ COMMENT= A terminal emulator for the X Window System
BUILD_DEPENDS= xrdb:${X_CLIENTS_PORT}
RUN_DEPENDS= xrdb:${X_CLIENTS_PORT}
-.if defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
- ${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
-.endif
-
USE_IMAKE= yes
+USE_DISPLAY= yes
+
WRKSRC= ${WRKDIR}/emu
.if (!defined(DISPLAY) || ${DISPLAY} == "") && !defined(PACKAGE_BUILDING)
diff --git a/x11/enity/Makefile b/x11/enity/Makefile
index a8019d1fd56a..644c7d07f164 100644
--- a/x11/enity/Makefile
+++ b/x11/enity/Makefile
@@ -8,7 +8,7 @@
PORTNAME= enity
PORTVERSION= 20070223
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11/enterminus/Makefile b/x11/enterminus/Makefile
index 1e1b76d34d3f..97829af1a7a8 100644
--- a/x11/enterminus/Makefile
+++ b/x11/enterminus/Makefile
@@ -8,6 +8,7 @@
PORTNAME= enterminus
PORTVERSION= 20070223
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11/erun/Makefile b/x11/erun/Makefile
index 3b335d6d53ca..149b11252fb0 100644
--- a/x11/erun/Makefile
+++ b/x11/erun/Makefile
@@ -7,7 +7,7 @@
PORTNAME= E-Run
PORTVERSION= 1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= kbyanc
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 0afa5dcc88c5..ef0c52d8db27 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eterm
PORTVERSION= 0.9.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES+= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11/etoile-iterm/Makefile b/x11/etoile-iterm/Makefile
index 9d080e55b268..0f7476fbb6b2 100644
--- a/x11/etoile-iterm/Makefile
+++ b/x11/etoile-iterm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= iterm
PORTVERSION= 0.1.${SNAPSHOT}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnustep
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= dinoex
diff --git a/x11/etoile-xwindowserverkit/Makefile b/x11/etoile-xwindowserverkit/Makefile
index 99d739b3554d..5303ab399bb8 100644
--- a/x11/etoile-xwindowserverkit/Makefile
+++ b/x11/etoile-xwindowserverkit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xwindowserverkit
PORTVERSION= 0.1.${SNAPSHOT}
+PORTREVISION= 1
CATEGORIES= x11 gnustep
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= dinoex
diff --git a/x11/etoile/Makefile b/x11/etoile/Makefile
index 28b43eeff8b6..e8331f7fc71d 100644
--- a/x11/etoile/Makefile
+++ b/x11/etoile/Makefile
@@ -7,7 +7,7 @@
PORTNAME= etoile
PORTVERSION= 0.1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 gnustep
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/x11/evieext/Makefile b/x11/evieext/Makefile
new file mode 100644
index 000000000000..ef8cde3d8614
--- /dev/null
+++ b/x11/evieext/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: evieext
+# Date Created: 25 Apr 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= evieext
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= XEVIE extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/evieext/distinfo b/x11/evieext/distinfo
new file mode 100644
index 000000000000..6e3bafd63156
--- /dev/null
+++ b/x11/evieext/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/evieext-1.0.2.tar.bz2) = 2507b5d0f4b2848147fbddd155aa6cfe
+SHA256 (xorg/proto/evieext-1.0.2.tar.bz2) = 0b85113a9770083715927f9c7a7d0ab354c8a508a91cb6e8e11130851494d125
+SIZE (xorg/proto/evieext-1.0.2.tar.bz2) = 37534
diff --git a/x11/evieext/pkg-descr b/x11/evieext/pkg-descr
new file mode 100644
index 000000000000..6ddfde63eccd
--- /dev/null
+++ b/x11/evieext/pkg-descr
@@ -0,0 +1,4 @@
+This package contains evieext, a collection of XEVIE extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/evieext/pkg-plist b/x11/evieext/pkg-plist
new file mode 100644
index 000000000000..b10aee8e8811
--- /dev/null
+++ b/x11/evieext/pkg-plist
@@ -0,0 +1,3 @@
+include/X11/extensions/Xeviestr.h
+libdata/pkgconfig/evieproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/examine/Makefile b/x11/examine/Makefile
index e19c84d04bf9..d3c195da1644 100644
--- a/x11/examine/Makefile
+++ b/x11/examine/Makefile
@@ -8,6 +8,7 @@
PORTNAME= examine
PORTVERSION= 20070223
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index d0cebbe31467..3eb4f29c792d 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fast-user-switch-applet
PORTVERSION= 2.18.0
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/fast-user-switch-applet/pkg-plist b/x11/fast-user-switch-applet/pkg-plist
index ab453477e9d0..eba6ee79cf16 100644
--- a/x11/fast-user-switch-applet/pkg-plist
+++ b/x11/fast-user-switch-applet/pkg-plist
@@ -119,46 +119,16 @@ share/locale/vi/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/zh_CN/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/zh_HK/LC_MESSAGES/fast-user-switch-applet.mo
share/locale/zh_TW/LC_MESSAGES/fast-user-switch-applet.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrm share/gnome/omf/fast-user-switch-applet
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 7e6ac5faa0f2..5f56498058a4 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fbdesk
PORTVERSION= 1.4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://fluxbox.sourceforge.net/download/ \
${MASTER_SITE_GENTOO} \
diff --git a/x11/fbpanel/Makefile b/x11/fbpanel/Makefile
index f4d70fabc461..15e2ff0057a9 100644
--- a/x11/fbpanel/Makefile
+++ b/x11/fbpanel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fbpanel
PORTVERSION= 4.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11/fbsd-icons/Makefile b/x11/fbsd-icons/Makefile
index 8a07053f322d..aba9aeb95d85 100644
--- a/x11/fbsd-icons/Makefile
+++ b/x11/fbsd-icons/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fbsd-icons
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= trevor
diff --git a/x11/fireflies/Makefile b/x11/fireflies/Makefile
index ffae78f2a1a8..dfb0c56b559d 100644
--- a/x11/fireflies/Makefile
+++ b/x11/fireflies/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fireflies
PORTVERSION= 2.07
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://somewhere.fscked.org/fireflies/
diff --git a/x11/fixesext/Makefile b/x11/fixesext/Makefile
index bed51efc8ba6..29074347c343 100644
--- a/x11/fixesext/Makefile
+++ b/x11/fixesext/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fixesext
PORTVERSION= 2.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
diff --git a/x11/fixesproto/Makefile b/x11/fixesproto/Makefile
new file mode 100644
index 000000000000..3ea2a4e24ebf
--- /dev/null
+++ b/x11/fixesproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: fixesproto
+# Date Created: 08 Aug 2005
+# Whom: Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= fixesproto
+PORTVERSION= 4.0
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Fixes extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/fixesproto/distinfo b/x11/fixesproto/distinfo
new file mode 100644
index 000000000000..9bca631147e5
--- /dev/null
+++ b/x11/fixesproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/fixesproto-4.0.tar.bz2) = 8b298cc3424597f8138c7faf7763dce9
+SHA256 (xorg/proto/fixesproto-4.0.tar.bz2) = b3fe971ccc8152db6c78da7117c31fc4cd2fcb2b6a4df3db0f8fed13d4ceb08f
+SIZE (xorg/proto/fixesproto-4.0.tar.bz2) = 38550
diff --git a/x11/fixesproto/pkg-descr b/x11/fixesproto/pkg-descr
new file mode 100644
index 000000000000..5e2d9367eadd
--- /dev/null
+++ b/x11/fixesproto/pkg-descr
@@ -0,0 +1,5 @@
+This package contains X.Org Fixes extension protocol specification
+and header files.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/fixesproto/pkg-plist b/x11/fixesproto/pkg-plist
new file mode 100644
index 000000000000..f1bec6c8e826
--- /dev/null
+++ b/x11/fixesproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/xfixesproto.h
+include/X11/extensions/xfixeswire.h
+libdata/pkgconfig/fixesproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/fluxbg/Makefile b/x11/fluxbg/Makefile
index fd33cd2aed6a..ad5f380ed89a 100644
--- a/x11/fluxbg/Makefile
+++ b/x11/fluxbg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fluxbg
PORTVERSION= 0.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11/fpc-x11/Makefile b/x11/fpc-x11/Makefile
index 240e3705c17a..d43e06dd61c8 100644
--- a/x11/fpc-x11/Makefile
+++ b/x11/fpc-x11/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
#
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 lang
PKGNAMESUFFIX= -x11
diff --git a/x11/fstobdf/Makefile b/x11/fstobdf/Makefile
new file mode 100644
index 000000000000..868ad2b5c237
--- /dev/null
+++ b/x11/fstobdf/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: fstobdf
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= fstobdf
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Generate BDF font from X font server
+
+XORG_CAT= app
+USE_XORG= x11 libfs
+
+PLIST_FILES= bin/fstobdf
+
+MAN1= fstobdf.1
+
+.include <bsd.port.mk>
diff --git a/x11/fstobdf/distinfo b/x11/fstobdf/distinfo
new file mode 100644
index 000000000000..56ea2a179e6d
--- /dev/null
+++ b/x11/fstobdf/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/fstobdf-1.0.2.tar.bz2) = 99144743ab3cbb9cf37090fdc9e747db
+SHA256 (xorg/app/fstobdf-1.0.2.tar.bz2) = 690e45b252cd96036dd9b89af8624eb423e16d4bd662b07d264a3f876ce7ac22
+SIZE (xorg/app/fstobdf-1.0.2.tar.bz2) = 82861
diff --git a/x11/fstobdf/pkg-descr b/x11/fstobdf/pkg-descr
new file mode 100644
index 000000000000..5c95299bfed0
--- /dev/null
+++ b/x11/fstobdf/pkg-descr
@@ -0,0 +1,5 @@
+This package contains fstobdf, a program for generating BDF fonts from
+an X font server.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/gcb/Makefile b/x11/gcb/Makefile
index 1cf8e16e9bb2..0d756182581b 100644
--- a/x11/gcb/Makefile
+++ b/x11/gcb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gcb
PORTVERSION= 0.2.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://freebsd.flatrate.ru/distfiles/ \
http://ccbsd9.csie.nctu.edu.tw/~cp76/gcb/
diff --git a/x11/gcb/pkg-plist b/x11/gcb/pkg-plist
index c3bb4941d0b1..ac3ea91ade93 100644
--- a/x11/gcb/pkg-plist
+++ b/x11/gcb/pkg-plist
@@ -2,6 +2,5 @@ bin/gcb
share/applications/gcb.desktop
share/icons/gcb.png
share/pixmaps/gcb.png
-@dirrmtry share/pixmaps
@dirrmtry share/icons
@dirrmtry share/applications
diff --git a/x11/gcursor/Makefile b/x11/gcursor/Makefile
index b535b53a2884..e81e6775e462 100644
--- a/x11/gcursor/Makefile
+++ b/x11/gcursor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gcursor
PORTVERSION= 0.061
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 gnome
MASTER_SITES= http://download.qballcow.nl/programs/gcursor/
diff --git a/x11/gdesklets-tasklist/Makefile b/x11/gdesklets-tasklist/Makefile
index 2d1625a29709..ed3412021bdb 100644
--- a/x11/gdesklets-tasklist/Makefile
+++ b/x11/gdesklets-tasklist/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tasklist
PORTVERSION= 0.10
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 gnome
MASTER_SITES= http://gdesklets.zencomputer.ca/
PKGNAMEPREFIX= gdesklets-
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index aedf75af2e2c..e7c412168f94 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gdkxft
PORTVERSION= 1.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 2d36c7197025..990697915578 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gdm
PORTVERSION= 2.18.1
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 4bcfd78dceac..a8aa3704f874 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -270,36 +270,14 @@ share/locale/zu/LC_MESSAGES/gdm.mo
@unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mi/LC_MESSAGES
@@ -308,25 +286,11 @@ share/locale/zu/LC_MESSAGES/gdm.mo
@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/x11/ggiterm/Makefile b/x11/ggiterm/Makefile
index 8d92d53cf58d..b60d87f3fe82 100644
--- a/x11/ggiterm/Makefile
+++ b/x11/ggiterm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ggiterm
PORTVERSION= 0.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ggiterm
diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile
new file mode 100644
index 000000000000..14edaf1fda84
--- /dev/null
+++ b/x11/glproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: glproto
+# Date Created: 06 Feb 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= glproto
+PORTVERSION= 1.4.8
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= GLX extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/glproto/distinfo b/x11/glproto/distinfo
new file mode 100644
index 000000000000..e35b268fe67f
--- /dev/null
+++ b/x11/glproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/glproto-1.4.8.tar.bz2) = 3dfbd17203c0c88b94b6f579f24c11cc
+SHA256 (xorg/proto/glproto-1.4.8.tar.bz2) = 2f5d84413853b688b7bb46c66fee108a499190e1f7810afffb775910778f053c
+SIZE (xorg/proto/glproto-1.4.8.tar.bz2) = 53852
diff --git a/x11/glproto/pkg-descr b/x11/glproto/pkg-descr
new file mode 100644
index 000000000000..489e9639f47e
--- /dev/null
+++ b/x11/glproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org GLX extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/glproto/pkg-plist b/x11/glproto/pkg-plist
new file mode 100644
index 000000000000..da73d63a3e9e
--- /dev/null
+++ b/x11/glproto/pkg-plist
@@ -0,0 +1,9 @@
+include/GL/glxint.h
+include/GL/glxmd.h
+include/GL/glxproto.h
+include/GL/glxtokens.h
+include/GL/internal/glcore.h
+libdata/pkgconfig/glproto.pc
+@dirrmtry include/GL/internal
+@dirrmtry include/GL
+@dirrmtry include/X11/extensions
diff --git a/x11/gmessage/Makefile b/x11/gmessage/Makefile
index f5633b219c49..f77b76399910 100644
--- a/x11/gmessage/Makefile
+++ b/x11/gmessage/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmessage
PORTVERSION= 0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://www.brettnacher.org/users/dominik/FreeBSD/
diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile
index fab20169776f..09165d296fab 100644
--- a/x11/gmrun/Makefile
+++ b/x11/gmrun/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gmrun
PORTVERSION= 0.9.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 775bbe206a48..bb4a0bba0163 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-applets
PORTVERSION= 2.18.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 27a5b8657f87..02cd5e783662 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -1383,36 +1383,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
%%COMMANDER%%@dirrm libexec/gnome-applets
%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/invest
@dirrm include/libgweather
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@@ -1421,14 +1399,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
@dirrmtry share/locale/es_VE/LC_MESSAGES
@dirrmtry share/locale/es_VE
@dirrmtry share/locale/es_UY/LC_MESSAGES
@@ -1459,15 +1431,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrmtry share/locale/es_CL
@dirrmtry share/locale/es_AR/LC_MESSAGES
@dirrmtry share/locale/es_AR
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/x11/gnome-clipboard-daemon/Makefile b/x11/gnome-clipboard-daemon/Makefile
index b1a68d698ebf..d23a71c23713 100644
--- a/x11/gnome-clipboard-daemon/Makefile
+++ b/x11/gnome-clipboard-daemon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-clipboard-daemon
PORTVERSION= 1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 gnome
MASTER_SITES= http://members.chello.nl/~h.lai/gnome-clipboard-daemon/
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 1624e6fdb207..16db7aa7f8be 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-desktop
PORTVERSION= 2.18.1
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index c907b2cdf9a5..1ca51a48adf3 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -233,12 +233,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/yo/LC_MESSAGES
@dirrmtry share/locale/yo
@dirrmtry share/locale/yi/LC_MESSAGES
@@ -247,68 +243,32 @@ share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
@dirrmtry share/locale/xh
@dirrmtry share/locale/ur/LC_MESSAGES
@dirrmtry share/locale/ur
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
-@dirrmtry share/locale/tk/LC_MESSAGES
-@dirrmtry share/locale/tk
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mi/LC_MESSAGES
@dirrmtry share/locale/mi
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
-@dirrmtry share/locale/li/LC_MESSAGES
-@dirrmtry share/locale/li
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
@dirrm share/gnome/omf/lgpl
@dirrm share/gnome/omf/gpl
@dirrm share/gnome/omf/fdl
diff --git a/x11/gnome-launch-box/Makefile b/x11/gnome-launch-box/Makefile
index 33799cb89b8d..9466123c42dd 100644
--- a/x11/gnome-launch-box/Makefile
+++ b/x11/gnome-launch-box/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-launch-box
PORTVERSION= 20060112
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jylefort
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index a315b25e438e..f67e9b38520e 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-libs
PORTVERSION= 1.4.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES?= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-libs/1.4
diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist
index f9c1f0cd0613..bf413271bf18 100644
--- a/x11/gnome-libs/pkg-plist
+++ b/x11/gnome-libs/pkg-plist
@@ -562,39 +562,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
@dirrm include/gnome-1.0/libgnome
@dirrm include/gnome-1.0/libart_lgpl
@dirrm include/gnome-1.0/gtk-xmhtml
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
@dirrmtry share/locale/sp/LC_MESSAGES
@dirrmtry share/locale/sp
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index bde46e8025cc..fc500290adaa 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome-menus
PORTVERSION= 2.18.0
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
index 59cea97cb008..c5f6edf41e3c 100644
--- a/x11/gnome-menus/pkg-plist
+++ b/x11/gnome-menus/pkg-plist
@@ -112,38 +112,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrm include/gnome-menus
@dirrmtry etc/xdg/menus
@dirrmtry etc/xdg
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@@ -152,27 +130,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
@dirrmtry share/locale/gn/LC_MESSAGES
@dirrmtry share/locale/gn
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 0b38b6cca56f..f2354cb8abcb 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-panel
PORTVERSION= 2.18.1
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index bde2dc76b40d..a6b299c8b894 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -546,73 +546,35 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm include/panel-2.0
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/yi/LC_MESSAGES
@dirrmtry share/locale/yi
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@ije/LC_MESSAGES
@dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mi/LC_MESSAGES
@dirrmtry share/locale/mi
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
-@dirrmtry share/locale/li/LC_MESSAGES
-@dirrmtry share/locale/li
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index cadd0e989c8c..d1b76b1b0d48 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome-screensaver
PORTVERSION= 2.18.1
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-screensaver/pkg-plist b/x11/gnome-screensaver/pkg-plist
index a60b97fdcef7..d889c87f5524 100644
--- a/x11/gnome-screensaver/pkg-plist
+++ b/x11/gnome-screensaver/pkg-plist
@@ -89,43 +89,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-screensaver.mo
@dirrm share/gnome/pixmaps/backgrounds
@dirrm share/gnome/gnome-screensaver
@dirrm libexec/gnome-screensaver
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 0d18d2cfbfbd..981c0b161299 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome-session
PORTVERSION= 2.18.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://www.marcuscom.com/downloads/:local
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 470ddc9c9d62..fd8033cb0deb 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -114,38 +114,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/tk/LC_MESSAGES
-@dirrmtry share/locale/tk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mi/LC_MESSAGES
@@ -154,23 +130,9 @@ share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/x11/gnome-swallow/Makefile b/x11/gnome-swallow/Makefile
index bc25aa21306b..1e0197417784 100644
--- a/x11/gnome-swallow/Makefile
+++ b/x11/gnome-swallow/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-swallow
PORTVERSION= 1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= http://interreality.org/~tetron/technology/swallow/
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index d2ffb54683ca..af1e59f928b8 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome-terminal
PORTVERSION= 2.18.0
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 30f3fb1b1463..52ee380fe050 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -173,57 +173,21 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
@dirrm share/gnome/help/gnome-terminal
@dirrm share/gnome/gnome-terminal/glade
@dirrm share/gnome/gnome-terminal
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
index ecf2baf57b09..bea450fc2199 100644
--- a/x11/gnome2-fifth-toe/Makefile
+++ b/x11/gnome2-fifth-toe/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.83 2007/04/03 01:14:24 ahze Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11 gnome
PKGNAMESUFFIX= -fifth-toe
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index c30e821ce096..ec2c74773e1f 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/x11/gnome2-lite/Makefile,v 1.54 2007/03/02 15:38:59 ahze Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11 gnome
PKGNAMESUFFIX= -lite
diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile
index 3572e8356e81..1fc6f8a05bd9 100644
--- a/x11/gnome2-power-tools/Makefile
+++ b/x11/gnome2-power-tools/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.76 2007/03/14 21:39:31 marcus Exp $
#
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11 gnome
PKGNAMESUFFIX= -power-tools
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index b046bdd2d73b..639b909e0c15 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gnome2
PORTVERSION= 2.18.1
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= x11 gnome
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/x11/gnustep-app/Makefile b/x11/gnustep-app/Makefile
index a72ff3309a59..61f4d63f8dc6 100644
--- a/x11/gnustep-app/Makefile
+++ b/x11/gnustep-app/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnustep-app
PORTVERSION= 1.13.0
-PORTREVISION= 21
+PORTREVISION= 22
CATEGORIES= x11 gnustep
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/x11/gpctool/Makefile b/x11/gpctool/Makefile
index d714c4ceeed6..b1c01a737229 100644
--- a/x11/gpctool/Makefile
+++ b/x11/gpctool/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gpctool
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11 math graphics
MASTER_SITES= ftp://ftp.cs.man.ac.uk/pub/toby/gpc/
DISTNAME= gpct${PORTVERSION:S/.//g}
diff --git a/x11/grabc/Makefile b/x11/grabc/Makefile
index a463f80b416a..131619d5753e 100644
--- a/x11/grabc/Makefile
+++ b/x11/grabc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= grabc
PORTVERSION= 1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://muquit.com/muquit/software/grabc/
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
index c32999578676..5ca94b995913 100644
--- a/x11/gromit/Makefile
+++ b/x11/gromit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gromit
PORTVERSION= 20041213
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://www.home.unix-ag.org/simon/gromit/
diff --git a/x11/gskrab/Makefile b/x11/gskrab/Makefile
index f11861800334..d2f57554faac 100644
--- a/x11/gskrab/Makefile
+++ b/x11/gskrab/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gskrab
PORTVERSION= 0.0.1
+PORTREVISION= 1
CATEGORIES= x11 gnustep
MASTER_SITES= http://organact.mine.nu/~wolfgang/gskrab/
DISTNAME= GSKrab-${PORTVERSION}
diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile
index e62d02178704..ef788af1e779 100644
--- a/x11/gsynaptics/Makefile
+++ b/x11/gsynaptics/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gsynaptics
PORTVERSION= 0.9.9
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= gsynaptics/21527
@@ -16,7 +16,6 @@ MAINTAINER= nork@FreeBSD.org
COMMENT= GNOME Synaptics Touchpad setting tool
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
-RUN_DEPENDS= ${X11BASE}/lib/modules/input/synaptics_drv.o:${PORTSDIR}/x11-servers/synaptics
USE_GNOME= lthack intlhack intltool pkgconfig gtk20 libgnome libglade2 libgnomeui
USE_ICONV= yes
@@ -33,4 +32,13 @@ MAN1= gsynaptics.1 gsynaptics-init.1
post-install:
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${X_WINDOW_SYSTEM} == "xorg"
+RUN_DEPENDS+= ${X11BASE}/lib/xorg/modules/input/synaptics_drv.so:${PORTSDIR}/x11-servers/synaptics
+.else
+RUN_DEPENDS+= ${X11BASE}/lib/modules/input/synaptics_drv.o:${PORTSDIR}/x11-servers/synaptics
+.endif
+
+
+.include <bsd.port.post.mk>
diff --git a/x11/gsynaptics/pkg-plist b/x11/gsynaptics/pkg-plist
index 9a546777e9d0..055dee05dfe9 100644
--- a/x11/gsynaptics/pkg-plist
+++ b/x11/gsynaptics/pkg-plist
@@ -11,9 +11,4 @@ share/locale/zh_TW/LC_MESSAGES/gsynaptics.mo
share/pixmaps/touchpad.png
@dirrmtry share/gnome/autostart
@dirrmtry share/applications
-@dirrmtry share/pixmaps
@dirrm share/gsynaptics
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
diff --git a/x11/gtk-launch/Makefile b/x11/gtk-launch/Makefile
index 20a86506c0fd..d0e384e9ca0e 100644
--- a/x11/gtk-launch/Makefile
+++ b/x11/gtk-launch/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-launch
DISTVERSION= 1.1b
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://pierric.descamps.free.fr/pierric/downloads/ \
http://critical.ch/distfiles/ \
diff --git a/x11/gtk-theme-switch/Makefile b/x11/gtk-theme-switch/Makefile
index 9b99d19dc7d3..8a38635d2868 100644
--- a/x11/gtk-theme-switch/Makefile
+++ b/x11/gtk-theme-switch/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-theme-switch
PORTVERSION= 1.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://www.muhri.net/
diff --git a/x11/gtk-theme-switch2/Makefile b/x11/gtk-theme-switch2/Makefile
index 9b99d19dc7d3..8a38635d2868 100644
--- a/x11/gtk-theme-switch2/Makefile
+++ b/x11/gtk-theme-switch2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-theme-switch
PORTVERSION= 1.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://www.muhri.net/
diff --git a/x11/gtk-themepreview/Makefile b/x11/gtk-themepreview/Makefile
index 2378bd132f9c..cf33fd9aad22 100644
--- a/x11/gtk-themepreview/Makefile
+++ b/x11/gtk-themepreview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-themepreview
PORTVERSION= 2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_LOCAL} # http://www.users.monornet.hu/linux/files/
MASTER_SITE_SUBDIR= danfe
diff --git a/x11/gtkchtheme/Makefile b/x11/gtkchtheme/Makefile
index 6c42b5cb493f..3201461099e6 100644
--- a/x11/gtkchtheme/Makefile
+++ b/x11/gtkchtheme/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkchtheme
PORTVERSION= 0.3.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://plasmasturm.org/code/gtk-chtheme/
DISTNAME= gtk-chtheme-${PORTVERSION}
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index d27e69729d74..c62f89dee232 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkterm2
PORTVERSION= 0.2.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= gtkterm
diff --git a/x11/gtstarter/Makefile b/x11/gtstarter/Makefile
index 5c518b978dc4..2f9d41d63b5f 100644
--- a/x11/gtstarter/Makefile
+++ b/x11/gtstarter/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtstarter
PORTVERSION= 0.4.6.2
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= http://webonaut.com/distfiles/${PORTNAME}/
diff --git a/x11/gxset/Makefile b/x11/gxset/Makefile
index e515c44f8872..b5c7db7833d6 100644
--- a/x11/gxset/Makefile
+++ b/x11/gxset/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gxset
PORTVERSION= 0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= petef
diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile
new file mode 100644
index 000000000000..105d797ee050
--- /dev/null
+++ b/x11/iceauth/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: iceauth
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= iceauth
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= ICE authority file utility for X
+
+XORG_CAT= app
+USE_XORG= xproto ice
+
+PLIST_FILES= bin/iceauth
+
+MAN1= iceauth.1
+
+.include <bsd.port.mk>
diff --git a/x11/iceauth/distinfo b/x11/iceauth/distinfo
new file mode 100644
index 000000000000..126b13043954
--- /dev/null
+++ b/x11/iceauth/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/iceauth-1.0.1.tar.bz2) = 50df9a5718b3cb6544a1c9f38b392b09
+SHA256 (xorg/app/iceauth-1.0.1.tar.bz2) = 23e2c701493c26470506f2aaffac9ddc9ac79fb8bbcbefb21dbeb67bb72185d6
+SIZE (xorg/app/iceauth-1.0.1.tar.bz2) = 84339
diff --git a/x11/iceauth/pkg-descr b/x11/iceauth/pkg-descr
new file mode 100644
index 000000000000..e412c393288f
--- /dev/null
+++ b/x11/iceauth/pkg-descr
@@ -0,0 +1,5 @@
+This package contains iceauth, an ICE authority file utility for the X
+Window System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/ico/Makefile b/x11/ico/Makefile
new file mode 100644
index 000000000000..bfa14ba7087b
--- /dev/null
+++ b/x11/ico/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: ico
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= ico
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Displays a wire-frame rotating plyhedron
+
+XORG_CAT= app
+USE_XORG= x11
+
+PLIST_FILES= bin/ico
+
+MAN1= ico.1
+
+.include <bsd.port.mk>
diff --git a/x11/ico/distinfo b/x11/ico/distinfo
new file mode 100644
index 000000000000..5b12495fe46b
--- /dev/null
+++ b/x11/ico/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/ico-1.0.1.tar.bz2) = 8c04178b7f78014567b6b8b2b7d7a10f
+SHA256 (xorg/app/ico-1.0.1.tar.bz2) = 13bd6c3f40a4f27ccfd34a101a179fb15c783be20f7ba8001b1ead1161b399f8
+SIZE (xorg/app/ico-1.0.1.tar.bz2) = 85723
diff --git a/x11/ico/pkg-descr b/x11/ico/pkg-descr
new file mode 100644
index 000000000000..cdef9f01c8d6
--- /dev/null
+++ b/x11/ico/pkg-descr
@@ -0,0 +1,5 @@
+This package contains ico, an appliction used for displaying wire-framed
+rotating polyhedrons.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index d5ac58488c93..d2a7beb92876 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= idesk
PORTVERSION= 0.7.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}/
diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile
index 4f474fccdb3e..34797b63bbf3 100644
--- a/x11/imwheel/Makefile
+++ b/x11/imwheel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= imwheel
PORTVERSION= 1.0.0.p12
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://jcatki.no-ip.org/pub/imwheel/ \
${MASTER_SITE_SOURCEFORGE}
diff --git a/x11/innerspace/Makefile b/x11/innerspace/Makefile
index c28b629ad6eb..038557ec2bea 100644
--- a/x11/innerspace/Makefile
+++ b/x11/innerspace/Makefile
@@ -7,6 +7,7 @@
PORTNAME= innerspace
PORTVERSION= 0.2.0
+PORTREVISION= 1
CATEGORIES= x11 gnustep
MASTER_SITES= http://download.savannah.nongnu.org/releases/gap/
diff --git a/x11/inputproto/Makefile b/x11/inputproto/Makefile
new file mode 100644
index 000000000000..e6e406237ebb
--- /dev/null
+++ b/x11/inputproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: inputproto
+# Date Created: 08 Aug 2005
+# Whom: Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= inputproto
+PORTVERSION= 1.3.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Input extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/inputproto/distinfo b/x11/inputproto/distinfo
new file mode 100644
index 000000000000..8e57a7d57c11
--- /dev/null
+++ b/x11/inputproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/inputproto-1.3.2.tar.bz2) = e0b7df0fc69f0712aa7f2161faa94e1d
+SHA256 (xorg/proto/inputproto-1.3.2.tar.bz2) = af6323d63fb5715bc9928d787f09795d875271f40636e031919372f185a51298
+SIZE (xorg/proto/inputproto-1.3.2.tar.bz2) = 46502
diff --git a/x11/inputproto/pkg-descr b/x11/inputproto/pkg-descr
new file mode 100644
index 000000000000..56ac85360439
--- /dev/null
+++ b/x11/inputproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org Input extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/inputproto/pkg-plist b/x11/inputproto/pkg-plist
new file mode 100644
index 000000000000..7f234dc66b02
--- /dev/null
+++ b/x11/inputproto/pkg-plist
@@ -0,0 +1,5 @@
+include/X11/extensions/XI.h
+include/X11/extensions/XInput.h
+include/X11/extensions/XIproto.h
+libdata/pkgconfig/inputproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/ipager/Makefile b/x11/ipager/Makefile
index 522ad0a77887..a129829d9561 100644
--- a/x11/ipager/Makefile
+++ b/x11/ipager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ipager
PORTVERSION= 1.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://useperl.ru/ipager/src/
DISTNAME= ipager-${PORTVERSION}
diff --git a/x11/kb2mb2/Makefile b/x11/kb2mb2/Makefile
index ac9cf95b5121..e071004f115d 100644
--- a/x11/kb2mb2/Makefile
+++ b/x11/kb2mb2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kb2mb2
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_PORTS_JP}
diff --git a/x11/kbproto/Makefile b/x11/kbproto/Makefile
new file mode 100644
index 000000000000..ba1da4fb0d31
--- /dev/null
+++ b/x11/kbproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: kbproto
+# Date Created: 08 Aug 2005
+# Whom: Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= kbproto
+PORTVERSION= 1.0.3
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= KB extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/kbproto/distinfo b/x11/kbproto/distinfo
new file mode 100644
index 000000000000..8d4d2db92fc7
--- /dev/null
+++ b/x11/kbproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/kbproto-1.0.3.tar.bz2) = 6092cdb0a1225f95356ddbe6c2abaad5
+SHA256 (xorg/proto/kbproto-1.0.3.tar.bz2) = 7000005ebbd07a28a71477d72bcb76c47064e043a4ead26fcf4d5af394ce19df
+SIZE (xorg/proto/kbproto-1.0.3.tar.bz2) = 57440
diff --git a/x11/kbproto/pkg-descr b/x11/kbproto/pkg-descr
new file mode 100644
index 000000000000..fe7caeb39b70
--- /dev/null
+++ b/x11/kbproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org KB extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/kbproto/pkg-plist b/x11/kbproto/pkg-plist
new file mode 100644
index 000000000000..ee0808e94469
--- /dev/null
+++ b/x11/kbproto/pkg-plist
@@ -0,0 +1,7 @@
+include/X11/extensions/XKB.h
+include/X11/extensions/XKBgeom.h
+include/X11/extensions/XKBproto.h
+include/X11/extensions/XKBsrv.h
+include/X11/extensions/XKBstr.h
+libdata/pkgconfig/kbproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index 31f547d1ba0b..1a414af493ea 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -8,6 +8,7 @@
PORTNAME?= kde
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # none
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 7019894baa04..245e12912f34 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 7019894baa04..245e12912f34 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 7019894baa04..245e12912f34 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index 31f547d1ba0b..1a414af493ea 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -8,6 +8,7 @@
PORTNAME?= kde
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # none
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 7019894baa04..245e12912f34 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 7019894baa04..245e12912f34 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 7019894baa04..245e12912f34 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 7019894baa04..245e12912f34 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdebase
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index ae053ee1e061..927d80a791f7 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index ae053ee1e061..927d80a791f7 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile
index 397308e79a4f..6a29f27dfdf5 100644
--- a/x11/keylaunch/Makefile
+++ b/x11/keylaunch/Makefile
@@ -7,7 +7,7 @@
PORTNAME= keylaunch
PORTVERSION= 1.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://www.mired.org/downloads/
diff --git a/x11/kxgenerator/Makefile b/x11/kxgenerator/Makefile
index bdae80d6aaaa..97ed7b15e1f0 100644
--- a/x11/kxgenerator/Makefile
+++ b/x11/kxgenerator/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kxgenerator
PORTVERSION= 0.3.7
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= http://dp0154.debowypark.waw.pl/kxgenerator/data/download/
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index cd85ba58dd6a..a27bb99da059 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -6,26 +6,14 @@
#
PORTNAME= libICE
-PORTVERSION= 6.3.3
+PORTVERSION= 1.0.3
+PORTEPOCH= 1
CATEGORIES= x11
-MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
MAINTAINER= x11@FreeBSD.org
COMMENT= Inter Client Exchange library for X11
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
- ${X11BASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/libXtrans
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
- ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
-
-CONFLICTS= XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2= yes
-PREFIX?= ${X11BASE}
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-INSTALLS_SHLIB= yes
-USE_GNOME= gnomehack pkgconfig
+XORG_CAT= lib
+USE_XORG= xproto xtrans
.include <bsd.port.mk>
diff --git a/x11/libICE/distinfo b/x11/libICE/distinfo
index f4bb6fb29df0..b513b8104f38 100644
--- a/x11/libICE/distinfo
+++ b/x11/libICE/distinfo
@@ -1,3 +1,3 @@
-MD5 (libICE-6.3.3.tar.bz2) = e67d98bebfabf884e58501e44b7efd35
-SHA256 (libICE-6.3.3.tar.bz2) = db79f1e14c6815da48b8fa6d556bed0f7aac3692ce4eb5ab8e541377eea6b27a
-SIZE (libICE-6.3.3.tar.bz2) = 222005
+MD5 (xorg/lib/libICE-1.0.3.tar.bz2) = 071f96648ac25c8e87a3de11a7de2d8a
+SHA256 (xorg/lib/libICE-1.0.3.tar.bz2) = ffd46270dae30cad147d73559142a701a8ff8d0658f4abfb2341edefabb8161d
+SIZE (xorg/lib/libICE-1.0.3.tar.bz2) = 246976
diff --git a/x11/libICE/pkg-plist b/x11/libICE/pkg-plist
index 6ca157c05f4e..465b985306fb 100644
--- a/x11/libICE/pkg-plist
+++ b/x11/libICE/pkg-plist
@@ -3,7 +3,6 @@ include/X11/ICE/ICEconn.h
include/X11/ICE/ICElib.h
include/X11/ICE/ICEmsg.h
include/X11/ICE/ICEproto.h
-include/X11/ICE/ICEtrans.h
include/X11/ICE/ICEutil.h
lib/libICE.a
lib/libICE.la
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 6726adf36579..c0339eda1343 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -6,26 +6,14 @@
#
PORTNAME= libSM
-PORTVERSION= 6.0.3
+PORTVERSION= 1.0.2
+PORTEPOCH= 1
CATEGORIES= x11
-MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
MAINTAINER= x11@FreeBSD.org
COMMENT= Session Management library for X11
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
- ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
-
-CONFLICTS= XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2= yes
-PREFIX?= ${X11BASE}
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE= yes
-INSTALLS_SHLIB= yes
-USE_GNOME= gnomehack pkgconfig
+XORG_CAT= lib
+USE_XORG= ice xproto:both xtrans
.include <bsd.port.mk>
diff --git a/x11/libSM/distinfo b/x11/libSM/distinfo
index 27cb08840e79..62891b66c8a4 100644
--- a/x11/libSM/distinfo
+++ b/x11/libSM/distinfo
@@ -1,3 +1,3 @@
-MD5 (libSM-6.0.3.tar.bz2) = e01ec6568ad17c5df8f56828e34a0b2b
-SHA256 (libSM-6.0.3.tar.bz2) = c1d90d075970e5d22a099ef73b31ecce8d070f7ee850f65b8d49a8924ef105d3
-SIZE (libSM-6.0.3.tar.bz2) = 200225
+MD5 (xorg/lib/libSM-1.0.2.tar.bz2) = a254771550c01db372e88d1a1dc2e13a
+SHA256 (xorg/lib/libSM-1.0.2.tar.bz2) = e290614797bd626c1b92bac8f83e8954b99bd66e6ecdaa1e935e176df099eba8
+SIZE (xorg/lib/libSM-1.0.2.tar.bz2) = 244146
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 5b29ff81d12f..cba2f780bb21 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -6,31 +6,29 @@
#
PORTNAME= libX11
-PORTVERSION= 6.2.1
-PORTREVISION= 3
+PORTVERSION= 1.1.1
+PORTREVISION= 1
+PORTEPOCH= 1
CATEGORIES= x11
-MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
MAINTAINER= x11@FreeBSD.org
COMMENT= X11 library
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau \
- ${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions \
- ${X11BASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/libXtrans \
- ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
+.if defined(WITH_XCB)
+BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xcb-xlib.pc:${PORTSDIR}/x11/libxcb
+RUN_DEPENDS= ${BUILD_DEPENDS}
+CONFIGURE_ARGS= --with-xcb=yes
+PLIST_SUB+= XCB=""
+.else
+CONFIGURE_ARGS= --with-xcb=no
+PLIST_SUB+= XCB="@comment "
+.endif
-CONFLICTS= XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2= yes
-PREFIX?= ${X11BASE}
+XORG_CAT= lib
+USE_XORG= bigreqsproto xau xdmcp xextproto xtrans xcmiscproto kbproto:both \
+ inputproto:both xf86bigfontproto xproto:both
USE_AUTOTOOLS= libtool:15
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE= yes
-CONFIGURE_ARGS+= --enable-xdmauth
-CFLAGS+= -DMALLOC_0_RETURNS_NULL
-USE_LDCONFIG= yes
-USE_GNOME= gnomehack pkgconfig
+CONFIGURE_ARGS+= --enable-xdmauth
+.include "${.CURDIR}/manpages"
.include <bsd.port.mk>
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index dcb2669f24ef..6b9af7b0f53e 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,3 +1,3 @@
-MD5 (libX11-6.2.1.tar.bz2) = 59b6fa7cd6fe7ee1da92fd1b56d1cee3
-SHA256 (libX11-6.2.1.tar.bz2) = 32f7cb9dd3e72c557c37be337828ddeec036de55ce1e32b6866a010d3794b78d
-SIZE (libX11-6.2.1.tar.bz2) = 1047586
+MD5 (xorg/lib/libX11-1.1.1.tar.bz2) = 848b80f77b20ae1fa5c882bbfa531ebc
+SHA256 (xorg/lib/libX11-1.1.1.tar.bz2) = 5359db57793430429786b648ac570d4ab205797306e049bf1e8675250af21541
+SIZE (xorg/lib/libX11-1.1.1.tar.bz2) = 1426405
diff --git a/x11/libX11/files/patch-src_ImUtil.c b/x11/libX11/files/patch-src_ImUtil.c
new file mode 100644
index 000000000000..2579201bad8b
--- /dev/null
+++ b/x11/libX11/files/patch-src_ImUtil.c
@@ -0,0 +1,87 @@
+diff --git src/ImUtil.c src/ImUtil.c
+index 83fd030..9e667bb 100644
+--- src/ImUtil.c
++++ src/ImUtil.c
+@@ -327,12 +327,13 @@ XImage *XCreateImage (dpy, visual, depth
+ {
+ register XImage *image;
+ int bits_per_pixel = 1;
++ int min_bytes_per_line;
+
+ if (depth == 0 || depth > 32 ||
+ (format != XYBitmap && format != XYPixmap && format != ZPixmap) ||
+ (format == XYBitmap && depth != 1) ||
+ (xpad != 8 && xpad != 16 && xpad != 32) ||
+- offset < 0 || image_bytes_per_line < 0)
++ offset < 0)
+ return (XImage *) NULL;
+ if ((image = (XImage *) Xcalloc(1, (unsigned) sizeof(XImage))) == NULL)
+ return (XImage *) NULL;
+@@ -363,16 +364,21 @@ XImage *XCreateImage (dpy, visual, depth
+ /*
+ * compute per line accelerator.
+ */
+- if (image_bytes_per_line == 0)
+ {
+ if (format == ZPixmap)
+- image->bytes_per_line =
++ min_bytes_per_line =
+ ROUNDUP((bits_per_pixel * width), image->bitmap_pad);
+ else
+- image->bytes_per_line =
++ min_bytes_per_line =
+ ROUNDUP((width + offset), image->bitmap_pad);
+ }
+- else image->bytes_per_line = image_bytes_per_line;
++ if (image_bytes_per_line == 0) {
++ image->bytes_per_line = min_bytes_per_line;
++ } else if (image_bytes_per_line < min_bytes_per_line) {
++ return 0;
++ } else {
++ image->bytes_per_line = image_bytes_per_line;
++ }
+
+ image->bits_per_pixel = bits_per_pixel;
+ image->obdata = NULL;
+@@ -384,7 +390,11 @@ XImage *XCreateImage (dpy, visual, depth
+ Status XInitImage (image)
+ XImage *image;
+ {
++ int min_bytes_per_line;
++
+ if (image->depth == 0 || image->depth > 32 ||
++ image->bits_per_pixel > 32 || image->bitmap_unit > 32 ||
++ image->bits_per_pixel < 0 || image->bitmap_unit < 0 ||
+ (image->format != XYBitmap &&
+ image->format != XYPixmap &&
+ image->format != ZPixmap) ||
+@@ -392,21 +402,24 @@ Status XInitImage (image)
+ (image->bitmap_pad != 8 &&
+ image->bitmap_pad != 16 &&
+ image->bitmap_pad != 32) ||
+- image->xoffset < 0 || image->bytes_per_line < 0)
++ image->xoffset < 0)
+ return 0;
+
+ /*
+ * compute per line accelerator.
+ */
+- if (image->bytes_per_line == 0)
+- {
+ if (image->format == ZPixmap)
+- image->bytes_per_line =
++ min_bytes_per_line =
+ ROUNDUP((image->bits_per_pixel * image->width),
+ image->bitmap_pad);
+ else
+- image->bytes_per_line =
++ min_bytes_per_line =
+ ROUNDUP((image->width + image->xoffset), image->bitmap_pad);
++
++ if (image->bytes_per_line == 0) {
++ image->bytes_per_line = min_bytes_per_line;
++ } else if (image->bytes_per_line < min_bytes_per_line) {
++ return 0;
+ }
+
+ _XInitImageFuncPtrs (image);
diff --git a/x11/libX11/manpages b/x11/libX11/manpages
new file mode 100644
index 000000000000..d018aca79868
--- /dev/null
+++ b/x11/libX11/manpages
@@ -0,0 +1,614 @@
+MAN3= \
+AllPlanes.3 \
+BitmapBitOrder.3 \
+BitmapPad.3 \
+BitmapUnit.3 \
+BlackPixel.3 \
+BlackPixelOfScreen.3 \
+CellsOfScreen.3 \
+ClientWhitePointOfCCC.3 \
+ConnectionNumber.3 \
+DefaultColormap.3 \
+DefaultColormapOfScreen.3 \
+DefaultDepth.3 \
+DefaultDepthOfScreen.3 \
+DefaultGC.3 \
+DefaultGCOfScreen.3 \
+DefaultRootWindow.3 \
+DefaultScreen.3 \
+DefaultScreenOfDisplay.3 \
+DefaultVisual.3 \
+DefaultVisualOfScreen.3 \
+DisplayCells.3 \
+DisplayHeight.3 \
+DisplayHeightMM.3 \
+DisplayOfCCC.3 \
+DisplayOfScreen.3 \
+DisplayPlanes.3 \
+DisplayString.3 \
+DisplayWidth.3 \
+DisplayWidthMM.3 \
+DoesBackingStore.3 \
+DoesSaveUnders.3 \
+EventMaskOfScreen.3 \
+HeightMMOfScreen.3 \
+HeightOfScreen.3 \
+ImageByteOrder.3 \
+IsCursorKey.3 \
+IsFunctionKey.3 \
+IsKeypadKey.3 \
+IsMiscFunctionKey.3 \
+IsModifierKey.3 \
+IsPFKey.3 \
+IsPrivateKeypadKey.3 \
+LastKnownRequestProcessed.3 \
+MaxCmapsOfScreen.3 \
+MinCmapsOfScreen.3 \
+NextRequest.3 \
+PlanesOfScreen.3 \
+ProtocolRevision.3 \
+ProtocolVersion.3 \
+QLength.3 \
+RootWindow.3 \
+RootWindowOfScreen.3 \
+ScreenCount.3 \
+ScreenNumberOfCCC.3 \
+ScreenOfDisplay.3 \
+ScreenWhitePointOfCCC.3 \
+ServerVendor.3 \
+VendorRelease.3 \
+VisualOfCCC.3 \
+WhitePixel.3 \
+WhitePixelOfScreen.3 \
+WidthMMOfScreen.3 \
+WidthOfScreen.3 \
+XActivateScreenSaver.3 \
+XAddConnectionWatch.3 \
+XAddHost.3 \
+XAddHosts.3 \
+XAddPixel.3 \
+XAddToSaveSet.3 \
+XAllocClassHint.3 \
+XAllocColor.3 \
+XAllocColorCells.3 \
+XAllocColorPlanes.3 \
+XAllocIconSize.3 \
+XAllocNamedColor.3 \
+XAllocSizeHints.3 \
+XAllocStandardColormap.3 \
+XAllocWMHints.3 \
+XAllowEvents.3 \
+XAnyEvent.3 \
+XArc.3 \
+XAutoRepeatOff.3 \
+XAutoRepeatOn.3 \
+XBaseFontNameListOfFontSet.3 \
+XBell.3 \
+XButtonEvent.3 \
+XChangeActivePointerGrab.3 \
+XChangeGC.3 \
+XChangeKeyboardControl.3 \
+XChangeKeyboardMapping.3 \
+XChangePointerControl.3 \
+XChangeProperty.3 \
+XChangeSaveSet.3 \
+XChangeWindowAttributes.3 \
+XChar2b.3 \
+XCharStruct.3 \
+XCheckIfEvent.3 \
+XCheckMaskEvent.3 \
+XCheckTypedEvent.3 \
+XCheckTypedWindowEvent.3 \
+XCheckWindowEvent.3 \
+XCirculateEvent.3 \
+XCirculateRequestEvent.3 \
+XCirculateSubwindows.3 \
+XCirculateSubwindowsDown.3 \
+XCirculateSubwindowsUp.3 \
+XClassHint.3 \
+XClearArea.3 \
+XClearWindow.3 \
+XClientMessageEvent.3 \
+XClipBox.3 \
+XCloseDisplay.3 \
+XCloseIM.3 \
+XCloseOM.3 \
+XColor.3 \
+XColormapEvent.3 \
+XConfigureEvent.3 \
+XConfigureRequestEvent.3 \
+XConfigureWindow.3 \
+XContextDependentDrawing.3 \
+XContextualDrawing.3 \
+XConvertCase.3 \
+XConvertSelection.3 \
+XCopyArea.3 \
+XCopyColormapAndFree.3 \
+XCopyGC.3 \
+XCopyPlane.3 \
+XCreateBitmapFromData.3 \
+XCreateColormap.3 \
+XCreateFontCursor.3 \
+XCreateFontSet.3 \
+XCreateGC.3 \
+XCreateGlyphCursor.3 \
+XCreateIC.3 \
+XCreateImage.3 \
+XCreateOC.3 \
+XCreatePixmap.3 \
+XCreatePixmapCursor.3 \
+XCreatePixmapFromBitmapData.3 \
+XCreateRegion.3 \
+XCreateSimpleWindow.3 \
+XCreateWindow.3 \
+XCreateWindowEvent.3 \
+XCrossingEvent.3 \
+XDefaultString.3 \
+XDefineCursor.3 \
+XDeleteContext.3 \
+XDeleteModifiermapEntry.3 \
+XDeleteProperty.3 \
+XDestroyIC.3 \
+XDestroyImage.3 \
+XDestroyOC.3 \
+XDestroyRegion.3 \
+XDestroySubwindows.3 \
+XDestroyWindow.3 \
+XDestroyWindowEvent.3 \
+XDirectionalDependentDrawing.3 \
+XDisableAccessControl.3 \
+XDisplayKeycodes.3 \
+XDisplayMotionBufferSize.3 \
+XDisplayName.3 \
+XDisplayOfIM.3 \
+XDisplayOfOM.3 \
+XDrawArc.3 \
+XDrawArcs.3 \
+XDrawImageString.3 \
+XDrawImageString16.3 \
+XDrawLine.3 \
+XDrawLines.3 \
+XDrawPoint.3 \
+XDrawPoints.3 \
+XDrawRectangle.3 \
+XDrawRectangles.3 \
+XDrawSegments.3 \
+XDrawString.3 \
+XDrawString16.3 \
+XDrawText.3 \
+XDrawText16.3 \
+XEmptyRegion.3 \
+XEnableAccessControl.3 \
+XEqualRegion.3 \
+XErrorEvent.3 \
+XEvent.3 \
+XEventsQueued.3 \
+XExposeEvent.3 \
+XExtendedMaxRequestSize.3 \
+XExtentsOfFontSet.3 \
+XFetchBuffer.3 \
+XFetchBytes.3 \
+XFetchName.3 \
+XFillArc.3 \
+XFillArcs.3 \
+XFillPolygon.3 \
+XFillRectangle.3 \
+XFillRectangles.3 \
+XFilterEvent.3 \
+XFindContext.3 \
+XFlush.3 \
+XFocusChangeEvent.3 \
+XFontProp.3 \
+XFontSetExtents.3 \
+XFontStruct.3 \
+XFontsOfFontSet.3 \
+XForceScreenSaver.3 \
+XFree.3 \
+XFreeColormap.3 \
+XFreeColors.3 \
+XFreeCursor.3 \
+XFreeExtensionList.3 \
+XFreeFont.3 \
+XFreeFontInfo.3 \
+XFreeFontNames.3 \
+XFreeFontPath.3 \
+XFreeFontSet.3 \
+XFreeGC.3 \
+XFreeModifierMap.3 \
+XFreePixmap.3 \
+XFreeStringList.3 \
+XGCValues.3 \
+XGContextFromGC.3 \
+XGetAtomName.3 \
+XGetAtomNames.3 \
+XGetClassHint.3 \
+XGetCommand.3 \
+XGetErrorDatabaseText.3 \
+XGetErrorText.3 \
+XGetFontPath.3 \
+XGetFontProperty.3 \
+XGetGCValues.3 \
+XGetGeometry.3 \
+XGetICValues.3 \
+XGetIMValues.3 \
+XGetIconName.3 \
+XGetIconSizes.3 \
+XGetImage.3 \
+XGetInputFocus.3 \
+XGetKeyboardControl.3 \
+XGetKeyboardMapping.3 \
+XGetModifierMapping.3 \
+XGetMotionEvents.3 \
+XGetOCValues.3 \
+XGetOMValues.3 \
+XGetPixel.3 \
+XGetPointerControl.3 \
+XGetPointerMapping.3 \
+XGetRGBColormaps.3 \
+XGetScreenSaver.3 \
+XGetSelectionOwner.3 \
+XSetEventQueueOwner.3 \
+XGetSubImage.3 \
+XGetTextProperty.3 \
+XGetTransientForHint.3 \
+XGetVisualInfo.3 \
+XGetWMClientMachine.3 \
+XGetWMColormapWindows.3 \
+XGetWMHints.3 \
+XGetWMIconName.3 \
+XGetWMName.3 \
+XGetWMNormalHints.3 \
+XGetWMProtocols.3 \
+XGetWMSizeHints.3 \
+XGetWindowAttributes.3 \
+XGetWindowProperty.3 \
+XGetXCBConnection.3 \
+XGrabButton.3 \
+XGrabKey.3 \
+XGrabKeyboard.3 \
+XGrabPointer.3 \
+XGrabServer.3 \
+XGraphicsExposeEvent.3 \
+XGravityEvent.3 \
+XHostAddress.3 \
+XIMOfIC.3 \
+XIconSize.3 \
+XIconifyWindow.3 \
+XIfEvent.3 \
+XInitImage.3 \
+XInitThreads.3 \
+XInsertModifiermapEntry.3 \
+XInstallColormap.3 \
+XInternAtom.3 \
+XInternAtoms.3 \
+XInternalConnectionNumbers.3 \
+XIntersectRegion.3 \
+XKeyEvent.3 \
+XKeyboardControl.3 \
+XKeycodeToKeysym.3 \
+XKeymapEvent.3 \
+XKeysymToKeycode.3 \
+XKeysymToString.3 \
+XKillClient.3 \
+XListDepths.3 \
+XListExtensions.3 \
+XListFonts.3 \
+XListFontsWithInfo.3 \
+XListHosts.3 \
+XListInstalledColormaps.3 \
+XListPixmapFormats.3 \
+XListProperties.3 \
+XLoadFont.3 \
+XLoadQueryFont.3 \
+XLocaleOfFontSet.3 \
+XLocaleOfIM.3 \
+XLocaleOfOM.3 \
+XLockDisplay.3 \
+XLookupColor.3 \
+XLookupKeysym.3 \
+XLookupString.3 \
+XLowerWindow.3 \
+XMapEvent.3 \
+XMapRaised.3 \
+XMapRequestEvent.3 \
+XMapSubwindows.3 \
+XMapWindow.3 \
+XMappingEvent.3 \
+XMaskEvent.3 \
+XMatchVisualInfo.3 \
+XMaxRequestSize.3 \
+XModifierKeymap.3 \
+XMotionEvent.3 \
+XMoveResizeWindow.3 \
+XMoveWindow.3 \
+XNewModifiermap.3 \
+XNextEvent.3 \
+XNoExposeEvent.3 \
+XNoOp.3 \
+XOMOfOC.3 \
+XOffsetRegion.3 \
+XOpenDisplay.3 \
+XOpenIM.3 \
+XOpenOM.3 \
+XParseColor.3 \
+XParseGeometry.3 \
+XPeekEvent.3 \
+XPeekIfEvent.3 \
+XPending.3 \
+XPixmapFormatValues.3 \
+XPoint.3 \
+XPointInRegion.3 \
+XPolygonRegion.3 \
+XProcessInternalConnection.3 \
+XPropertyEvent.3 \
+XPutBackEvent.3 \
+XPutImage.3 \
+XPutPixel.3 \
+XQueryBestCursor.3 \
+XQueryBestSize.3 \
+XQueryBestStipple.3 \
+XQueryBestTile.3 \
+XQueryColor.3 \
+XQueryColors.3 \
+XQueryExtension.3 \
+XQueryFont.3 \
+XQueryKeymap.3 \
+XQueryPointer.3 \
+XQueryTextExtents.3 \
+XQueryTextExtents16.3 \
+XQueryTree.3 \
+XRaiseWindow.3 \
+XReadBitmapFile.3 \
+XReadBitmapFileData.3 \
+XRebindKeysym.3 \
+XRecolorCursor.3 \
+XReconfigureWMWindow.3 \
+XRectInRegion.3 \
+XRectangle.3 \
+XRefreshKeyboardMapping.3 \
+XRegisterIMInstantiateCallback.3 \
+XRemoveConnectionWatch.3 \
+XRemoveFromSaveSet.3 \
+XRemoveHost.3 \
+XRemoveHosts.3 \
+XReparentEvent.3 \
+XReparentWindow.3 \
+XResetScreenSaver.3 \
+XResizeRequestEvent.3 \
+XResizeWindow.3 \
+XResourceManagerString.3 \
+XRestackWindows.3 \
+XRotateBuffers.3 \
+XRotateWindowProperties.3 \
+XSaveContext.3 \
+XScreenNumberOfScreen.3 \
+XScreenResourceString.3 \
+XSegment.3 \
+XSelectInput.3 \
+XSelectionClearEvent.3 \
+XSelectionEvent.3 \
+XSelectionRequestEvent.3 \
+XSendEvent.3 \
+XSetAccessControl.3 \
+XSetAfterFunction.3 \
+XSetArcMode.3 \
+XSetBackground.3 \
+XSetClassHint.3 \
+XSetClipMask.3 \
+XSetClipOrigin.3 \
+XSetClipRectangles.3 \
+XSetCloseDownMode.3 \
+XSetCommand.3 \
+XSetDashes.3 \
+XSetErrorHandler.3 \
+XSetFillRule.3 \
+XSetFillStyle.3 \
+XSetFont.3 \
+XSetFontPath.3 \
+XSetForeground.3 \
+XSetFunction.3 \
+XSetGraphicsExposure.3 \
+XSetICFocus.3 \
+XSetICValues.3 \
+XSetIMValues.3 \
+XSetIOErrorHandler.3 \
+XSetIconName.3 \
+XSetIconSizes.3 \
+XSetInputFocus.3 \
+XSetLineAttributes.3 \
+XSetLocaleModifiers.3 \
+XSetModifierMapping.3 \
+XSetOCValues.3 \
+XSetOMValues.3 \
+XSetPlaneMask.3 \
+XSetPointerMapping.3 \
+XSetRGBColormaps.3 \
+XSetRegion.3 \
+XSetScreenSaver.3 \
+XSetSelectionOwner.3 \
+XSetState.3 \
+XSetStipple.3 \
+XSetSubwindowMode.3 \
+XSetTSOrigin.3 \
+XSetTextProperty.3 \
+XSetTile.3 \
+XSetTransientForHint.3 \
+XSetWMClientMachine.3 \
+XSetWMColormapWindows.3 \
+XSetWMHints.3 \
+XSetWMIconName.3 \
+XSetWMName.3 \
+XSetWMNormalHints.3 \
+XSetWMProperties.3 \
+XSetWMProtocols.3 \
+XSetWMSizeHints.3 \
+XSetWindowAttributes.3 \
+XSetWindowBackground.3 \
+XSetWindowBackgroundPixmap.3 \
+XSetWindowBorder.3 \
+XSetWindowBorderPixmap.3 \
+XSetWindowBorderWidth.3 \
+XSetWindowColormap.3 \
+XShrinkRegion.3 \
+XSizeHints.3 \
+XStandardColormap.3 \
+XStoreBuffer.3 \
+XStoreBytes.3 \
+XStoreColor.3 \
+XStoreColors.3 \
+XStoreName.3 \
+XStoreNamedColor.3 \
+XStringListToTextProperty.3 \
+XStringToKeysym.3 \
+XSubImage.3 \
+XSubtractRegion.3 \
+XSupportsLocale.3 \
+XSync.3 \
+XSynchronize.3 \
+XTextExtents.3 \
+XTextExtents16.3 \
+XTextItem.3 \
+XTextItem16.3 \
+XTextProperty.3 \
+XTextPropertyToStringList.3 \
+XTextWidth.3 \
+XTextWidth16.3 \
+XTimeCoord.3 \
+XTranslateCoordinates.3 \
+XUndefineCursor.3 \
+XUngrabButton.3 \
+XUngrabKey.3 \
+XUngrabKeyboard.3 \
+XUngrabPointer.3 \
+XUngrabServer.3 \
+XUninstallColormap.3 \
+XUnionRectWithRegion.3 \
+XUnionRegion.3 \
+XUniqueContext.3 \
+XUnloadFont.3 \
+XUnlockDisplay.3 \
+XUnmapEvent.3 \
+XUnmapSubwindows.3 \
+XUnmapWindow.3 \
+XUnregisterIMInstantiateCallback.3 \
+XUnsetICFocus.3 \
+XVaCreateNestedList.3 \
+XVisibilityEvent.3 \
+XVisualIDFromVisual.3 \
+XVisualInfo.3 \
+XWMGeometry.3 \
+XWMHints.3 \
+XWarpPointer.3 \
+XWindowAttributes.3 \
+XWindowChanges.3 \
+XWindowEvent.3 \
+XWithdrawWindow.3 \
+XWriteBitmapFile.3 \
+XXorRegion.3 \
+XcmsAllocColor.3 \
+XcmsAllocNamedColor.3 \
+XcmsCCCOfColormap.3 \
+XcmsCIELab.3 \
+XcmsCIELabQueryMaxC.3 \
+XcmsCIELabQueryMaxL.3 \
+XcmsCIELabQueryMaxLC.3 \
+XcmsCIELabQueryMinL.3 \
+XcmsCIELuv.3 \
+XcmsCIELuvQueryMaxC.3 \
+XcmsCIELuvQueryMaxL.3 \
+XcmsCIELuvQueryMaxLC.3 \
+XcmsCIELuvQueryMinL.3 \
+XcmsCIEXYZ.3 \
+XcmsCIEuvY.3 \
+XcmsCIExyY.3 \
+XcmsColor.3 \
+XcmsConvertColors.3 \
+XcmsCreateCCC.3 \
+XcmsDefaultCCC.3 \
+XcmsFreeCCC.3 \
+XcmsLookupColor.3 \
+XcmsPad.3 \
+XcmsQueryBlack.3 \
+XcmsQueryBlue.3 \
+XcmsQueryColor.3 \
+XcmsQueryColors.3 \
+XcmsQueryGreen.3 \
+XcmsQueryRed.3 \
+XcmsQueryWhite.3 \
+XcmsRGB.3 \
+XcmsRGBi.3 \
+XcmsSetCCCOfColormap.3 \
+XcmsSetWhiteAdjustProc.3 \
+XcmsSetWhitePoint.3 \
+XcmsStoreColor.3 \
+XcmsStoreColors.3 \
+XcmsTekHVC.3 \
+XcmsTekHVCQueryMaxC.3 \
+XcmsTekHVCQueryMaxV.3 \
+XcmsTekHVCQueryMaxVC.3 \
+XcmsTekHVCQueryMaxVSamples.3 \
+XcmsTekHVCQueryMinV.3 \
+XmbDrawImageString.3 \
+XmbDrawString.3 \
+XmbDrawText.3 \
+XmbLookupString.3 \
+XmbResetIC.3 \
+XmbSetWMProperties.3 \
+XmbTextEscapement.3 \
+XmbTextExtents.3 \
+XmbTextListToTextProperty.3 \
+XmbTextPerCharExtents.3 \
+XmbTextPropertyToTextList.3 \
+XrmCombineDatabase.3 \
+XrmCombineFileDatabase.3 \
+XrmDestroyDatabase.3 \
+XrmEnumerateDatabase.3 \
+XrmGetDatabase.3 \
+XrmGetFileDatabase.3 \
+XrmGetResource.3 \
+XrmGetStringDatabase.3 \
+XrmInitialize.3 \
+XrmLocaleOfDatabase.3 \
+XrmMergeDatabases.3 \
+XrmOptionDescRec.3 \
+XrmOptionKind.3 \
+XrmParseCommand.3 \
+XrmPermStringToQuark.3 \
+XrmPutFileDatabase.3 \
+XrmPutLineResource.3 \
+XrmPutResource.3 \
+XrmPutStringResource.3 \
+XrmQGetResource.3 \
+XrmQGetSearchList.3 \
+XrmQGetSearchResource.3 \
+XrmQPutResource.3 \
+XrmQPutStringResource.3 \
+XrmQuarkToString.3 \
+XrmSetDatabase.3 \
+XrmStringToBindingQuarkList.3 \
+XrmStringToQuark.3 \
+XrmStringToQuarkList.3 \
+XrmUniqueQuark.3 \
+XrmValue.3 \
+Xutf8DrawImageString.3 \
+Xutf8DrawString.3 \
+Xutf8DrawText.3 \
+Xutf8LookupString.3 \
+Xutf8ResetIC.3 \
+Xutf8SetWMProperties.3 \
+Xutf8TextEscapement.3 \
+Xutf8TextExtents.3 \
+Xutf8TextListToTextProperty.3 \
+Xutf8TextPerCharExtents.3 \
+Xutf8TextPropertyToTextList.3 \
+XwcDrawImageString.3 \
+XwcDrawString.3 \
+XwcDrawText.3 \
+XwcFreeStringList.3 \
+XwcLookupString.3 \
+XwcResetIC.3 \
+XwcTextEscapement.3 \
+XwcTextExtents.3 \
+XwcTextListToTextProperty.3 \
+XwcTextPerCharExtents.3 \
+XwcTextPropertyToTextList.3
diff --git a/x11/libX11/pkg-plist b/x11/libX11/pkg-plist
index a934f8fd4812..f7f69cceda36 100644
--- a/x11/libX11/pkg-plist
+++ b/x11/libX11/pkg-plist
@@ -2,179 +2,257 @@ include/X11/ImUtil.h
include/X11/XKBlib.h
include/X11/Xcms.h
include/X11/Xlib.h
+%%XCB%%include/X11/Xlib-xcb.h
+include/X11/XlibConf.h
include/X11/Xlibint.h
include/X11/Xlocale.h
+include/X11/Xregion.h
include/X11/Xresource.h
include/X11/Xutil.h
include/X11/cursorfont.h
-include/X11/region.h
+lib/X11/Xcms.txt
lib/libX11.a
lib/libX11.la
lib/libX11.so
lib/libX11.so.6
+%%XCB%%lib/libX11-xcb.a
+%%XCB%%lib/libX11-xcb.la
+%%XCB%%lib/libX11-xcb.so
+%%XCB%%lib/libX11-xcb.so.1
libdata/pkgconfig/x11.pc
+%%XCB%%libdata/pkgconfig/x11-xcb.pc
share/X11/XErrorDB
share/X11/XKeysymDB
-share/X11/locale/C/XI18N_OBJS
-share/X11/locale/C/XLC_LOCALE
share/X11/locale/armscii-8/XI18N_OBJS
share/X11/locale/armscii-8/XLC_LOCALE
-share/X11/locale/compose.dir
+share/X11/locale/armscii-8/Compose
+share/X11/locale/C/XI18N_OBJS
+share/X11/locale/C/XLC_LOCALE
+share/X11/locale/C/Compose
+share/X11/locale/el_GR.UTF-8/XI18N_OBJS
+share/X11/locale/el_GR.UTF-8/XLC_LOCALE
+share/X11/locale/el_GR.UTF-8/Compose
share/X11/locale/en_US.UTF-8/XI18N_OBJS
share/X11/locale/en_US.UTF-8/XLC_LOCALE
+share/X11/locale/en_US.UTF-8/Compose
share/X11/locale/georgian-academy/XI18N_OBJS
share/X11/locale/georgian-academy/XLC_LOCALE
+share/X11/locale/georgian-academy/Compose
share/X11/locale/georgian-ps/XI18N_OBJS
share/X11/locale/georgian-ps/XLC_LOCALE
+share/X11/locale/georgian-ps/Compose
share/X11/locale/ibm-cp1133/XI18N_OBJS
share/X11/locale/ibm-cp1133/XLC_LOCALE
+share/X11/locale/ibm-cp1133/Compose
share/X11/locale/iscii-dev/XI18N_OBJS
share/X11/locale/iscii-dev/XLC_LOCALE
+share/X11/locale/iscii-dev/Compose
share/X11/locale/isiri-3342/XI18N_OBJS
share/X11/locale/isiri-3342/XLC_LOCALE
+share/X11/locale/isiri-3342/Compose
share/X11/locale/iso8859-1/XI18N_OBJS
share/X11/locale/iso8859-1/XLC_LOCALE
+share/X11/locale/iso8859-1/Compose
share/X11/locale/iso8859-10/XI18N_OBJS
share/X11/locale/iso8859-10/XLC_LOCALE
+share/X11/locale/iso8859-10/Compose
share/X11/locale/iso8859-11/XI18N_OBJS
share/X11/locale/iso8859-11/XLC_LOCALE
+share/X11/locale/iso8859-11/Compose
share/X11/locale/iso8859-13/XI18N_OBJS
share/X11/locale/iso8859-13/XLC_LOCALE
+share/X11/locale/iso8859-13/Compose
share/X11/locale/iso8859-14/XI18N_OBJS
share/X11/locale/iso8859-14/XLC_LOCALE
+share/X11/locale/iso8859-14/Compose
share/X11/locale/iso8859-15/XI18N_OBJS
share/X11/locale/iso8859-15/XLC_LOCALE
+share/X11/locale/iso8859-15/Compose
share/X11/locale/iso8859-2/XI18N_OBJS
share/X11/locale/iso8859-2/XLC_LOCALE
+share/X11/locale/iso8859-2/Compose
share/X11/locale/iso8859-3/XI18N_OBJS
share/X11/locale/iso8859-3/XLC_LOCALE
+share/X11/locale/iso8859-3/Compose
share/X11/locale/iso8859-4/XI18N_OBJS
share/X11/locale/iso8859-4/XLC_LOCALE
+share/X11/locale/iso8859-4/Compose
share/X11/locale/iso8859-5/XI18N_OBJS
share/X11/locale/iso8859-5/XLC_LOCALE
+share/X11/locale/iso8859-5/Compose
share/X11/locale/iso8859-6/XI18N_OBJS
share/X11/locale/iso8859-6/XLC_LOCALE
+share/X11/locale/iso8859-6/Compose
share/X11/locale/iso8859-7/XI18N_OBJS
share/X11/locale/iso8859-7/XLC_LOCALE
+share/X11/locale/iso8859-7/Compose
share/X11/locale/iso8859-8/XI18N_OBJS
share/X11/locale/iso8859-8/XLC_LOCALE
+share/X11/locale/iso8859-8/Compose
share/X11/locale/iso8859-9/XI18N_OBJS
share/X11/locale/iso8859-9/XLC_LOCALE
+share/X11/locale/iso8859-9/Compose
share/X11/locale/iso8859-9e/XI18N_OBJS
share/X11/locale/iso8859-9e/XLC_LOCALE
+share/X11/locale/iso8859-9e/Compose
+share/X11/locale/ja/XI18N_OBJS
+share/X11/locale/ja/XLC_LOCALE
+share/X11/locale/ja/Compose
share/X11/locale/ja.JIS/XI18N_OBJS
share/X11/locale/ja.JIS/XLC_LOCALE
+share/X11/locale/ja.JIS/Compose
+share/X11/locale/ja_JP.UTF-8/XI18N_OBJS
+share/X11/locale/ja_JP.UTF-8/XLC_LOCALE
+share/X11/locale/ja_JP.UTF-8/Compose
share/X11/locale/ja.S90/XI18N_OBJS
share/X11/locale/ja.S90/XLC_LOCALE
+share/X11/locale/ja.S90/Compose
share/X11/locale/ja.SJIS/XI18N_OBJS
share/X11/locale/ja.SJIS/XLC_LOCALE
+share/X11/locale/ja.SJIS/Compose
share/X11/locale/ja.U90/XI18N_OBJS
share/X11/locale/ja.U90/XLC_LOCALE
-share/X11/locale/ja/XI18N_OBJS
-share/X11/locale/ja/XLC_LOCALE
-share/X11/locale/ja_JP.UTF-8/XI18N_OBJS
-share/X11/locale/ja_JP.UTF-8/XLC_LOCALE
+share/X11/locale/ja.U90/Compose
share/X11/locale/ko/XI18N_OBJS
share/X11/locale/ko/XLC_LOCALE
-share/X11/locale/ko_KR.UTF-8/XI18N_OBJS
-share/X11/locale/ko_KR.UTF-8/XLC_LOCALE
+share/X11/locale/ko/Compose
share/X11/locale/koi8-c/XI18N_OBJS
share/X11/locale/koi8-c/XLC_LOCALE
+share/X11/locale/koi8-c/Compose
share/X11/locale/koi8-r/XI18N_OBJS
share/X11/locale/koi8-r/XLC_LOCALE
+share/X11/locale/koi8-r/Compose
share/X11/locale/koi8-u/XI18N_OBJS
share/X11/locale/koi8-u/XLC_LOCALE
-share/X11/locale/locale.alias
-share/X11/locale/locale.dir
+share/X11/locale/koi8-u/Compose
+share/X11/locale/ko_KR.UTF-8/XI18N_OBJS
+share/X11/locale/ko_KR.UTF-8/XLC_LOCALE
+share/X11/locale/ko_KR.UTF-8/Compose
share/X11/locale/microsoft-cp1251/XI18N_OBJS
share/X11/locale/microsoft-cp1251/XLC_LOCALE
+share/X11/locale/microsoft-cp1251/Compose
share/X11/locale/microsoft-cp1255/XI18N_OBJS
share/X11/locale/microsoft-cp1255/XLC_LOCALE
+share/X11/locale/microsoft-cp1255/Compose
share/X11/locale/microsoft-cp1256/XI18N_OBJS
share/X11/locale/microsoft-cp1256/XLC_LOCALE
+share/X11/locale/microsoft-cp1256/Compose
share/X11/locale/mulelao-1/XI18N_OBJS
share/X11/locale/mulelao-1/XLC_LOCALE
+share/X11/locale/mulelao-1/Compose
share/X11/locale/nokhchi-1/XI18N_OBJS
share/X11/locale/nokhchi-1/XLC_LOCALE
+share/X11/locale/nokhchi-1/Compose
+share/X11/locale/pt_BR.UTF-8/XI18N_OBJS
+share/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+share/X11/locale/pt_BR.UTF-8/Compose
share/X11/locale/tatar-cyr/XI18N_OBJS
share/X11/locale/tatar-cyr/XLC_LOCALE
-share/X11/locale/th_TH.UTF-8/XI18N_OBJS
-share/X11/locale/th_TH.UTF-8/XLC_LOCALE
+share/X11/locale/tatar-cyr/Compose
share/X11/locale/th_TH/XI18N_OBJS
share/X11/locale/th_TH/XLC_LOCALE
+share/X11/locale/th_TH/Compose
+share/X11/locale/th_TH.UTF-8/XI18N_OBJS
+share/X11/locale/th_TH.UTF-8/XLC_LOCALE
+share/X11/locale/th_TH.UTF-8/Compose
share/X11/locale/tscii-0/XI18N_OBJS
share/X11/locale/tscii-0/XLC_LOCALE
+share/X11/locale/tscii-0/Compose
share/X11/locale/vi_VN.tcvn/XI18N_OBJS
share/X11/locale/vi_VN.tcvn/XLC_LOCALE
+share/X11/locale/vi_VN.tcvn/Compose
share/X11/locale/vi_VN.viscii/XI18N_OBJS
share/X11/locale/vi_VN.viscii/XLC_LOCALE
-share/X11/locale/zh_CN.UTF-8/XI18N_OBJS
-share/X11/locale/zh_CN.UTF-8/XLC_LOCALE
-share/X11/locale/zh_CN.gbk/XI18N_OBJS
-share/X11/locale/zh_CN.gbk/XLC_LOCALE
+share/X11/locale/vi_VN.viscii/Compose
share/X11/locale/zh_CN/XI18N_OBJS
share/X11/locale/zh_CN/XLC_LOCALE
+share/X11/locale/zh_CN/Compose
+share/X11/locale/zh_CN.gb18030/XI18N_OBJS
+share/X11/locale/zh_CN.gb18030/XLC_LOCALE
+share/X11/locale/zh_CN.gb18030/Compose
+share/X11/locale/zh_CN.gbk/XI18N_OBJS
+share/X11/locale/zh_CN.gbk/XLC_LOCALE
+share/X11/locale/zh_CN.gbk/Compose
+share/X11/locale/zh_TW/XI18N_OBJS
+share/X11/locale/zh_TW/XLC_LOCALE
+share/X11/locale/zh_TW/Compose
+share/X11/locale/zh_CN.UTF-8/XI18N_OBJS
+share/X11/locale/zh_CN.UTF-8/XLC_LOCALE
+share/X11/locale/zh_CN.UTF-8/Compose
+share/X11/locale/zh_HK.big5/XI18N_OBJS
share/X11/locale/zh_HK.big5/XLC_LOCALE
+share/X11/locale/zh_HK.big5/Compose
share/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
share/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
-share/X11/locale/zh_TW.UTF-8/XI18N_OBJS
-share/X11/locale/zh_TW.UTF-8/XLC_LOCALE
+share/X11/locale/zh_HK.big5hkscs/Compose
+share/X11/locale/zh_HK.UTF-8/XI18N_OBJS
+share/X11/locale/zh_HK.UTF-8/XLC_LOCALE
+share/X11/locale/zh_HK.UTF-8/Compose
share/X11/locale/zh_TW.big5/XI18N_OBJS
share/X11/locale/zh_TW.big5/XLC_LOCALE
-share/X11/locale/zh_TW/XI18N_OBJS
-share/X11/locale/zh_TW/XLC_LOCALE
-@dirrm share/X11/locale/C
-@dirrm share/X11/locale/armscii-8
-@dirrm share/X11/locale/georgian-academy
-@dirrm share/X11/locale/georgian-ps
-@dirrm share/X11/locale/ibm-cp1133
-@dirrm share/X11/locale/iscii-dev
-@dirrm share/X11/locale/isiri-3342
-@dirrm share/X11/locale/iso8859-1
-@dirrm share/X11/locale/iso8859-2
-@dirrm share/X11/locale/iso8859-3
-@dirrm share/X11/locale/iso8859-4
-@dirrm share/X11/locale/iso8859-5
-@dirrm share/X11/locale/iso8859-6
-@dirrm share/X11/locale/iso8859-7
-@dirrm share/X11/locale/iso8859-8
-@dirrm share/X11/locale/iso8859-9
-@dirrm share/X11/locale/iso8859-10
-@dirrm share/X11/locale/iso8859-11
-@dirrm share/X11/locale/iso8859-13
-@dirrm share/X11/locale/iso8859-14
-@dirrm share/X11/locale/iso8859-15
-@dirrm share/X11/locale/iso8859-9e
-@dirrm share/X11/locale/ja
-@dirrm share/X11/locale/ja.JIS
-@dirrm share/X11/locale/ja.S90
-@dirrm share/X11/locale/ja.SJIS
-@dirrm share/X11/locale/ja.U90
-@dirrm share/X11/locale/ko
-@dirrm share/X11/locale/koi8-r
-@dirrm share/X11/locale/koi8-u
-@dirrm share/X11/locale/koi8-c
-@dirrm share/X11/locale/microsoft-cp1251
-@dirrm share/X11/locale/microsoft-cp1255
-@dirrm share/X11/locale/microsoft-cp1256
-@dirrm share/X11/locale/mulelao-1
-@dirrm share/X11/locale/nokhchi-1
-@dirrm share/X11/locale/tatar-cyr
-@dirrm share/X11/locale/tscii-0
-@dirrm share/X11/locale/vi_VN.tcvn
-@dirrm share/X11/locale/vi_VN.viscii
-@dirrm share/X11/locale/zh_CN
-@dirrm share/X11/locale/zh_CN.gbk
-@dirrm share/X11/locale/zh_CN.UTF-8
+share/X11/locale/zh_TW.big5/Compose
+share/X11/locale/zh_TW.UTF-8/XI18N_OBJS
+share/X11/locale/zh_TW.UTF-8/XLC_LOCALE
+share/X11/locale/zh_TW.UTF-8/Compose
+share/X11/locale/locale.alias
+share/X11/locale/locale.dir
+share/X11/locale/compose.dir
+@dirrm share/X11/locale/zh_TW.UTF-8
+@dirrm share/X11/locale/zh_TW.big5
+@dirrm share/X11/locale/zh_HK.UTF-8
@dirrm share/X11/locale/zh_HK.big5hkscs
+@dirrm share/X11/locale/zh_HK.big5
+@dirrm share/X11/locale/zh_CN.UTF-8
@dirrm share/X11/locale/zh_TW
-@dirrm share/X11/locale/zh_TW.big5
+@dirrm share/X11/locale/zh_CN.gbk
+@dirrm share/X11/locale/zh_CN.gb18030
+@dirrm share/X11/locale/zh_CN
+@dirrm share/X11/locale/vi_VN.viscii
+@dirrm share/X11/locale/vi_VN.tcvn
+@dirrm share/X11/locale/tscii-0
+@dirrm share/X11/locale/th_TH.UTF-8
@dirrm share/X11/locale/th_TH
-@dirrm share/X11/locale/en_US.UTF-8
-@dirrm share/X11/locale/ja_JP.UTF-8
+@dirrm share/X11/locale/tatar-cyr
+@dirrm share/X11/locale/pt_BR.UTF-8
+@dirrm share/X11/locale/nokhchi-1
+@dirrm share/X11/locale/mulelao-1
+@dirrm share/X11/locale/microsoft-cp1256
+@dirrm share/X11/locale/microsoft-cp1255
+@dirrm share/X11/locale/microsoft-cp1251
@dirrm share/X11/locale/ko_KR.UTF-8
-@dirrm share/X11/locale/th_TH.UTF-8
-@dirrm share/X11/locale/zh_TW.UTF-8
-@dirrm share/X11/locale/zh_HK.big5
+@dirrm share/X11/locale/koi8-u
+@dirrm share/X11/locale/koi8-r
+@dirrm share/X11/locale/koi8-c
+@dirrm share/X11/locale/ko
+@dirrm share/X11/locale/ja.U90
+@dirrm share/X11/locale/ja.SJIS
+@dirrm share/X11/locale/ja.S90
+@dirrm share/X11/locale/ja_JP.UTF-8
+@dirrm share/X11/locale/ja.JIS
+@dirrm share/X11/locale/ja
+@dirrm share/X11/locale/iso8859-9e
+@dirrm share/X11/locale/iso8859-9
+@dirrm share/X11/locale/iso8859-8
+@dirrm share/X11/locale/iso8859-7
+@dirrm share/X11/locale/iso8859-6
+@dirrm share/X11/locale/iso8859-5
+@dirrm share/X11/locale/iso8859-4
+@dirrm share/X11/locale/iso8859-3
+@dirrm share/X11/locale/iso8859-2
+@dirrm share/X11/locale/iso8859-15
+@dirrm share/X11/locale/iso8859-14
+@dirrm share/X11/locale/iso8859-13
+@dirrm share/X11/locale/iso8859-11
+@dirrm share/X11/locale/iso8859-10
+@dirrm share/X11/locale/iso8859-1
+@dirrm share/X11/locale/isiri-3342
+@dirrm share/X11/locale/iscii-dev
+@dirrm share/X11/locale/ibm-cp1133
+@dirrm share/X11/locale/georgian-ps
+@dirrm share/X11/locale/georgian-academy
+@dirrm share/X11/locale/en_US.UTF-8
+@dirrm share/X11/locale/el_GR.UTF-8
+@dirrm share/X11/locale/C
+@dirrm share/X11/locale/armscii-8
@dirrm share/X11/locale
-@unexec rmdir %D/share/X11
+@dirrm share/X11
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
new file mode 100644
index 000000000000..d0bf8314a38b
--- /dev/null
+++ b/x11/libXScrnSaver/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for: libXScrnSaver
+# Date Created: 15 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= libXScrnSaver
+PORTVERSION= 1.1.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= The XScrnSaver library
+
+XORG_CAT= lib
+USE_XORG= x11 xext xextproto scrnsaverproto:both
+
+MAN3= Xss.3 \
+ XScreenSaverAllocInfo.3 \
+ XScreenSaverGetRegistered.3 \
+ XScreenSaverQueryExtension.3 \
+ XScreenSaverQueryInfo.3 \
+ XScreenSaverQueryVersion.3 \
+ XScreenSaverRegister.3 \
+ XScreenSaverSelectInput.3 \
+ XScreenSaverSetAttributes.3 \
+ XScreenSaverSuspend.3 \
+ XScreenSaverUnregister.3 \
+ XScreenSaverUnsetAttributes.3
+
+.include <bsd.port.mk>
diff --git a/x11/libXScrnSaver/distinfo b/x11/libXScrnSaver/distinfo
new file mode 100644
index 000000000000..ee971b219267
--- /dev/null
+++ b/x11/libXScrnSaver/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXScrnSaver-1.1.2.tar.bz2) = ac2d697dd02f51e5c15f7104f4be5328
+SHA256 (xorg/lib/libXScrnSaver-1.1.2.tar.bz2) = 6c75debca746060e0c2408a6ca119613ae02d1054adebd4b26ff8beee79bcc67
+SIZE (xorg/lib/libXScrnSaver-1.1.2.tar.bz2) = 219728
diff --git a/x11/libXScrnSaver/pkg-descr b/x11/libXScrnSaver/pkg-descr
new file mode 100644
index 000000000000..3e2398c91789
--- /dev/null
+++ b/x11/libXScrnSaver/pkg-descr
@@ -0,0 +1,5 @@
+This package contains libXScrnSaver, the X11 Screen Saver extension
+client library.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/libXScrnSaver/pkg-plist b/x11/libXScrnSaver/pkg-plist
new file mode 100644
index 000000000000..508ec72f3e26
--- /dev/null
+++ b/x11/libXScrnSaver/pkg-plist
@@ -0,0 +1,5 @@
+lib/libXss.so.1
+lib/libXss.so
+lib/libXss.la
+lib/libXss.a
+libdata/pkgconfig/xscrnsaver.pc
diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile
new file mode 100644
index 000000000000..76c578b9986b
--- /dev/null
+++ b/x11/libXTrap/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for: libXTrap
+# Date Created: 21 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= libXTrap
+PORTVERSION= 1.0.0
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= The XTrap library
+
+XORG_CAT= lib
+USE_XORG= trapproto:both x11 xext xextproto xt
+USE_AUTOTOOLS= libtool:15
+
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+
+.include <bsd.port.mk>
diff --git a/x11/libXTrap/distinfo b/x11/libXTrap/distinfo
new file mode 100644
index 000000000000..a901870b8f10
--- /dev/null
+++ b/x11/libXTrap/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXTrap-1.0.0.tar.bz2) = 1e2d966b5b2b89910e418bb0f78e10de
+SHA256 (xorg/lib/libXTrap-1.0.0.tar.bz2) = cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba
+SIZE (xorg/lib/libXTrap-1.0.0.tar.bz2) = 220148
diff --git a/x11/libXTrap/pkg-descr b/x11/libXTrap/pkg-descr
new file mode 100644
index 000000000000..22dcef586f24
--- /dev/null
+++ b/x11/libXTrap/pkg-descr
@@ -0,0 +1,4 @@
+This package contains libXTrap, the The X.Org XTrap library.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/libXTrap/pkg-plist b/x11/libXTrap/pkg-plist
new file mode 100644
index 000000000000..0822c92809fd
--- /dev/null
+++ b/x11/libXTrap/pkg-plist
@@ -0,0 +1,5 @@
+lib/libXTrap.so.6
+lib/libXTrap.so
+lib/libXTrap.la
+lib/libXTrap.a
+libdata/pkgconfig/xtrap.pc
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index 0319868a2301..03efb67c84a6 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -6,26 +6,21 @@
#
PORTNAME= libXau
-PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTVERSION= 1.0.3
+PORTREVISION= 2
CATEGORIES= x11
-MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
MAINTAINER= x11@FreeBSD.org
COMMENT= Authentication Protocol library for X11
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
+XORG_CAT= lib
+USE_XORG= xproto:both
-CONFLICTS= XFree86-libraries-* xorg-libraries-*
+MAN3= Xau.3 XauDisposeAuth.3 XauFileName.3 XauGetAuthByAddr.3 \
+ XauGetBestAuthByAddr.3 XauLockAuth.3 XauReadAuth.3 \
+ XauUnlockAuth.3 XauWriteAuth.3
-USE_AUTOTOOLS= libtool:15
-USE_BZIP2= yes
-PREFIX?= ${X11BASE}
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE= yes
-USE_GNOME= gnomehack pkgconfig
-
-INSTALLS_SHLIB= yes
+post-install:
+ ${LN} -sf ${PREFIX}/lib/libXau.so.6 ${PREFIX}/lib/libXau.so.0
.include <bsd.port.mk>
diff --git a/x11/libXau/distinfo b/x11/libXau/distinfo
index 5abb952db066..bc2977594ca8 100644
--- a/x11/libXau/distinfo
+++ b/x11/libXau/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXau-0.1.1.tar.bz2) = 3d747ada4a7d17538fa21c62d5608656
-SHA256 (libXau-0.1.1.tar.bz2) = d7c42725a17ffd7c343fa1631b1c9f4899c26f971de5c8892d56af88cf54a4c4
-SIZE (libXau-0.1.1.tar.bz2) = 186745
+MD5 (xorg/lib/libXau-1.0.3.tar.bz2) = 75a9f2b85cd1617b5ca98c9095323853
+SHA256 (xorg/lib/libXau-1.0.3.tar.bz2) = d6c30a88770a720e96e0bd7e13e0334f9ef60f1b475a92556764828005c19e3b
+SIZE (xorg/lib/libXau-1.0.3.tar.bz2) = 229619
diff --git a/x11/libXau/pkg-plist b/x11/libXau/pkg-plist
index d06cf4784b64..f46f0a86cf15 100644
--- a/x11/libXau/pkg-plist
+++ b/x11/libXau/pkg-plist
@@ -3,4 +3,5 @@ lib/libXau.a
lib/libXau.la
lib/libXau.so
lib/libXau.so.0
+lib/libXau.so.6
libdata/pkgconfig/xau.pc
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index ca2b41000b78..7fb89636f85d 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -6,27 +6,14 @@
#
PORTNAME= libXcomposite
-PORTVERSION= 1.0.1
-PORTREVISION= 2
+PORTVERSION= 0.3.1
+PORTEPOCH= 1
CATEGORIES= x11
-MASTER_SITES= http://xlibs.freedesktop.org/release/
MAINTAINER= x11@FreeBSD.org
COMMENT= X Composite extension library
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/compositeext.pc:${PORTSDIR}/x11/compositeext \
- ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
- ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
-
-USE_BZIP2= yes
-PREFIX?= ${X11BASE}
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE= yes
-CFLAGS+= -DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB= yes
-USE_GNOME= gnomehack pkgconfig
+XORG_CAT= lib
+USE_XORG= compositeproto:both x11 xfixes xext fixesproto xproto:both
.include <bsd.port.mk>
diff --git a/x11/libXcomposite/distinfo b/x11/libXcomposite/distinfo
index fdbc7590d368..f4138b7653de 100644
--- a/x11/libXcomposite/distinfo
+++ b/x11/libXcomposite/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXcomposite-1.0.1.tar.bz2) = 6d5eb91ab7023fbc5cad3e410fe126df
-SHA256 (libXcomposite-1.0.1.tar.bz2) = ea26fb4714277a9b82dc2c3da37657da2e6ff83c451167a6bed9a9f5cdca71de
-SIZE (libXcomposite-1.0.1.tar.bz2) = 181910
+MD5 (xorg/lib/libXcomposite-0.3.1.tar.bz2) = a80650d660486ea7bb2e5fd84a83799a
+SHA256 (xorg/lib/libXcomposite-0.3.1.tar.bz2) = d42b59d3c38dae5e4fec375d12e56e7a5764ba10e8b8ec70f9ce951fc9cec72b
+SIZE (xorg/lib/libXcomposite-0.3.1.tar.bz2) = 221073
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index f1de917e799e..1f84ddbbbcad 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -6,32 +6,18 @@
#
PORTNAME= libXcursor
-PORTVERSION= 1.1.2
-PORTREVISION= 3
+PORTVERSION= 1.1.8
+PORTREVISION= 1
CATEGORIES= x11
-MASTER_SITES= http://xlibs.freedesktop.org/release/
MAINTAINER= x11@FreeBSD.org
COMMENT= X client-side cursor loading library
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
- ${X11BASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender \
- ${X11BASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
- ${X11BASE}/libdata/pkgconfig/render.pc:${PORTSDIR}/x11/renderext \
- ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
+XORG_CAT= lib
+USE_XORG= xrender x11 xfixes renderproto fixesproto xproto:both
-CONFLICTS= XFree86-libraries-* xorg-libraries-*
+CONFIGURE_ARGS= --with-icondir=${PREFIX}/lib/X11/icons
-USE_BZIP2= yes
-PREFIX?= ${X11BASE}
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE= yes
-CFLAGS+= -DMALLOC_0_RETURNS_NULL
MAN3= Xcursor.3
-INSTALLS_SHLIB= yes
-USE_GNOME= gnomehack pkgconfig
.include <bsd.port.mk>
diff --git a/x11/libXcursor/distinfo b/x11/libXcursor/distinfo
index d1ddadfe2d2f..3c8e7874d4d1 100644
--- a/x11/libXcursor/distinfo
+++ b/x11/libXcursor/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXcursor-1.1.2.tar.bz2) = cc38e1e1a144f828e6ad216c4ebb876b
-SHA256 (libXcursor-1.1.2.tar.bz2) = 3331d125b093f99e05ccb41df802573b8a679f4941f16e14ba7e6877fc08a4fa
-SIZE (libXcursor-1.1.2.tar.bz2) = 211989
+MD5 (xorg/lib/libXcursor-1.1.8.tar.bz2) = ec2acd10a7736a85dd1e1ed9ea5bec96
+SHA256 (xorg/lib/libXcursor-1.1.8.tar.bz2) = 8f039f81af52c88d583fba48b878abd074542221cb0030638ad52336b4ae1377
+SIZE (xorg/lib/libXcursor-1.1.8.tar.bz2) = 251641
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index a30b32ea0eeb..9b11eb0ff0de 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -6,27 +6,13 @@
#
PORTNAME= libXdamage
-PORTVERSION= 1.0.1
-PORTREVISION= 2
+PORTVERSION= 1.1.1
CATEGORIES= x11
-MASTER_SITES= http://xlibs.freedesktop.org/release/
MAINTAINER= x11@FreeBSD.org
COMMENT= X Damage extension library
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/damageext.pc:${PORTSDIR}/x11/damageext \
- ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
- ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
-
-USE_BZIP2= yes
-PREFIX?= ${X11BASE}
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE= yes
-CFLAGS+= -DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB= yes
-USE_GNOME= gnomehack pkgconfig
+XORG_CAT= lib
+USE_XORG= x11 damageproto:both xfixes fixesproto xextproto xproto:both
.include <bsd.port.mk>
diff --git a/x11/libXdamage/distinfo b/x11/libXdamage/distinfo
index c70f21acf981..de3ea7517055 100644
--- a/x11/libXdamage/distinfo
+++ b/x11/libXdamage/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXdamage-1.0.1.tar.bz2) = ee4d344ac70117b6c5d840e543ce5d26
-SHA256 (libXdamage-1.0.1.tar.bz2) = 619a1e03ff74f6ac623a65965431502f75b251d9d015050349eb06bf36214596
-SIZE (libXdamage-1.0.1.tar.bz2) = 182389
+MD5 (xorg/lib/libXdamage-1.1.1.tar.bz2) = ac0ce6b0063a9858c8f24ddb4c60487d
+SHA256 (xorg/lib/libXdamage-1.1.1.tar.bz2) = 0102754db23952a1c3adf7881bbf191f91ca3e3d183e1b0179452bce932fae2e
+SIZE (xorg/lib/libXdamage-1.1.1.tar.bz2) = 201096
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index 550ca30867c5..2c63d7709e76 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -6,34 +6,13 @@
#
PORTNAME= libXdmcp
-PORTVERSION= 0.1.3
+PORTVERSION= 1.0.2
CATEGORIES= x11
-MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/:fdo \
- ${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR= anholt/:local
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:fdo \
- Wraphelp2.gz:local
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= x11@FreeBSD.org
COMMENT= X Display Manager Control Protocol library
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
-BUILD_DEPENDS= ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
-
-CONFLICTS= XFree86-libraries-* xorg-libraries-*
-
-USE_AUTOTOOLS= libtool:15
-USE_BZIP2= yes
-PREFIX?= ${X11BASE}
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE= yes
-INSTALLS_SHLIB= yes
-USE_GNOME= gnomehack pkgconfig
-
-post-extract:
- ${GUNZIP_CMD} -c ${DISTDIR}/Wraphelp2.gz > ${WRKSRC}/Wraphelp.c
+XORG_CAT= lib
+USE_XORG= xproto
.include <bsd.port.mk>
diff --git a/x11/libXdmcp/distinfo b/x11/libXdmcp/distinfo
index bd27087318a9..65cc796890cf 100644
--- a/x11/libXdmcp/distinfo
+++ b/x11/libXdmcp/distinfo
@@ -1,6 +1,3 @@
-MD5 (libXdmcp-0.1.3.tar.bz2) = b2d945d5f8399605426ba6410223b8de
-SHA256 (libXdmcp-0.1.3.tar.bz2) = addb7c6dee29fafb163ea0242e0fb32f180edf20587670e3cd8dd62734366ef7
-SIZE (libXdmcp-0.1.3.tar.bz2) = 207281
-MD5 (Wraphelp2.gz) = bd1910492087442288d885412e2e5535
-SHA256 (Wraphelp2.gz) = dafdafebe454806d19ec32536f8da71f3eee95fd249cd34eacb676c95e54dee5
-SIZE (Wraphelp2.gz) = 3376
+MD5 (xorg/lib/libXdmcp-1.0.2.tar.bz2) = 10facf2bc7cbd5e5c1a698b8a210a582
+SHA256 (xorg/lib/libXdmcp-1.0.2.tar.bz2) = f3e50c1847599145c22784a2f15818821960652ee91d21d905817fb7c10f96a8
+SIZE (xorg/lib/libXdmcp-1.0.2.tar.bz2) = 220946
diff --git a/x11/libXdmcp/pkg-plist b/x11/libXdmcp/pkg-plist
index 3bad9a020fd7..bb8bf3bf2f61 100644
--- a/x11/libXdmcp/pkg-plist
+++ b/x11/libXdmcp/pkg-plist
@@ -1,7 +1,6 @@
include/X11/Xdmcp.h
-include/X11/Xdmcpconf.h
lib/libXdmcp.a
lib/libXdmcp.la
lib/libXdmcp.so
-lib/libXdmcp.so.0
+lib/libXdmcp.so.6
libdata/pkgconfig/xdmcp.pc
diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile
new file mode 100644
index 000000000000..c57f370e6692
--- /dev/null
+++ b/x11/libXevie/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for: libXevie
+# Date Created: 21 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= libXevie
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= The Xevie library
+
+XORG_CAT= lib
+USE_XORG= evieproto x11 xext xextproto xproto:both
+
+MAN3= Xevie.3 \
+ XevieEnd.3 \
+ XevieQueryVersion.3 \
+ XevieSelectInput.3 \
+ XevieSendEvent.3 \
+ XevieStart.3
+
+.include <bsd.port.mk>
diff --git a/x11/libXevie/distinfo b/x11/libXevie/distinfo
new file mode 100644
index 000000000000..841df862454f
--- /dev/null
+++ b/x11/libXevie/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXevie-1.0.2.tar.bz2) = 88e9bf535364e7c821ef4014fb1ca2dd
+SHA256 (xorg/lib/libXevie-1.0.2.tar.bz2) = ff70b81ad145932db2d206735cefcb698dadad241001df7ba6b97e8081d174da
+SIZE (xorg/lib/libXevie-1.0.2.tar.bz2) = 227721
diff --git a/x11/libXevie/pkg-descr b/x11/libXevie/pkg-descr
new file mode 100644
index 000000000000..a43d9c9d6a03
--- /dev/null
+++ b/x11/libXevie/pkg-descr
@@ -0,0 +1,4 @@
+This package contains libXevie, the X.Org Xevie library.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/libXevie/pkg-plist b/x11/libXevie/pkg-plist
new file mode 100644
index 000000000000..7bea8757d158
--- /dev/null
+++ b/x11/libXevie/pkg-plist
@@ -0,0 +1,6 @@
+include/X11/extensions/Xevie.h
+lib/libXevie.so.1
+lib/libXevie.so
+lib/libXevie.la
+lib/libXevie.a
+libdata/pkgconfig/xevie.pc
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index 8f9c9ec87ec8..eae965a1947f 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -6,27 +6,76 @@
#
PORTNAME= libXext
-PORTVERSION= 6.4.3
+PORTVERSION= 1.0.3
+PORTEPOCH= 1
CATEGORIES= x11
-MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
MAINTAINER= x11@FreeBSD.org
COMMENT= X11 Extension library
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions \
- ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11
-BUILD_DEPENDS= ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
+XORG_CAT= lib
+USE_XORG= xproto x11 xextproto:both xau
-CONFLICTS= XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2= yes
-PREFIX?= ${X11BASE}
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE= yes
-CFLAGS+= -DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB= yes
-USE_GNOME= gnomehack pkgconfig
+MAN3= DBE.3 \
+ DPMSCapable.3 \
+ DPMSDisable.3 \
+ DPMSEnable.3 \
+ DPMSForceLevel.3 \
+ DPMSGetTimeouts.3 \
+ DPMSGetVersion.3 \
+ DPMSInfo.3 \
+ DPMSQueryExtension.3 \
+ DPMSSetTimeouts.3 \
+ XShape.3 \
+ XShapeCombineMask.3 \
+ XShapeCombineRectangles.3 \
+ XShapeCombineRegion.3 \
+ XShapeCombineShape.3 \
+ XShapeGetRectangles.3 \
+ XShapeInputSelected.3 \
+ XShapeOffsetShape.3 \
+ XShapeQueryExtension.3 \
+ XShapeQueryExtents.3 \
+ XShapeQueryVersion.3 \
+ XShapeSelectInput.3 \
+ XcupGetReservedColormapEntries.3 \
+ XcupQueryVersion.3 \
+ XcupStoreColors.3 \
+ XdbeAllocateBackBufferName.3 \
+ XdbeBeginIdiom.3 \
+ XdbeDeallocateBackBufferName.3 \
+ XdbeEndIdiom.3 \
+ XdbeFreeVisualInfo.3 \
+ XdbeGetBackBufferAttributes.3 \
+ XdbeGetVisualInfo.3 \
+ XdbeQueryExtension.3 \
+ XdbeSwapBuffers.3 \
+ Xevi.3 \
+ XeviGetVisualInfo.3 \
+ XeviQueryExtension.3 \
+ XeviQueryVersion.3 \
+ Xmbuf.3 \
+ XmbufChangeBufferAttributes.3 \
+ XmbufChangeWindowAttributes.3 \
+ XmbufCreateBuffers.3 \
+ XmbufCreateStereoWindow.3 \
+ XmbufDestroyBuffers.3 \
+ XmbufDisplayBuffers.3 \
+ XmbufGetBufferAttributes.3 \
+ XmbufGetScreenInfo.3 \
+ XmbufGetVersion.3 \
+ XmbufGetWindowAttributes.3 \
+ XmbufQueryExtension.3 \
+ XShm.3 \
+ XShmAttach.3 \
+ XShmCreateImage.3 \
+ XShmCreatePixmap.3 \
+ XShmDetach.3 \
+ XShmGetEventBase.3 \
+ XShmGetImage.3 \
+ XShmPixmapFormat.3 \
+ XShmPutImage.3 \
+ XShmQueryExtension.3 \
+ XShmQueryVersion.3
.include <bsd.port.mk>
diff --git a/x11/libXext/distinfo b/x11/libXext/distinfo
index 08576db81621..5f63d025110a 100644
--- a/x11/libXext/distinfo
+++ b/x11/libXext/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXext-6.4.3.tar.bz2) = b7117194e69867905da9701dff56f3ee
-SHA256 (libXext-6.4.3.tar.bz2) = 04e6ed9b13b215814db0713c02f9f33d38e7761ffb9d80c637fa18d8e39dfb56
-SIZE (libXext-6.4.3.tar.bz2) = 216253
+MD5 (xorg/lib/libXext-1.0.3.tar.bz2) = 1bf6fa1c26f9957d7cc0bd90b038dfa6
+SHA256 (xorg/lib/libXext-1.0.3.tar.bz2) = 2d706baf206d1cb422c8e0ceb6c5a8546bc3f0587cf090eba51e75a295d9c3f0
+SIZE (xorg/lib/libXext-1.0.3.tar.bz2) = 262116
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index c0f65487f807..cd0b4029a3ba 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -6,27 +6,15 @@
#
PORTNAME= libXfixes
-PORTVERSION= 2.0.1
-PORTREVISION= 2
+PORTVERSION= 4.0.3
CATEGORIES= x11
-MASTER_SITES= http://xlibs.freedesktop.org/release/
MAINTAINER= x11@FreeBSD.org
COMMENT= X Fixes extension library
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/fixesext.pc:${PORTSDIR}/x11/fixesext \
- ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
- ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
+XORG_CAT= lib
+USE_XORG= x11 fixesproto:both xproto xextproto
-USE_BZIP2= yes
-PREFIX?= ${X11BASE}
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE= yes
-CFLAGS+= -DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB= yes
-USE_GNOME= gnomehack pkgconfig
+MAN3= Xfixes.3
.include <bsd.port.mk>
diff --git a/x11/libXfixes/distinfo b/x11/libXfixes/distinfo
index 73f0debbab59..7c852b9d00ab 100644
--- a/x11/libXfixes/distinfo
+++ b/x11/libXfixes/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXfixes-2.0.1.tar.bz2) = 89559cae2035b7e640c13075bea63e5e
-SHA256 (libXfixes-2.0.1.tar.bz2) = 8589df5613863557b26f872170f99f2ca3b0d01adbd33030fbd0ee2c3a1843c2
-SIZE (libXfixes-2.0.1.tar.bz2) = 186336
+MD5 (xorg/lib/libXfixes-4.0.3.tar.bz2) = 1990d19725a3c7f32290037f02d3737f
+SHA256 (xorg/lib/libXfixes-4.0.3.tar.bz2) = 547e093c5037c4b85ce653ce26f5bd70a97b177f9b582f5351a626d8e0a829dd
+SIZE (xorg/lib/libXfixes-4.0.3.tar.bz2) = 214287
diff --git a/x11/libXfixes/pkg-plist b/x11/libXfixes/pkg-plist
index fd7568ce3ace..f8e8b57a030d 100644
--- a/x11/libXfixes/pkg-plist
+++ b/x11/libXfixes/pkg-plist
@@ -2,5 +2,5 @@ include/X11/extensions/Xfixes.h
lib/libXfixes.a
lib/libXfixes.la
lib/libXfixes.so
-lib/libXfixes.so.1
+lib/libXfixes.so.3
libdata/pkgconfig/xfixes.pc
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index 517a414ae6c6..2f984bbaf3f6 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -6,29 +6,52 @@
#
PORTNAME= libXi
-PORTVERSION= 6.0.1
-PORTREVISION= 2
+PORTVERSION= 1.0.2
+PORTEPOCH= 1
CATEGORIES= x11
-MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
MAINTAINER= x11@FreeBSD.org
COMMENT= X Input extension library
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
- ${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
- ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
+XORG_CAT= lib
+USE_XORG= xproto x11 xext xextproto inputproto:both
-CONFLICTS= XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2= yes
-PREFIX?= ${X11BASE}
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE= yes
-CFLAGS+= -DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB= yes
-USE_GNOME= gnomehack pkgconfig
+MAN3= XAllowDeviceEvents.3 \
+ XChangeDeviceControl.3 \
+ XChangeDeviceDontPropagateList.3 \
+ XChangeDeviceKeyMapping.3 \
+ XChangeFeedbackControl.3 \
+ XChangeKeyboardDevice.3 \
+ XChangePointerDevice.3 \
+ XCloseDevice.3 \
+ XDeviceBell.3 \
+ XDeviceTimeCoord.3 \
+ XFreeDeviceList.3 \
+ XGetDeviceControl.3 \
+ XGetDeviceKeyMapping.3 \
+ XGetDeviceModifierMapping.3 \
+ XGetDeviceMotionEvents.3 \
+ XGetExtensionVersion.3 \
+ XGetFeedbackControl.3 \
+ XGetDeviceButtonMapping.3 \
+ XGetDeviceDontPropagateList.3 \
+ XGetDeviceFocus.3 \
+ XGetSelectedExtensionEvents.3 \
+ XGrabDevice.3 \
+ XGrabDeviceButton.3 \
+ XGrabDeviceKey.3 \
+ XListInputDevices.3 \
+ XOpenDevice.3 \
+ XQueryDeviceState.3 \
+ XSelectExtensionEvent.3 \
+ XSendExtensionEvent.3 \
+ XSetDeviceButtonMapping.3 \
+ XSetDeviceFocus.3 \
+ XSetDeviceMode.3 \
+ XSetDeviceModifierMapping.3 \
+ XSetDeviceValuators.3 \
+ XUngrabDeviceButton.3 \
+ XUngrabDeviceKey.3 \
+ XUngrabDevice.3 \
.include <bsd.port.mk>
diff --git a/x11/libXi/distinfo b/x11/libXi/distinfo
index 20580d81eb92..54f273204622 100644
--- a/x11/libXi/distinfo
+++ b/x11/libXi/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXi-6.0.1.tar.bz2) = 7e935a42428d63a387b3c048be0f2756
-SHA256 (libXi-6.0.1.tar.bz2) = 4e7ac30437bc038bc31642230d133c3c6ac9fc71f9afb657c6d6ac60572ecebd
-SIZE (libXi-6.0.1.tar.bz2) = 209914
+MD5 (xorg/lib/libXi-1.0.2.tar.bz2) = 4a5207a29a6b220e5462129854689844
+SHA256 (xorg/lib/libXi-1.0.2.tar.bz2) = 7e6339539d3d0a4fc95cc23ca2b13ae67dd783e011b3cc5ca76040e376bff57f
+SIZE (xorg/lib/libXi-1.0.2.tar.bz2) = 244920
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index b3a1d500e2f7..abdecb7159d9 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -6,27 +6,17 @@
#
PORTNAME= libXinerama
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.1
+PORTEPOCH= 1
CATEGORIES= x11
-MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
MAINTAINER= x11@FreeBSD.org
COMMENT= X11 Xinerama library
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \
- ${X11BASE}/libdata/pkgconfig/panoramixext.pc:${PORTSDIR}/x11/panoramixext
-BUILD_DEPENDS= ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
+XORG_CAT= lib
+USE_XORG= x11 xext xextproto xineramaproto:both
+USE_AUTOTOOLS= libtool:15
-CONFLICTS= XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2= yes
-PREFIX?= ${X11BASE}
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE= yes
-CFLAGS+= -DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB= yes
-USE_GNOME= gnomehack pkgconfig
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
.include <bsd.port.mk>
diff --git a/x11/libXinerama/distinfo b/x11/libXinerama/distinfo
index 40d1d516042d..65c4dc415f1b 100644
--- a/x11/libXinerama/distinfo
+++ b/x11/libXinerama/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXinerama-1.0.2.tar.bz2) = 637b2c5758d2de558670428d33178174
-SHA256 (libXinerama-1.0.2.tar.bz2) = 9a54a848503979665eecbaf51edf7175b82155a66e024ebf06be8c8a5477a9ea
-SIZE (libXinerama-1.0.2.tar.bz2) = 194913
+MD5 (xorg/lib/libXinerama-1.0.1.tar.bz2) = eae38dd6017dca95a756553995467aac
+SHA256 (xorg/lib/libXinerama-1.0.1.tar.bz2) = f242da28a517f810d454afc98289e52c52719e53822364a7249f82e9a9ad8f15
+SIZE (xorg/lib/libXinerama-1.0.1.tar.bz2) = 206173
diff --git a/x11/libXinerama/pkg-plist b/x11/libXinerama/pkg-plist
index d5c1548b7e6f..9915dec27089 100644
--- a/x11/libXinerama/pkg-plist
+++ b/x11/libXinerama/pkg-plist
@@ -1,4 +1,3 @@
-include/X11/extensions/Xinerama.h
lib/libXinerama.a
lib/libXinerama.la
lib/libXinerama.so
diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile
index a8a57807f0ed..7fe491916ed8 100644
--- a/x11/libXp/Makefile
+++ b/x11/libXp/Makefile
@@ -6,29 +6,52 @@
#
PORTNAME= libXp
-PORTVERSION= 6.0
+PORTVERSION= 1.0.0
+PORTEPOCH= 1
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/X11R6.7.0/src/ \
- ${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR= X11R6.7/tars
-DISTNAME= X11R6.7.0-src1
MAINTAINER= x11@FreeBSD.org
COMMENT= X print library
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \
- ${X11BASE}/include/X11/extensions/Print.h:${PORTSDIR}/x11/printext
-BUILD_DEPENDS= ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
+XORG_CAT= lib
+USE_XORG= x11 xext xextproto xau printproto:both
+USE_AUTOTOOLS= libtool:15
-CONFLICTS= XFree86-libraries-* xorg-libraries-*
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-USE_IMAKE= YES
-USE_X_PREFIX= no
-PREFIX?= ${X11BASE}
-DIST_SUBDIR= xorg
-INSTALLS_SHLIB= yes
-WRKSRC= ${WRKDIR}/xc/lib/Xp
-EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/lib/Xp
+MAN3= XpCancelDoc.3 \
+ XpCancelJob.3 \
+ XpCancelPage.3 \
+ XpCreateContext.3 \
+ XpDestroyContext.3 \
+ XpEndDoc.3 \
+ XpEndJob.3 \
+ XpEndPage.3 \
+ XpFreePrinterList.3 \
+ XpGetAttributes.3 \
+ XpGetContext.3 \
+ XpGetDocumentData.3 \
+ XpGetImageResolution.3 \
+ XpGetLocaleHinter.3 \
+ XpGetOneAttribute.3 \
+ XpGetPageDimensions.3 \
+ XpGetPdmStartParams.3 \
+ XpGetPrinterList.3 \
+ XpGetScreenOfContext.3 \
+ XpInputSelected.3 \
+ XpPutDocumentData.3 \
+ XpQueryExtension.3 \
+ XpQueryScreens.3 \
+ XpQueryVersion.3 \
+ XpRehashPrinterList.3 \
+ XpSelectInput.3 \
+ XpSetAttributes.3 \
+ XpSetContext.3 \
+ XpSetImageResolution.3 \
+ XpSetLocaleHinter.3 \
+ XpStartDoc.3 \
+ XpStartJob.3 \
+ XpStartPage.3 \
+ libXp.3
.include <bsd.port.mk>
diff --git a/x11/libXp/distinfo b/x11/libXp/distinfo
index 59603c139556..24c0ab242f10 100644
--- a/x11/libXp/distinfo
+++ b/x11/libXp/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
-SHA256 (xorg/X11R6.7.0-src1.tar.gz) = e2872ae9c773e76139cfe7c97bdfd1963e41bf3b307230fca711c9f005a90dbb
-SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
+MD5 (xorg/lib/libXp-1.0.0.tar.bz2) = 0f4ac39108c1ae8c443cdfac259b58fa
+SHA256 (xorg/lib/libXp-1.0.0.tar.bz2) = 7e64b1550ce85b05762e960459ac676a0406c786756b200ff29c57f84bce9cae
+SIZE (xorg/lib/libXp-1.0.0.tar.bz2) = 244470
diff --git a/x11/libXp/pkg-plist b/x11/libXp/pkg-plist
index ec3568cca799..ba86a7f4b48a 100644
--- a/x11/libXp/pkg-plist
+++ b/x11/libXp/pkg-plist
@@ -1,3 +1,5 @@
lib/libXp.a
+lib/libXp.la
lib/libXp.so
lib/libXp.so.6
+libdata/pkgconfig/xp.pc
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index 04f3733852d3..b2020c107131 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -6,28 +6,15 @@
#
PORTNAME= libXpm
-PORTVERSION= 3.5.1
-PORTREVISION= 1
+PORTVERSION= 3.5.6
CATEGORIES= x11
-MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
MAINTAINER= x11@FreeBSD.org
COMMENT= X Pixmap library
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
- ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
+XORG_CAT= lib
+USE_XORG= xproto x11
-CONFLICTS= XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2= yes
-PREFIX?= ${X11BASE}
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CFLAGS+= -DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB= yes
-USE_GNOME= gnomehack pkgconfig
+MAN1= cxpm.1
.include <bsd.port.mk>
diff --git a/x11/libXpm/distinfo b/x11/libXpm/distinfo
index a9cc51f58ecc..43dea7b5eacf 100644
--- a/x11/libXpm/distinfo
+++ b/x11/libXpm/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXpm-3.5.1.tar.bz2) = 733e20a60c3343531b50bcc48348fd3e
-SHA256 (libXpm-3.5.1.tar.bz2) = 7af7eb6f3066b35ad48475cfa862f112f963e205031eba09f1fa0f909d073031
-SIZE (libXpm-3.5.1.tar.bz2) = 226124
+MD5 (xorg/lib/libXpm-3.5.6.tar.bz2) = 37b7d1826c6a02107269632a93b8791f
+SHA256 (xorg/lib/libXpm-3.5.6.tar.bz2) = 2d5c5242b8417db6aa758e5be387de33385d9960ff21c801af7d6a4730b4fd0d
+SIZE (xorg/lib/libXpm-3.5.6.tar.bz2) = 371577
diff --git a/x11/libXpm/files/patch-xpm-sec.patch4 b/x11/libXpm/files/patch-xpm-sec.patch4
deleted file mode 100644
index 5bed68fa5367..000000000000
--- a/x11/libXpm/files/patch-xpm-sec.patch4
+++ /dev/null
@@ -1,473 +0,0 @@
-Index: xc/lib/Attrib.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/Attrib.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 Attrib.c
---- lib/Attrib.c 15 Feb 2001 07:59:10 -0000 1.1.1.1
-+++ lib/Attrib.c 31 Aug 2004 23:28:59 -0000
-@@ -35,7 +35,7 @@
- #include "XpmI.h"
-
- /* 3.2 backward compatibility code */
--LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors,
-+LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors,
- XpmColor ***oldct));
-
- LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors));
-@@ -46,11 +46,14 @@
- static int
- CreateOldColorTable(ct, ncolors, oldct)
- XpmColor *ct;
-- int ncolors;
-+ unsigned int ncolors;
- XpmColor ***oldct;
- {
- XpmColor **colorTable, **color;
- int a;
-+
-+ if (ncolors >= SIZE_MAX / sizeof(XpmColor *))
-+ return XpmNoMemory;
-
- colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *));
- if (!colorTable) {
-Index: xc/lib/CrDatFrI.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/CrDatFrI.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 CrDatFrI.c
---- lib/CrDatFrI.c 19 Jan 2002 11:08:43 -0000 1.1.1.2
-+++ lib/CrDatFrI.c 31 Aug 2004 23:28:59 -0000
-@@ -124,6 +124,8 @@
- */
- header_nlines = 1 + image->ncolors;
- header_size = sizeof(char *) * header_nlines;
-+ if (header_size >= SIZE_MAX / sizeof(char *))
-+ return (XpmNoMemory);
- header = (char **) XpmCalloc(header_size, sizeof(char *));
- if (!header)
- return (XpmNoMemory);
-Index: xc/lib/WrFFrI.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/WrFFrI.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 WrFFrI.c
---- lib/WrFFrI.c 19 Jan 2002 11:08:43 -0000 1.1.1.2
-+++ lib/WrFFrI.c 31 Aug 2004 23:28:59 -0000
-@@ -248,6 +248,8 @@
- unsigned int x, y, h;
-
- h = height - 1;
-+ if (cpp != 0 && width >= (SIZE_MAX - 3)/cpp)
-+ return XpmNoMemory;
- p = buf = (char *) XpmMalloc(width * cpp + 3);
- if (!buf)
- return (XpmNoMemory);
-Index: xc/lib/XpmI.h
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/XpmI.h,v
-retrieving revision 1.6
-diff -u -r1.6 XpmI.h
---- lib/XpmI.h 13 Feb 2004 22:40:56 -0000 1.6
-+++ lib/XpmI.h 31 Aug 2004 23:28:59 -0000
-@@ -86,6 +86,18 @@
- boundCheckingCalloc((long)(nelem),(long) (elsize))
- #endif
-
-+#if defined(SCO) || defined(__USLC__)
-+#include <stdint.h> /* For SIZE_MAX */
-+#endif
-+#include <limits.h>
-+#ifndef SIZE_MAX
-+# ifdef ULONG_MAX
-+# define SIZE_MAX ULONG_MAX
-+# else
-+# define SIZE_MAX UINT_MAX
-+# endif
-+#endif
-+
- #define XPMMAXCMTLEN BUFSIZ
- typedef struct {
- unsigned int type;
-@@ -187,9 +199,9 @@
- } *xpmHashAtom;
-
- typedef struct {
-- int size;
-- int limit;
-- int used;
-+ unsigned int size;
-+ unsigned int limit;
-+ unsigned int used;
- xpmHashAtom *atomTable;
- } xpmHashTable;
-
-Index: xc/lib/create.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/create.c,v
-retrieving revision 1.3
-diff -u -r1.3 create.c
---- lib/create.c 13 Feb 2004 22:40:56 -0000 1.3
-+++ lib/create.c 31 Aug 2004 23:28:59 -0000
-@@ -1,3 +1,4 @@
-+/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */
- /*
- * Copyright (C) 1989-95 GROUPE BULL
- *
-@@ -816,6 +817,9 @@
-
- ErrorStatus = XpmSuccess;
-
-+ if (image->ncolors >= SIZE_MAX / sizeof(Pixel))
-+ return (XpmNoMemory);
-+
- /* malloc pixels index tables */
- image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors);
- if (!image_pixels)
-@@ -988,6 +992,8 @@
- return (XpmNoMemory);
-
- #if !defined(FOR_MSW) && !defined(AMIGA)
-+ if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height)
-+ return XpmNoMemory;
- /* now that bytes_per_line must have been set properly alloc data */
- (*image_return)->data =
- (char *) XpmMalloc((*image_return)->bytes_per_line * height);
-@@ -2055,6 +2061,9 @@
- xpmGetCmt(data, &colors_cmt);
-
- /* malloc pixels index tables */
-+ if (ncolors >= SIZE_MAX / sizeof(Pixel))
-+ return XpmNoMemory;
-+
- image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors);
- if (!image_pixels)
- RETURN(XpmNoMemory);
-@@ -2309,7 +2318,8 @@
- }
- obm = SelectObject(*dc, image->bitmap);
- #endif
--
-+ if (ncolors > 256)
-+ return (XpmFileInvalid);
-
- bzero((char *)colidx, 256 * sizeof(short));
- for (a = 0; a < ncolors; a++)
-@@ -2414,6 +2424,9 @@
- {
- char *s;
- char buf[BUFSIZ];
-+
-+ if (cpp >= sizeof(buf))
-+ return (XpmFileInvalid);
-
- buf[cpp] = '\0';
- if (USE_HASHTABLE) {
-Index: xc/lib/data.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/data.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 data.c
---- lib/data.c 19 Jan 2002 11:08:44 -0000 1.1.1.2
-+++ lib/data.c 31 Aug 2004 23:28:59 -0000
-@@ -375,7 +375,7 @@
- {
- if (!data->type)
- *cmt = NULL;
-- else if (data->CommentLength) {
-+ else if (data->CommentLength != 0 && data->CommentLength < SIZE_MAX - 1) {
- *cmt = (char *) XpmMalloc(data->CommentLength + 1);
- strncpy(*cmt, data->Comment, data->CommentLength);
- (*cmt)[data->CommentLength] = '\0';
-Index: xc/lib/hashtab.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/hashtab.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 hashtab.c
---- lib/hashtab.c 15 Feb 2001 07:59:10 -0000 1.1.1.1
-+++ lib/hashtab.c 31 Aug 2004 23:28:59 -0000
-@@ -135,7 +135,7 @@
- xpmHashTable *table;
- {
- xpmHashAtom *atomTable = table->atomTable;
-- int size = table->size;
-+ unsigned int size = table->size;
- xpmHashAtom *t, *p;
- int i;
- int oldSize = size;
-@@ -144,6 +144,8 @@
- HASH_TABLE_GROWS
- table->size = size;
- table->limit = size / 3;
-+ if (size >= SIZE_MAX / sizeof(*atomTable))
-+ return (XpmNoMemory);
- atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable));
- if (!atomTable)
- return (XpmNoMemory);
-@@ -204,6 +206,8 @@
- table->size = INITIAL_HASH_SIZE;
- table->limit = table->size / 3;
- table->used = 0;
-+ if (table->size >= SIZE_MAX / sizeof(*atomTable))
-+ return (XpmNoMemory);
- atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable));
- if (!atomTable)
- return (XpmNoMemory);
-Index: xc/lib/parse.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/parse.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 parse.c
---- lib/parse.c 19 Jan 2002 11:08:44 -0000 1.1.1.2
-+++ lib/parse.c 31 Aug 2004 23:28:59 -0000
-@@ -1,3 +1,4 @@
-+/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */
- /*
- * Copyright (C) 1989-95 GROUPE BULL
- *
-@@ -44,6 +45,24 @@
- #include <ctype.h>
- #include <string.h>
-
-+#ifdef HAS_STRLCAT
-+# define STRLCAT(dst, src, dstsize) { \
-+ if (strlcat(dst, src, dstsize) >= (dstsize)) \
-+ return (XpmFileInvalid); }
-+# define STRLCPY(dst, src, dstsize) { \
-+ if (strlcpy(dst, src, dstsize) >= (dstsize)) \
-+ return (XpmFileInvalid); }
-+#else
-+# define STRLCAT(dst, src, dstsize) { \
-+ if ((strlen(dst) + strlen(src)) < (dstsize)) \
-+ strcat(dst, src); \
-+ else return (XpmFileInvalid); }
-+# define STRLCPY(dst, src, dstsize) { \
-+ if (strlen(src) < (dstsize)) \
-+ strcpy(dst, src); \
-+ else return (XpmFileInvalid); }
-+#endif
-+
- LFUNC(ParsePixels, int, (xpmData *data, unsigned int width,
- unsigned int height, unsigned int ncolors,
- unsigned int cpp, XpmColor *colorTable,
-@@ -66,7 +85,7 @@
- unsigned int *extensions;
- {
- unsigned int l;
-- char buf[BUFSIZ];
-+ char buf[BUFSIZ + 1];
-
- if (!data->format) { /* XPM 2 or 3 */
-
-@@ -175,10 +194,10 @@
- XpmColor **colorTablePtr;
- xpmHashTable *hashtable;
- {
-- unsigned int key = 0, l, a, b;
-+ unsigned int key = 0, l, a, b, len;
- unsigned int curkey; /* current color key */
- unsigned int lastwaskey; /* key read */
-- char buf[BUFSIZ];
-+ char buf[BUFSIZ+1];
- char curbuf[BUFSIZ]; /* current buffer */
- char **sptr, *s;
- XpmColor *color;
-@@ -186,6 +205,8 @@
- char **defaults;
- int ErrorStatus;
-
-+ if (ncolors >= SIZE_MAX / sizeof(XpmColor))
-+ return (XpmNoMemory);
- colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor));
- if (!colorTable)
- return (XpmNoMemory);
-@@ -197,6 +218,10 @@
- /*
- * read pixel value
- */
-+ if (cpp >= SIZE_MAX - 1) {
-+ xpmFreeColorTable(colorTable, ncolors);
-+ return (XpmNoMemory);
-+ }
- color->string = (char *) XpmMalloc(cpp + 1);
- if (!color->string) {
- xpmFreeColorTable(colorTable, ncolors);
-@@ -234,13 +259,14 @@
- }
- if (!lastwaskey && key < NKEYS) { /* open new key */
- if (curkey) { /* flush string */
-- s = (char *) XpmMalloc(strlen(curbuf) + 1);
-+ len = strlen(curbuf) + 1;
-+ s = (char *) XpmMalloc(len);
- if (!s) {
- xpmFreeColorTable(colorTable, ncolors);
- return (XpmNoMemory);
- }
- defaults[curkey] = s;
-- strcpy(s, curbuf);
-+ memcpy(s, curbuf, len);
- }
- curkey = key + 1; /* set new key */
- *curbuf = '\0'; /* reset curbuf */
-@@ -251,9 +277,9 @@
- return (XpmFileInvalid);
- }
- if (!lastwaskey)
-- strcat(curbuf, " "); /* append space */
-+ STRLCAT(curbuf, " ", sizeof(curbuf)); /* append space */
- buf[l] = '\0';
-- strcat(curbuf, buf);/* append buf */
-+ STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */
- lastwaskey = 0;
- }
- }
-@@ -261,12 +287,13 @@
- xpmFreeColorTable(colorTable, ncolors);
- return (XpmFileInvalid);
- }
-- s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1);
-+ len = strlen(curbuf) + 1;
-+ s = defaults[curkey] = (char *) XpmMalloc(len);
- if (!s) {
- xpmFreeColorTable(colorTable, ncolors);
- return (XpmNoMemory);
- }
-- strcpy(s, curbuf);
-+ memcpy(s, curbuf, len);
- }
- } else { /* XPM 1 */
- /* get to the beginning of the first string */
-@@ -279,6 +306,10 @@
- /*
- * read pixel value
- */
-+ if (cpp >= SIZE_MAX - 1) {
-+ xpmFreeColorTable(colorTable, ncolors);
-+ return (XpmNoMemory);
-+ }
- color->string = (char *) XpmMalloc(cpp + 1);
- if (!color->string) {
- xpmFreeColorTable(colorTable, ncolors);
-@@ -307,16 +338,17 @@
- *curbuf = '\0'; /* init curbuf */
- while ((l = xpmNextWord(data, buf, BUFSIZ))) {
- if (*curbuf != '\0')
-- strcat(curbuf, " ");/* append space */
-+ STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */
- buf[l] = '\0';
-- strcat(curbuf, buf); /* append buf */
-+ STRLCAT(curbuf, buf, sizeof(curbuf)); /* append buf */
- }
-- s = (char *) XpmMalloc(strlen(curbuf) + 1);
-+ len = strlen(curbuf) + 1;
-+ s = (char *) XpmMalloc(len);
- if (!s) {
- xpmFreeColorTable(colorTable, ncolors);
- return (XpmNoMemory);
- }
-- strcpy(s, curbuf);
-+ memcpy(s, curbuf, len);
- color->c_color = s;
- *curbuf = '\0'; /* reset curbuf */
- if (a < ncolors - 1)
-@@ -341,6 +373,9 @@
- unsigned int *iptr, *iptr2;
- unsigned int a, x, y;
-
-+ if ((height > 0 && width >= SIZE_MAX / height) ||
-+ width * height >= SIZE_MAX / sizeof(unsigned int))
-+ return XpmNoMemory;
- #ifndef FOR_MSW
- iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height);
- #else
-@@ -364,6 +399,9 @@
- {
- unsigned short colidx[256];
-
-+ if (ncolors > 256)
-+ return (XpmFileInvalid);
-+
- bzero((char *)colidx, 256 * sizeof(short));
- for (a = 0; a < ncolors; a++)
- colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
-@@ -441,6 +479,9 @@
- {
- char *s;
- char buf[BUFSIZ];
-+
-+ if (cpp >= sizeof(buf))
-+ return (XpmFileInvalid);
-
- buf[cpp] = '\0';
- if (USE_HASHTABLE) {
-Index: xc/lib/scan.c
-===================================================================
-RCS file: /cvs/OpenBSD/XF4/xc/lib/scan.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 scan.c
---- lib/scan.c 19 Jan 2002 11:08:44 -0000 1.1.1.2
-+++ lib/scan.c 31 Aug 2004 23:28:59 -0000
-@@ -107,7 +107,8 @@
- LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp,
- XpmAttributes *attributes));
-
--LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors,
-+LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors,
-+ unsigned int ncolors,
- Pixel *pixels, unsigned int mask,
- unsigned int cpp, XpmAttributes *attributes));
-
-@@ -232,11 +233,17 @@
- else
- cpp = 0;
-
-+ if ((height > 0 && width >= SIZE_MAX / height) ||
-+ width * height >= SIZE_MAX / sizeof(unsigned int))
-+ RETURN(XpmNoMemory);
- pmap.pixelindex =
- (unsigned int *) XpmCalloc(width * height, sizeof(unsigned int));
- if (!pmap.pixelindex)
- RETURN(XpmNoMemory);
-
-+ if (pmap.size >= SIZE_MAX / sizeof(Pixel))
-+ RETURN(XpmNoMemory);
-+
- pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size);
- if (!pmap.pixels)
- RETURN(XpmNoMemory);
-@@ -301,7 +308,8 @@
- * get rgb values and a string of char, and possibly a name for each
- * color
- */
--
-+ if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor))
-+ RETURN(XpmNoMemory);
- colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor));
- if (!colorTable)
- RETURN(XpmNoMemory);
-@@ -360,6 +368,8 @@
-
- /* first get a character string */
- a = 0;
-+ if (cpp >= SIZE_MAX - 1)
-+ return (XpmNoMemory);
- if (!(s = color->string = (char *) XpmMalloc(cpp + 1)))
- return (XpmNoMemory);
- *s++ = printable[c = a % MAXPRINTABLE];
-@@ -407,7 +417,7 @@
- ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
- Display *display;
- XpmColor *colors;
-- int ncolors;
-+ unsigned int ncolors;
- Pixel *pixels;
- unsigned int mask;
- unsigned int cpp;
-@@ -451,6 +461,8 @@
- }
-
- /* first get character strings and rgb values */
-+ if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1)
-+ return (XpmNoMemory);
- xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors);
- if (!xcolors)
- return (XpmNoMemory);
diff --git a/x11/libXpm/pkg-plist b/x11/libXpm/pkg-plist
index 2c6a7f8a0173..2f09596f91ed 100644
--- a/x11/libXpm/pkg-plist
+++ b/x11/libXpm/pkg-plist
@@ -1,3 +1,4 @@
+bin/cxpm
include/X11/xpm.h
lib/libXpm.a
lib/libXpm.la
diff --git a/x11/libXprintAppUtil/Makefile b/x11/libXprintAppUtil/Makefile
new file mode 100644
index 000000000000..2f6878d6898d
--- /dev/null
+++ b/x11/libXprintAppUtil/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for: libXprintAppUtil
+# Date Created: 21 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= libXprintAppUtil
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= The XprintAppUtil library
+
+XORG_CAT= lib
+USE_XORG= printproto x11 xau xp xprintutil xproto:both
+USE_AUTOTOOLS= libtool:15
+
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+
+.include <bsd.port.mk>
diff --git a/x11/libXprintAppUtil/distinfo b/x11/libXprintAppUtil/distinfo
new file mode 100644
index 000000000000..c7fcdbeff84c
--- /dev/null
+++ b/x11/libXprintAppUtil/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXprintAppUtil-1.0.1.tar.bz2) = d2de510570aa6714681109b2ba178365
+SHA256 (xorg/lib/libXprintAppUtil-1.0.1.tar.bz2) = 24606446003379dbf499ef57e9294ce622c0f7f8a8f10834db61dc59ef690aa5
+SIZE (xorg/lib/libXprintAppUtil-1.0.1.tar.bz2) = 208379
diff --git a/x11/libXprintAppUtil/pkg-descr b/x11/libXprintAppUtil/pkg-descr
new file mode 100644
index 000000000000..39649db329d0
--- /dev/null
+++ b/x11/libXprintAppUtil/pkg-descr
@@ -0,0 +1,5 @@
+This package contains libXprintAppUtil, a group of Xprint application
+utility routines for X.Org.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/libXprintAppUtil/pkg-plist b/x11/libXprintAppUtil/pkg-plist
new file mode 100644
index 000000000000..ccbbd7595dfa
--- /dev/null
+++ b/x11/libXprintAppUtil/pkg-plist
@@ -0,0 +1,7 @@
+include/X11/XprintAppUtil/xpapputil.h
+lib/libXprintAppUtil.so.1
+lib/libXprintAppUtil.so
+lib/libXprintAppUtil.la
+lib/libXprintAppUtil.a
+libdata/pkgconfig/xprintapputil.pc
+@dirrm include/X11/XprintAppUtil
diff --git a/x11/libXprintUtil/Makefile b/x11/libXprintUtil/Makefile
new file mode 100644
index 000000000000..b90e0d8c5941
--- /dev/null
+++ b/x11/libXprintUtil/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for: libXprintUtil
+# Date Created: 21 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= libXprintUtil
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= The XprintUtil library
+
+XORG_CAT= lib
+USE_XORG= printproto:both x11 xau xp xt
+USE_AUTOTOOLS= libtool:15
+
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+
+.include <bsd.port.mk>
diff --git a/x11/libXprintUtil/distinfo b/x11/libXprintUtil/distinfo
new file mode 100644
index 000000000000..5c4664f717b7
--- /dev/null
+++ b/x11/libXprintUtil/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXprintUtil-1.0.1.tar.bz2) = 22584f1aab1deba253949b562d1f0f45
+SHA256 (xorg/lib/libXprintUtil-1.0.1.tar.bz2) = 72b6ae0420b9601f55be147e8d068f670b951ae73a81423ba25be5875d826e6c
+SIZE (xorg/lib/libXprintUtil-1.0.1.tar.bz2) = 223325
diff --git a/x11/libXprintUtil/pkg-descr b/x11/libXprintUtil/pkg-descr
new file mode 100644
index 000000000000..0f4ee01be5e7
--- /dev/null
+++ b/x11/libXprintUtil/pkg-descr
@@ -0,0 +1,5 @@
+This package contains libXprintUtil, a group of Xprint application utility
+routines for X.Org.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/libXprintUtil/pkg-plist b/x11/libXprintUtil/pkg-plist
new file mode 100644
index 000000000000..c7663f7937b1
--- /dev/null
+++ b/x11/libXprintUtil/pkg-plist
@@ -0,0 +1,7 @@
+include/X11/XprintUtil/xprintutil.h
+lib/libXprintUtil.a
+lib/libXprintUtil.la
+lib/libXprintUtil.so
+lib/libXprintUtil.so.1
+libdata/pkgconfig/xprintutil.pc
+@dirrm include/X11/XprintUtil
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 0b50160596e0..ba1db1581572 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -6,31 +6,31 @@
#
PORTNAME= libXrandr
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.2.1
CATEGORIES= x11
-MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
MAINTAINER= x11@FreeBSD.org
COMMENT= X Resize and Rotate extension library
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \
- ${X11BASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/randr.pc:${PORTSDIR}/x11/randrext \
- ${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions \
- ${X11BASE}/libdata/pkgconfig/render.pc:${PORTSDIR}/x11/renderext \
- ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
+XORG_CAT= lib
+USE_XORG= x11 randrproto:both xext xextproto xrender renderproto
-CONFLICTS= XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2= yes
-PREFIX?= ${X11BASE}
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE= yes
-CFLAGS+= -DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB= yes
-USE_GNOME= gnomehack pkgconfig
+MAN3= Xrandr.3 \
+ XRRConfig.3 \
+ XRRConfigCurrentConfiguration.3 \
+ XRRConfigCurrentRate.3 \
+ XRRConfigRates.3 \
+ XRRConfigRotations.3 \
+ XRRConfigSizes.3 \
+ XRRConfigTimes.3 \
+ XRRFreeScreenConfigInfo.3 \
+ XRRGetScreenInfo.3 \
+ XRRQueryExtension.3 \
+ XRRQueryVersion.3 \
+ XRRRootToScreen.3 \
+ XRRScreenConfig.3 \
+ XRRSelectInput.3 \
+ XRRSetScreenConfig.3 \
+ XRRSetScreenConfigAndRate.3
.include <bsd.port.mk>
diff --git a/x11/libXrandr/distinfo b/x11/libXrandr/distinfo
index a8099ad3ee8f..4b12f1fbaf10 100644
--- a/x11/libXrandr/distinfo
+++ b/x11/libXrandr/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXrandr-1.0.2.tar.bz2) = 82dcb782307f708ba0155bd952168796
-SHA256 (libXrandr-1.0.2.tar.bz2) = c0f1b4474ac1d6f42a5e9ab5295b3bc8ea184158f119f9d28b60b23fc611f2b6
-SIZE (libXrandr-1.0.2.tar.bz2) = 187231
+MD5 (xorg/lib/libXrandr-1.2.1.tar.bz2) = 5860360f5b038cc728f388f875ce525d
+SHA256 (xorg/lib/libXrandr-1.2.1.tar.bz2) = 2d2df642eb8e0527936cdf4ed1c096f69df53e9b95e2532c8ed0cabd06a45407
+SIZE (xorg/lib/libXrandr-1.2.1.tar.bz2) = 220679
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index 145ee5ed6ab3..6b996ca1cdc6 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -6,30 +6,13 @@
#
PORTNAME= libXrender
-PORTVERSION= 0.8.4
-PORTREVISION= 3
+PORTVERSION= 0.9.2
CATEGORIES= x11
-MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
MAINTAINER= x11@FreeBSD.org
COMMENT= X Render extension library
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions \
- ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
- ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/render.pc:${PORTSDIR}/x11/renderext \
- ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
-
-CONFLICTS= XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2= yes
-PREFIX?= ${X11BASE}
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE= yes
-CFLAGS+= -DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB= yes
-USE_GNOME= gnomehack pkgconfig
+XORG_CAT= lib
+USE_XORG= x11 renderproto:both
.include <bsd.port.mk>
diff --git a/x11/libXrender/distinfo b/x11/libXrender/distinfo
index 1dcfe0300dbe..f4a9c28b4f70 100644
--- a/x11/libXrender/distinfo
+++ b/x11/libXrender/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXrender-0.8.4.tar.bz2) = c745339dbe5f05cff8950b71a739e34c
-SHA256 (libXrender-0.8.4.tar.bz2) = d0d0b12311f4dfa44e9455fb2d3a4e1b314afc6683ab7972507cc390e88c07bb
-SIZE (libXrender-0.8.4.tar.bz2) = 205660
+MD5 (xorg/lib/libXrender-0.9.2.tar.bz2) = 2f1b2c6e8dcbcb6d760e59f445abd92c
+SHA256 (xorg/lib/libXrender-0.9.2.tar.bz2) = 0f749183ab1a0ece14d33c3299b3f70893122349c0bfa9d7bd0e66ce19d1802a
+SIZE (xorg/lib/libXrender-0.9.2.tar.bz2) = 246023
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index 768b334db274..e4a52e9f8e3e 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -6,31 +6,20 @@
#
PORTNAME= libXres
-PORTVERSION= 1.0.1
-PORTREVISION= 4
+PORTVERSION= 1.0.3
CATEGORIES= x11
-MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
MAINTAINER= x11@FreeBSD.org
COMMENT= X Resource usage library
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
- ${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/resourceext.pc:${PORTSDIR}/x11/resourceext \
- ${X11BASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto \
- ${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions \
- ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
+XORG_CAT= lib
+USE_XORG= x11 xext xextproto resourceproto
-CONFLICTS= XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2= yes
-PREFIX?= ${X11BASE}
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CFLAGS+= -DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB= yes
-USE_GNOME= gnomehack pkgconfig
+MAN3= XRes.3 \
+ XResQueryClients.3 \
+ XResQueryClientPixmapBytes.3 \
+ XResQueryClientResources.3 \
+ XResQueryExtension.3 \
+ XResQueryVersion.3
.include <bsd.port.mk>
diff --git a/x11/libXres/distinfo b/x11/libXres/distinfo
index 5126723be037..71c6e58e9d51 100644
--- a/x11/libXres/distinfo
+++ b/x11/libXres/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXres-1.0.1.tar.bz2) = a2d27531a768b63fe42674a41a3883f9
-SHA256 (libXres-1.0.1.tar.bz2) = 2e10e71ff9d51d385c32d2691732d94e14df4f015911883db29fffe35c024427
-SIZE (libXres-1.0.1.tar.bz2) = 175509
+MD5 (xorg/lib/libXres-1.0.3.tar.bz2) = de66ffb657aba64c9d6dbdeabb757f3e
+SHA256 (xorg/lib/libXres-1.0.3.tar.bz2) = a6d5ba7573f5ec0f091095f01b51d1e671dd0f14acb5b8559cdf366e398a0230
+SIZE (xorg/lib/libXres-1.0.3.tar.bz2) = 218203
diff --git a/x11/libXres/files/patch-Makefile.in b/x11/libXres/files/patch-Makefile.in
deleted file mode 100644
index 70baaf9798e4..000000000000
--- a/x11/libXres/files/patch-Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- Makefile.in.orig Thu Jan 15 08:29:17 2004
-+++ Makefile.in Sun Jan 22 20:04:25 2006
-@@ -168,3 +168,3 @@
-
--libXRes_la_LIBADD = @RESOURCE_EXT_LIBS@ @X_LIBS@
-+libXRes_la_LIBADD = @RESOURCEEXT_LIBS@ @XRES_LIBS@
-
diff --git a/x11/libXres/pkg-plist b/x11/libXres/pkg-plist
index eb751f99b93f..6e609b484d6c 100644
--- a/x11/libXres/pkg-plist
+++ b/x11/libXres/pkg-plist
@@ -2,5 +2,7 @@ include/X11/extensions/XRes.h
lib/libXRes.a
lib/libXRes.la
lib/libXRes.so
-lib/libXRes.so.0
+lib/libXRes.so.1
libdata/pkgconfig/xres.pc
+@dirrm share/X11/app-defaults
+@exec mkdir -p %D/share/X11/app-defaults 2>/dev/null
diff --git a/x11/libXtrans/Makefile b/x11/libXtrans/Makefile
index 66d7cdcef75a..132bdd2884e5 100644
--- a/x11/libXtrans/Makefile
+++ b/x11/libXtrans/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libXtrans
PORTVERSION= 0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://xlibs.freedesktop.org/release/
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
new file mode 100644
index 000000000000..fb533e731e15
--- /dev/null
+++ b/x11/libXtst/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for: libXtst
+# Date Created: 8 Feb 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= libXtst
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X Test extension
+
+XORG_CAT= lib
+USE_XORG= x11 xext recordproto:both xextproto inputproto
+USE_AUTOTOOLS= libtool:15
+
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+
+.include <bsd.port.mk>
diff --git a/x11/libXtst/distinfo b/x11/libXtst/distinfo
new file mode 100644
index 000000000000..8979732ce83d
--- /dev/null
+++ b/x11/libXtst/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXtst-1.0.1.tar.bz2) = 0ba567531ff9ac1ff9da0653f8a161b3
+SHA256 (xorg/lib/libXtst-1.0.1.tar.bz2) = 7348de3c303075df4457b15b47e75096d909e9ffada80773c660bb956ceea882
+SIZE (xorg/lib/libXtst-1.0.1.tar.bz2) = 212511
diff --git a/x11/libXtst/pkg-descr b/x11/libXtst/pkg-descr
new file mode 100644
index 000000000000..f8549ce6ce20
--- /dev/null
+++ b/x11/libXtst/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the XKB file library.
+
+WWW: http://www.freedesktop.org/Software/xorg
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/x11/libXtst/pkg-plist b/x11/libXtst/pkg-plist
new file mode 100644
index 000000000000..03c03012321d
--- /dev/null
+++ b/x11/libXtst/pkg-plist
@@ -0,0 +1,6 @@
+lib/libXtst.a
+lib/libXtst.la
+lib/libXtst.so
+lib/libXtst.so.6
+libdata/pkgconfig/xtst.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index b81e24aa87a3..02f6ad9af1fd 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -6,26 +6,35 @@
#
PORTNAME= libXv
-PORTVERSION= 2.2.2
+PORTVERSION= 1.0.3
+PORTEPOCH= 1
CATEGORIES= x11
-MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
MAINTAINER= x11@FreeBSD.org
COMMENT= X Video Extension library
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext
-BUILD_DEPENDS= ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
+XORG_CAT= lib
+USE_XORG= x11 xext xextproto videoproto:both
-CONFLICTS= XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2= yes
-PREFIX?= ${X11BASE}
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE= yes
-CFLAGS+= -DMALLOC_0_RETURNS_NULL
-INSTALLS_SHLIB= yes
-USE_GNOME= gnomehack pkgconfig
+MAN3= Xv.3 \
+ XvFreeAdaptorInfo.3 \
+ XvFreeEncodingInfo.3 \
+ XvGetPortAttribute.3 \
+ XvGetStill.3 \
+ XvGetVideo.3 \
+ XvGrabPort.3 \
+ XvPortNotify.3 \
+ XvPutStill.3 \
+ XvPutVideo.3 \
+ XvQueryAdaptors.3 \
+ XvQueryBestSize.3 \
+ XvQueryEncodings.3 \
+ XvQueryExtension.3 \
+ XvSelectPortNotify.3 \
+ XvSelectVideoNotify.3 \
+ XvSetPortAttribute.3 \
+ XvStopVideo.3 \
+ XvUngrabPort.3 \
+ XvVideoNotify.3
.include <bsd.port.mk>
diff --git a/x11/libXv/distinfo b/x11/libXv/distinfo
index 6a52df98c64a..dee2747c6299 100644
--- a/x11/libXv/distinfo
+++ b/x11/libXv/distinfo
@@ -1,3 +1,3 @@
-MD5 (libXv-2.2.2.tar.bz2) = cdd6a79bac8807da83c008dac42fdddb
-SHA256 (libXv-2.2.2.tar.bz2) = 1a2f74118f7d41b0adcc6373f7be70f3cc06e706cf6c87cecd3a9b3603a24cb0
-SIZE (libXv-2.2.2.tar.bz2) = 192104
+MD5 (xorg/lib/libXv-1.0.3.tar.bz2) = f1c4109fa804aeaf7188b66c5cdd9f57
+SHA256 (xorg/lib/libXv-1.0.3.tar.bz2) = f87ae65be39a3c26dc3c87159d9126daf2af1b8c5e7f2ffc38b9f72b9236261b
+SIZE (xorg/lib/libXv-1.0.3.tar.bz2) = 231715
diff --git a/x11/libXv/pkg-plist b/x11/libXv/pkg-plist
index f33155ee28b9..9765424b3a75 100644
--- a/x11/libXv/pkg-plist
+++ b/x11/libXv/pkg-plist
@@ -2,5 +2,5 @@ include/X11/extensions/Xvlib.h
lib/libXv.a
lib/libXv.la
lib/libXv.so
-lib/libXv.so.2
+lib/libXv.so.1
libdata/pkgconfig/xv.pc
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
new file mode 100644
index 000000000000..2b51d6adc515
--- /dev/null
+++ b/x11/libXvMC/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for: libXvMC
+# Date Created: 8 Feb 206
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= libXvMC
+PORTVERSION= 1.0.4
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X Video Extension Motion Compensation library
+
+XORG_CAT= lib
+USE_XORG= x11 xext xv xextproto videoproto
+
+.include <bsd.port.mk>
diff --git a/x11/libXvMC/distinfo b/x11/libXvMC/distinfo
new file mode 100644
index 000000000000..d29fc2e6aff9
--- /dev/null
+++ b/x11/libXvMC/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXvMC-1.0.4.tar.bz2) = b54600573daf9d1a29b952e8d35b389e
+SHA256 (xorg/lib/libXvMC-1.0.4.tar.bz2) = 1217825ba8d66198466ee8306d0d6d237d2dd80d0f0783c98701296791833abb
+SIZE (xorg/lib/libXvMC-1.0.4.tar.bz2) = 225137
diff --git a/x11/libXvMC/pkg-descr b/x11/libXvMC/pkg-descr
new file mode 100644
index 000000000000..cbd30172204a
--- /dev/null
+++ b/x11/libXvMC/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the X Video Extension library.
+
+WWW: http://www.freedesktop.org/Software/xlibs
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/x11/libXvMC/pkg-plist b/x11/libXvMC/pkg-plist
new file mode 100644
index 000000000000..83c0a166cc5d
--- /dev/null
+++ b/x11/libXvMC/pkg-plist
@@ -0,0 +1,10 @@
+include/X11/extensions/XvMClib.h
+lib/libXvMC.a
+lib/libXvMC.la
+lib/libXvMC.so
+lib/libXvMC.so.1
+lib/libXvMCW.a
+lib/libXvMCW.la
+lib/libXvMCW.so
+lib/libXvMCW.so.1
+libdata/pkgconfig/xvmc.pc
diff --git a/x11/libXxf86/Makefile b/x11/libXxf86/Makefile
index 4f3df1af74e2..68ee8a7575fb 100644
--- a/x11/libXxf86/Makefile
+++ b/x11/libXxf86/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libXxf86
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xorg.freedesktop.org/X11R6.7.0/src/ \
${MASTER_SITE_XORG}
@@ -27,7 +28,7 @@ USE_IMAKE= YES
USE_X_PREFIX= no
PREFIX?= ${X11BASE}
DIST_SUBDIR= xorg
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/xc/lib
EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/lib
MAN3= XDGA.3 \
diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile
new file mode 100644
index 000000000000..b93018a0efdd
--- /dev/null
+++ b/x11/libXxf86dga/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for: libXxf86dga
+# Date Created: 8 Feb 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= libXxf86dga
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X DGA Extension
+
+XORG_CAT= lib
+USE_XORG= xproto x11 xextproto xext xf86dgaproto:both
+
+MAN3= XDGA.3 \
+ XDGAOpenFramebuffer.3 \
+ XDGAChangePixmapMode.3 \
+ XDGAQueryExtension.3 \
+ XDGACloseFramebuffer.3 \
+ XDGAQueryModes.3 \
+ XDGACopyArea.3 \
+ XDGAQueryVersion.3 \
+ XDGACopyTransparentArea.3 \
+ XDGASelectInput.3 \
+ XDGACreateColormap.3 \
+ XDGASetClientVersion.3 \
+ XDGAFillRectangle.3 \
+ XDGASetMode.3 \
+ XDGAGetViewportStatus.3 \
+ XDGASetViewport.3 \
+ XDGAInstallColormap.3 \
+ XDGASync.3 \
+ XDGAKeyEventToXKeyEvent.3 \
+ XF86DGA.3 \
+ XFree86-DGA.3
+
+.include <bsd.port.mk>
diff --git a/x11/libXxf86dga/distinfo b/x11/libXxf86dga/distinfo
new file mode 100644
index 000000000000..9a027810bbc8
--- /dev/null
+++ b/x11/libXxf86dga/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXxf86dga-1.0.1.tar.bz2) = 5b0e752c71a23e9d1290cad44a7c7c75
+SHA256 (xorg/lib/libXxf86dga-1.0.1.tar.bz2) = 8c68f429942b1258cff0fb27505645a463690374ecf318ae660ff4cde7a03db9
+SIZE (xorg/lib/libXxf86dga-1.0.1.tar.bz2) = 231533
diff --git a/x11/libXxf86dga/pkg-descr b/x11/libXxf86dga/pkg-descr
new file mode 100644
index 000000000000..f8549ce6ce20
--- /dev/null
+++ b/x11/libXxf86dga/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the XKB file library.
+
+WWW: http://www.freedesktop.org/Software/xorg
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/x11/libXxf86dga/pkg-plist b/x11/libXxf86dga/pkg-plist
new file mode 100644
index 000000000000..6c9724d75e96
--- /dev/null
+++ b/x11/libXxf86dga/pkg-plist
@@ -0,0 +1,6 @@
+lib/libXxf86dga.a
+lib/libXxf86dga.la
+lib/libXxf86dga.so
+lib/libXxf86dga.so.1
+libdata/pkgconfig/xxf86dga.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile
new file mode 100644
index 000000000000..2476778b3bea
--- /dev/null
+++ b/x11/libXxf86misc/Makefile
@@ -0,0 +1,28 @@
+# New ports collection makefile for: libXxf86misc
+# Date Created: 8 Feb 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= libXxf86misc
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X XF86-Misc Extension
+
+XORG_CAT= lib
+USE_XORG= xproto x11 xextproto xext xf86miscproto:both
+
+MAN3= XF86Misc.3 \
+ XF86MiscGetKbdSettings.3 \
+ XF86MiscGetMouseSettings.3 \
+ XF86MiscGetSaver.3 \
+ XF86MiscQueryExtension.3 \
+ XF86MiscQueryVersion.3 \
+ XF86MiscSetKbdSettings.3 \
+ XF86MiscSetMouseSettings.3 \
+ XF86MiscSetSaver.3
+
+.include <bsd.port.mk>
diff --git a/x11/libXxf86misc/distinfo b/x11/libXxf86misc/distinfo
new file mode 100644
index 000000000000..91cdedeaf6ab
--- /dev/null
+++ b/x11/libXxf86misc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXxf86misc-1.0.1.tar.bz2) = 7cee0df63903cef7f7a3fb68cdd99eef
+SHA256 (xorg/lib/libXxf86misc-1.0.1.tar.bz2) = 2122d67d49aaa06eeaeb3db173ea8a7048f3b52665e5135874bc5cadada91289
+SIZE (xorg/lib/libXxf86misc-1.0.1.tar.bz2) = 222736
diff --git a/x11/libXxf86misc/pkg-descr b/x11/libXxf86misc/pkg-descr
new file mode 100644
index 000000000000..f8549ce6ce20
--- /dev/null
+++ b/x11/libXxf86misc/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the XKB file library.
+
+WWW: http://www.freedesktop.org/Software/xorg
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/x11/libXxf86misc/pkg-plist b/x11/libXxf86misc/pkg-plist
new file mode 100644
index 000000000000..55b4a93e17f4
--- /dev/null
+++ b/x11/libXxf86misc/pkg-plist
@@ -0,0 +1,6 @@
+lib/libXxf86misc.a
+lib/libXxf86misc.la
+lib/libXxf86misc.so
+lib/libXxf86misc.so.1
+libdata/pkgconfig/xxf86misc.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
new file mode 100644
index 000000000000..fc9f3e02e720
--- /dev/null
+++ b/x11/libXxf86vm/Makefile
@@ -0,0 +1,41 @@
+# New ports collection makefile for: libXxf86vm
+# Date Created: 8 Feb 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= libXxf86vm
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X Vidmode Extension
+
+XORG_CAT= lib
+USE_XORG= xproto x11 xextproto xext xf86vidmodeproto:both
+
+MAN3= XF86VM.3 \
+ XF86VidModeLockModeSwitch.3 \
+ XF86VidModeDeleteModeLine.3 \
+ XF86VidModeModModeLine.3 \
+ XF86VidModeGetAllModeLines.3 \
+ XF86VidModeQueryExtension.3 \
+ XF86VidModeGetDotClocks.3 \
+ XF86VidModeQueryVersion.3 \
+ XF86VidModeGetGamma.3 \
+ XF86VidModeSetClientVersion.3 \
+ XF86VidModeGetGammaRamp.3 \
+ XF86VidModeSetGamma.3 \
+ XF86VidModeGetGammaRampSize.3 \
+ XF86VidModeSetGammaRamp.3 \
+ XF86VidModeGetModeLine.3 \
+ XF86VidModeSetViewPort.3 \
+ XF86VidModeGetMonitor.3 \
+ XF86VidModeSwitchMode.3 \
+ XF86VidModeGetPermissions.3 \
+ XF86VidModeSwitchToMode.3 \
+ XF86VidModeGetViewPort.3 \
+ XF86VidModeValidateModeLine.3
+
+.include <bsd.port.mk>
diff --git a/x11/libXxf86vm/distinfo b/x11/libXxf86vm/distinfo
new file mode 100644
index 000000000000..852a685b3d3a
--- /dev/null
+++ b/x11/libXxf86vm/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libXxf86vm-1.0.1.tar.bz2) = 8de1ca6c55aaad7d8cae19b4f0b3da32
+SHA256 (xorg/lib/libXxf86vm-1.0.1.tar.bz2) = e08fc2c1611c422f751ed02810491b45bf7faa4207d762a11f11815263c9285a
+SIZE (xorg/lib/libXxf86vm-1.0.1.tar.bz2) = 227928
diff --git a/x11/libXxf86vm/pkg-descr b/x11/libXxf86vm/pkg-descr
new file mode 100644
index 000000000000..f8549ce6ce20
--- /dev/null
+++ b/x11/libXxf86vm/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the XKB file library.
+
+WWW: http://www.freedesktop.org/Software/xorg
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/x11/libXxf86vm/pkg-plist b/x11/libXxf86vm/pkg-plist
new file mode 100644
index 000000000000..ae0c9e9b2ed5
--- /dev/null
+++ b/x11/libXxf86vm/pkg-plist
@@ -0,0 +1,6 @@
+lib/libXxf86vm.a
+lib/libXxf86vm.la
+lib/libXxf86vm.so
+lib/libXxf86vm.so.1
+libdata/pkgconfig/xxf86vm.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libcapplet/Makefile b/x11/libcapplet/Makefile
index b27d81474ddd..44281ffe1248 100644
--- a/x11/libcapplet/Makefile
+++ b/x11/libcapplet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libcapplet
PORTVERSION= 1.4.0.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11 gnome
MASTER_SITES= http://people.freebsd.org/~sobomax/
DIST_SUBDIR= gnome
diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile
new file mode 100644
index 000000000000..e39458f26443
--- /dev/null
+++ b/x11/libdmx/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for: libdmx
+# Date Created: 8 Feb 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= libdmx
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= XKB file library
+
+XORG_CAT= lib
+USE_XORG= x11 xext xextproto dmxproto
+
+MAN3= DMX.3 \
+ DMXAddInput.3 \
+ DMXAddScreen.3 \
+ DMXChangeDesktopAttributes.3 \
+ DMXChangeScreensAttributes.3 \
+ DMXForceWindowCreation.3 \
+ DMXGetDesktopAttributes.3 \
+ DMXGetInputAttributes.3 \
+ DMXGetInputCount.3 \
+ DMXGetScreenAttributes.3 \
+ DMXGetScreenCount.3 \
+ DMXGetWindowAttributes.3 \
+ DMXQueryExtension.3 \
+ DMXQueryVersion.3 \
+ DMXRemoveInput.3 \
+ DMXRemoveScreen.3 \
+ DMXSync.3
+
+.include <bsd.port.mk>
diff --git a/x11/libdmx/distinfo b/x11/libdmx/distinfo
new file mode 100644
index 000000000000..8131963fa474
--- /dev/null
+++ b/x11/libdmx/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libdmx-1.0.2.tar.bz2) = 4d866967210d06098fc9f302ed4c79b1
+SHA256 (xorg/lib/libdmx-1.0.2.tar.bz2) = fa3ff31a543f7cea04762c08f48b418e75230de8b4dfdf9d2d3ae9e2af26b9c4
+SIZE (xorg/lib/libdmx-1.0.2.tar.bz2) = 231083
diff --git a/x11/libdmx/pkg-descr b/x11/libdmx/pkg-descr
new file mode 100644
index 000000000000..f8549ce6ce20
--- /dev/null
+++ b/x11/libdmx/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the XKB file library.
+
+WWW: http://www.freedesktop.org/Software/xorg
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/x11/libdmx/pkg-plist b/x11/libdmx/pkg-plist
new file mode 100644
index 000000000000..1d6c42c745e2
--- /dev/null
+++ b/x11/libdmx/pkg-plist
@@ -0,0 +1,6 @@
+lib/libdmx.a
+lib/libdmx.la
+lib/libdmx.so
+lib/libdmx.so.1
+libdata/pkgconfig/dmx.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile
index 8df346204699..b5acfccfdeb6 100644
--- a/x11/libdnd/Makefile
+++ b/x11/libdnd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libdnd
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://leb.net/offix/
DISTNAME= dnd.${PORTVERSION}
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index 15344ddf3206..213b4b052d77 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libexo
PORTVERSION= 0.3.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 xfce
DISTNAME= exo-${PORTVERSION}
MASTER_SITES= ${MASTER_SITES_XFCE}
diff --git a/x11/libexo/pkg-plist b/x11/libexo/pkg-plist
index 290e6e867a78..326954f3ddcd 100644
--- a/x11/libexo/pkg-plist
+++ b/x11/libexo/pkg-plist
@@ -212,6 +212,5 @@ share/xfce4/helpers/xterm.desktop
@dirrmtry share/xfce4/doc
@dirrmtry share/xfce4/helpers
@dirrmtry share/xfce4
-@dirrmtry share/pixmaps
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
diff --git a/x11/libgnome-java/Makefile b/x11/libgnome-java/Makefile
index 57bd3ecb6a86..525166550752 100644
--- a/x11/libgnome-java/Makefile
+++ b/x11/libgnome-java/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libgnome-java
PORTVERSION= 2.12.6
+PORTREVISION= 1
CATEGORIES= x11 java
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 663e96d9aa44..cbafeccedd90 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libgnome
PORTVERSION= 2.18.0
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index bfd82da029ec..1eb129280b30 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -102,57 +102,21 @@ share/locale/zh_HK/LC_MESSAGES/libgnome-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
@dirrm include/libgnome-2.0/libgnome
@dirrm include/libgnome-2.0
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/yi/LC_MESSAGES
@dirrmtry share/locale/yi
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
@dirrmtry share/locale/tt/LC_MESSAGES
@dirrmtry share/locale/tt
@dirrmtry share/locale/sr@ije/LC_MESSAGES
@dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 5d0a5fd25287..ec500c55f693 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libgnomekbd
PORTVERSION= 2.18.1
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/x11/libgnomemm/Makefile b/x11/libgnomemm/Makefile
index 414667325b79..6c64242effc7 100644
--- a/x11/libgnomemm/Makefile
+++ b/x11/libgnomemm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libgnomemm
PORTVERSION= 2.0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gtkmm
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index dadd8226120e..8c9236c06d14 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libgnomemm
PORTVERSION= 2.18.0
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/liboldX/Makefile b/x11/liboldX/Makefile
new file mode 100644
index 000000000000..1deca9732e07
--- /dev/null
+++ b/x11/liboldX/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for: liboldX
+# Date Created: Dec 16 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= liboldX
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Old X library
+
+XORG_CAT= lib
+USE_XORG= x11
+USE_AUTOTOOLS= libtool:15
+
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+
+.include <bsd.port.mk>
diff --git a/x11/liboldX/distinfo b/x11/liboldX/distinfo
new file mode 100644
index 000000000000..41328b8d15ac
--- /dev/null
+++ b/x11/liboldX/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/liboldX-1.0.1.tar.bz2) = 6b81ffe486d76c380d08f92285758d84
+SHA256 (xorg/lib/liboldX-1.0.1.tar.bz2) = 1091d301f5e28f84e5d755a5cde9d2f7edb82b799d051522751874571e10340f
+SIZE (xorg/lib/liboldX-1.0.1.tar.bz2) = 215694
diff --git a/x11/liboldX/pkg-descr b/x11/liboldX/pkg-descr
new file mode 100644
index 000000000000..76f5a9c988ea
--- /dev/null
+++ b/x11/liboldX/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the old X library.
+
+WWW: http://www.freedesktop.org/Software/xlibs
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11/liboldX/pkg-plist b/x11/liboldX/pkg-plist
new file mode 100644
index 000000000000..aa4938cc0f2d
--- /dev/null
+++ b/x11/liboldX/pkg-plist
@@ -0,0 +1,6 @@
+include/X11/X10.h
+lib/liboldX.a
+lib/liboldX.la
+lib/liboldX.so
+lib/liboldX.so.6
+libdata/pkgconfig/oldx.pc
diff --git a/x11/libsx/Makefile b/x11/libsx/Makefile
index be0cf228f947..eb1d40346ef5 100644
--- a/x11/libsx/Makefile
+++ b/x11/libsx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libsx
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= libraries
diff --git a/x11/libsynaptics/Makefile b/x11/libsynaptics/Makefile
index 004fe88405f8..dde3974de581 100644
--- a/x11/libsynaptics/Makefile
+++ b/x11/libsynaptics/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libsynaptics
PORTVERSION= 0.14.6b
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://qsynaptics.sourceforge.net/ \
http://www.hitnet.rwth-aachen.de/~brueffer/distfiles/
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 79c8b60c3653..9f0fd2fd204f 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libxcb
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
@@ -21,11 +21,12 @@ BUILD_DEPENDS= ${LIB_PC_DEPENDS} \
dot:${PORTSDIR}/graphics/graphviz
RUN_DEPENDS= ${LIB_PC_DEPENDS}
-USE_X_PREFIX= yes
+PREFIX= ${X11BASE}
USE_BZIP2= yes
-USE_GNOME= gnomehack pkgconfig
+USE_GNOME= gnomehack
USE_GMAKE= yes
USE_LDCONFIG= yes
+USE_XORG= xau xdmcp
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
@@ -54,7 +55,4 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src__xcb.h \
${FILESDIR}/extra-patch-src__xcb_auth.c
.endif
-post-build:
- DISPLAY= ${GMAKE} -C ${WRKSRC} check
-
.include <bsd.port.post.mk>
diff --git a/x11/libxcb/files/patch-xcb.pc.in b/x11/libxcb/files/patch-xcb.pc.in
deleted file mode 100644
index c9ed7bfdd4e9..000000000000
--- a/x11/libxcb/files/patch-xcb.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- xcb.pc.in.orig Wed Jan 24 16:34:02 2007
-+++ xcb.pc.in Wed Jan 24 16:36:32 2007
-@@ -6,7 +6,7 @@
- Name: XCB
- Description: X-protocol C Binding
- Version: @PACKAGE_VERSION@
--Requires.private: @NEEDED@
-+Requires.private: pthread-stubs
- Libs: -L${libdir} -lxcb
- Libs.private: @LIBS@
- Cflags: -I${includedir}
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index 0d68762392f3..7c11016034af 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libxfce4mcs
PORTVERSION= 4.4.1
+PORTREVISION= 1
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITES_XFCE}
DIST_SUBDIR= xfce4
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index d21706f88e06..edee2b77ac5e 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -6,32 +6,13 @@
#
PORTNAME= libxkbfile
-PORTVERSION= 1.0
+PORTVERSION= 1.0.4
CATEGORIES= x11
-MASTER_SITES= http://xorg.freedesktop.org/X11R6.7.0/src/ \
- ${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR= X11R6.7/tars
-DISTNAME= X11R6.7.0-src1
MAINTAINER= x11@FreeBSD.org
COMMENT= XKB file library
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11
-BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions \
- ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
-
-CONFLICTS= XFree86-libraries-* xorg-libraries-*
-
-USE_IMAKE= yes
-USE_X_PREFIX= no
-PREFIX?= ${X11BASE}
-DIST_SUBDIR= xorg
-INSTALLS_SHLIB= yes
-WRKSRC= ${WRKDIR}/xc/lib/xkbfile
-EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/lib/xkbfile
-
-post-patch:
- ${LN} -s ${WRKSRC}/exports/include/X11 ${WRKSRC}/
+XORG_CAT= lib
+USE_XORG= x11 kbproto:both
.include <bsd.port.mk>
diff --git a/x11/libxkbfile/distinfo b/x11/libxkbfile/distinfo
index 59603c139556..a1594e5cb3b1 100644
--- a/x11/libxkbfile/distinfo
+++ b/x11/libxkbfile/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
-SHA256 (xorg/X11R6.7.0-src1.tar.gz) = e2872ae9c773e76139cfe7c97bdfd1963e41bf3b307230fca711c9f005a90dbb
-SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
+MD5 (xorg/lib/libxkbfile-1.0.4.tar.bz2) = 12b4ceb5d42b520228b5fb40a96ae6c5
+SHA256 (xorg/lib/libxkbfile-1.0.4.tar.bz2) = 468ade4eaa3951a7c34b6ae1c290ab1a1d364ee36c5c455ef0df15550825b8ae
+SIZE (xorg/lib/libxkbfile-1.0.4.tar.bz2) = 273537
diff --git a/x11/libxkbfile/files/patch-Imakefile b/x11/libxkbfile/files/patch-Imakefile
deleted file mode 100644
index eb8b91160e09..000000000000
--- a/x11/libxkbfile/files/patch-Imakefile
+++ /dev/null
@@ -1,34 +0,0 @@
---- Imakefile.orig Thu Mar 4 09:47:14 2004
-+++ Imakefile Sat May 8 14:39:42 2004
-@@ -5,24 +5,19 @@
-
- XCOMM $XFree86: xc/lib/xkbfile/Imakefile,v 3.5 2003/10/15 21:23:38 herrb Exp $
-
--#define DoNormalLib NormalLibxkbfile
--#define DoSharedLib SharedLibxkbfile
--#define DoExtraLib SharedLibxkbfile
--#define DoDebugLib DebugLibxkbfile
--#define DoProfileLib ProfileLibxkbfile
-+#define DoNormalLib YES
-+#define DoSharedLib YES
-+#define DoExtraLib YES
-+#define DoDebugLib NO
-+#define DoProfileLib NO
- #define HasSharedData NO
- #define LibName xkbfile
- #define SoRev SOXKBFILEREV
-+SOXKBFILEREV = 1.0
- #define IncSubdir X11
- #define IncSubSubdir extensions
-
--#ifdef SharedxkbfileReqs
--REQUIREDLIBS = SharedxkbfileReqs
--#endif
--
--#if !BuildXKBfilelib
--#define LibBuild NO
--#endif
-+REQUIREDLIBS = $(LDPRELIB) $(XONLYLIB)
-
- SRCS = xkbtext.c xkbdraw.c xkbmisc.c xkbatom.c xkberrs.c \
- cout.c xkbout.c xkmout.c \
diff --git a/x11/libxkbfile/pkg-plist b/x11/libxkbfile/pkg-plist
index f7de24f1a0e3..cf9ae09cec7d 100644
--- a/x11/libxkbfile/pkg-plist
+++ b/x11/libxkbfile/pkg-plist
@@ -5,5 +5,8 @@ include/X11/extensions/XKBrules.h
include/X11/extensions/XKM.h
include/X11/extensions/XKMformat.h
lib/libxkbfile.a
+lib/libxkbfile.la
lib/libxkbfile.so
lib/libxkbfile.so.1
+libdata/pkgconfig/xkbfile.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libxkbui/Makefile b/x11/libxkbui/Makefile
new file mode 100644
index 000000000000..1807dabd57ab
--- /dev/null
+++ b/x11/libxkbui/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for: libxkbui
+# Date Created: 8 Feb 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= libxkbui
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= XKB file library
+
+XORG_CAT= lib
+USE_XORG= x11 xt xkbfile kbproto
+
+.include <bsd.port.mk>
diff --git a/x11/libxkbui/distinfo b/x11/libxkbui/distinfo
new file mode 100644
index 000000000000..16afcb54a280
--- /dev/null
+++ b/x11/libxkbui/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/libxkbui-1.0.2.tar.bz2) = 1143e456f7429e18e88f2eadb2f2b6b1
+SHA256 (xorg/lib/libxkbui-1.0.2.tar.bz2) = 20c23101d63234ee5f6d696dfa069b29c6c58e39eff433bcd7705b50b3ffa214
+SIZE (xorg/lib/libxkbui-1.0.2.tar.bz2) = 221435
diff --git a/x11/libxkbui/pkg-descr b/x11/libxkbui/pkg-descr
new file mode 100644
index 000000000000..f8549ce6ce20
--- /dev/null
+++ b/x11/libxkbui/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the XKB file library.
+
+WWW: http://www.freedesktop.org/Software/xorg
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/x11/libxkbui/pkg-plist b/x11/libxkbui/pkg-plist
new file mode 100644
index 000000000000..e614a475159d
--- /dev/null
+++ b/x11/libxkbui/pkg-plist
@@ -0,0 +1,7 @@
+include/X11/extensions/XKBui.h
+lib/libxkbui.a
+lib/libxkbui.la
+lib/libxkbui.so
+lib/libxkbui.so.1
+libdata/pkgconfig/xkbui.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index c5148c319dc7..c66d736635f4 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libxklavier
PORTVERSION= 3.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -17,6 +17,8 @@ MASTER_SITE_SUBDIR= gswitchit
MAINTAINER= gnome@FreeBSD.org
COMMENT= An utility library to make XKB stuff easier
+RUN_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp
+
USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gnomehack libxml2 glib20
@@ -25,7 +27,8 @@ USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
CONFIGURE_ARGS= --disable-doxygen \
- --with-xkb-base=${X11BASE}/lib/X11/xkb \
+ --with-xkb-base=${X11BASE}/share/X11/xkb \
+ --with-xkb-bin-base=${X11BASE}/bin \
--with-xmodmap-base=${LOCALBASE}/share/gnome/xmodmap \
--disable-gtk-doc \
--with-html-dir=${GNOME_HTML_DIR}
diff --git a/x11/listres/Makefile b/x11/listres/Makefile
new file mode 100644
index 000000000000..782af42a2bca
--- /dev/null
+++ b/x11/listres/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: listres
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= listres
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= List resources in widgets
+
+XORG_CAT= app
+USE_XORG= x11 xt xmu xaw
+
+PLIST_FILES= bin/listres
+
+MAN1= listres.1
+
+.include <bsd.port.mk>
diff --git a/x11/listres/distinfo b/x11/listres/distinfo
new file mode 100644
index 000000000000..0670e158e3e4
--- /dev/null
+++ b/x11/listres/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/listres-1.0.1.tar.bz2) = 827a1ac5adf9aadd0c13b54a897e297b
+SHA256 (xorg/app/listres-1.0.1.tar.bz2) = 7156e58025e240a501d5b32244b923b283bb35014ea5a4081b70044af8aef7a3
+SIZE (xorg/app/listres-1.0.1.tar.bz2) = 76709
diff --git a/x11/listres/pkg-descr b/x11/listres/pkg-descr
new file mode 100644
index 000000000000..3a73d2ec5909
--- /dev/null
+++ b/x11/listres/pkg-descr
@@ -0,0 +1,5 @@
+This package contains listres, a program that generates a list of a
+widget's resource database.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/luit/Makefile b/x11/luit/Makefile
new file mode 100644
index 000000000000..d17bf9d77fc3
--- /dev/null
+++ b/x11/luit/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for: luit
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= luit
+PORTVERSION= 1.0.2
+PORTREVISION= 1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Locale and ISO 2022 support for Unicode terminals.
+
+XORG_CAT= app
+USE_XORG= x11 fontenc
+
+PLIST_FILES= bin/luit
+
+CONFIGURE_ARGS= --with-localealiasfile=${LOCALBASE}/share/X11/locale/locale.alias
+
+MAN1= luit.1
+
+.if !defined(WITH_SETUID_LUIT)
+pre-everything::
+ @${ECHO_MSG} "If you want to use xterm with locales in a secure manner, luit must be"
+ @${ECHO_MSG} "installed setuid. If you want to do this, define WITH_SETUID_LUIT when"
+ @${ECHO_MSG} "installing this port (either in /etc/make.conf or on command line with"
+ @${ECHO_MSG} "install target)."
+.endif
+
+post-install:
+.if defined(WITH_SETUID_LUIT)
+ ${CHOWN} root:wheel ${PREFIX}/bin/luit
+ ${CHMOD} 04711 ${PREFIX}/bin/luit
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11/luit/distinfo b/x11/luit/distinfo
new file mode 100644
index 000000000000..092103b77a7f
--- /dev/null
+++ b/x11/luit/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/luit-1.0.2.tar.bz2) = aacda46598ce3af8ca16e2a8132db1b2
+SHA256 (xorg/app/luit-1.0.2.tar.bz2) = c0c4d76df0350c626df7ce62bf3df7915f9959557d76abce96222857d782389c
+SIZE (xorg/app/luit-1.0.2.tar.bz2) = 99235
diff --git a/x11/luit/files/patch-luit.c b/x11/luit/files/patch-luit.c
new file mode 100644
index 000000000000..8a6e7412f00f
--- /dev/null
+++ b/x11/luit/files/patch-luit.c
@@ -0,0 +1,175 @@
+--- luit-1.0.2/luit.c Wed Nov 8 22:21:35 2006
++++ luit.c Sun May 20 00:51:20 2007
+@@ -45,6 +45,8 @@
+ #include "charset.h"
+ #include "iso2022.h"
+
++static int p2c_waitpipe[2];
++static int c2p_waitpipe[2];
+ static Iso2022Ptr inputState = NULL, outputState = NULL;
+
+ static char *child_argv0 = NULL;
+@@ -434,17 +436,6 @@
+ return 0;
+ }
+
+-static void
+-sigwinchHandler(int sig)
+-{
+- sigwinch_queued = 1;
+-}
+-
+-static void
+-sigchldHandler(int sig)
+-{
+- sigchld_queued = 1;
+-}
+
+ static int
+ condom(int argc, char **argv)
+@@ -455,7 +446,6 @@
+ char *path;
+ char **child_argv;
+ int rc;
+- int val;
+
+ rc = parseArgs(argc, argv, child_argv0,
+ &path, &child_argv);
+@@ -473,30 +463,9 @@
+ perror("Couldn't drop priviledges");
+ exit(1);
+ }
+-#ifdef SIGWINCH
+- installHandler(SIGWINCH, sigwinchHandler);
+-#endif
+- installHandler(SIGCHLD, sigchldHandler);
+-
+- rc = copyTermios(0, pty);
+- if(rc < 0)
+- FatalError("Couldn't copy terminal settings\n");
+-
+- rc = setRawTermios();
+- if(rc < 0)
+- FatalError("Couldn't set terminal to raw\n");
+-
+- val = fcntl(0, F_GETFL, 0);
+- if(val >= 0) {
+- fcntl(0, F_SETFL, val | O_NONBLOCK);
+- }
+- val = fcntl(pty, F_GETFL, 0);
+- if(val >= 0) {
+- fcntl(pty, F_SETFL, val | O_NONBLOCK);
+- }
+-
+- setWindowSize(0, pty);
+
++ pipe(p2c_waitpipe);
++ pipe(c2p_waitpipe);
+ pid = fork();
+ if(pid < 0) {
+ perror("Couldn't fork");
+@@ -505,12 +474,12 @@
+
+ if(pid == 0) {
+ close(pty);
+-#ifdef SIGWINCH
+- installHandler(SIGWINCH, SIG_DFL);
+-#endif
+- installHandler(SIGCHLD, SIG_DFL);
++ close(p2c_waitpipe[1]);
++ close(c2p_waitpipe[0]);
+ child(line, path, child_argv);
+ } else {
++ close(p2c_waitpipe[0]);
++ close(c2p_waitpipe[1]);
+ free(child_argv);
+ free(path);
+ free(line);
+@@ -525,11 +494,11 @@
+ {
+ int tty;
+ int pgrp;
++ char tmp[10];
+
+ close(0);
+ close(1);
+ close(2);
+-
+ pgrp = setsid();
+ if(pgrp < 0) {
+ kill(getppid(), SIGABRT);
+@@ -541,6 +510,7 @@
+ kill(getppid(), SIGABRT);
+ exit(1);
+ }
++ write(c2p_waitpipe[1],"1",1);
+
+ if(tty != 0)
+ dup2(tty, 0);
+@@ -552,22 +522,66 @@
+ if(tty > 2)
+ close(tty);
+
++ read(p2c_waitpipe[0],tmp,1);
++ close(c2p_waitpipe[1]);
++ close(p2c_waitpipe[0]);
+ execvp(path, argv);
+ perror("Couldn't exec");
+ exit(1);
+ }
+
++static void
++sigwinchHandler(int sig) {
++ sigwinch_queued = 1;
++}
++
++static void
++sigchldHandler(int sig)
++{
++ sigchld_queued = 1;
++}
++
+ void
+ parent(int pid, int pty)
+ {
+ unsigned char buf[BUFFER_SIZE];
+ int i;
++ int val;
+ int rc;
++ char tmp[10];
+
++ read(c2p_waitpipe[0],tmp,1);
+ if(verbose) {
+ reportIso2022(outputState);
+ }
+
++#ifdef SIGWINCH
++ installHandler(SIGWINCH, sigwinchHandler);
++#endif
++ installHandler(SIGCHLD, sigchldHandler);
++
++ rc = copyTermios(0, pty);
++ if(rc < 0)
++ FatalError("Couldn't copy terminal settings\n");
++
++ rc = setRawTermios();
++ if(rc < 0)
++ FatalError("Couldn't set terminal to raw\n");
++
++ val = fcntl(0, F_GETFL, 0);
++ if(val >= 0) {
++ fcntl(0, F_SETFL, val | O_NONBLOCK);
++ }
++ val = fcntl(pty, F_GETFL, 0);
++ if(val >= 0) {
++ fcntl(pty, F_SETFL, val | O_NONBLOCK);
++ }
++
++ setWindowSize(0, pty);
++
++ write(p2c_waitpipe[1],"1",1);
++ close(c2p_waitpipe[0]);
++ close(p2c_waitpipe[1]);
+ for(;;) {
+ rc = waitForInput(0, pty);
+
diff --git a/x11/luit/pkg-descr b/x11/luit/pkg-descr
new file mode 100644
index 000000000000..0bed19e2c820
--- /dev/null
+++ b/x11/luit/pkg-descr
@@ -0,0 +1,5 @@
+This package contains luit, a filter than can be run between an arbitrary
+application and a UTF-8 terminal emulator.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/lupe/Makefile b/x11/lupe/Makefile
index 4777bc696612..37fb7a4e20dc 100644
--- a/x11/lupe/Makefile
+++ b/x11/lupe/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lupe
PORTVERSION= 0.08
+PORTREVISION= 1
CATEGORIES= x11 accessibility
MASTER_SITES= http://www.oersted.co.jp/~yav/soft/
DISTNAME= lupe008
diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile
index 3eed22e86425..f27350eddaed 100644
--- a/x11/lxpanel/Makefile
+++ b/x11/lxpanel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= lxpanel
PORTVERSION= 0.2.4
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= lxde
diff --git a/x11/mgapdesk/Makefile b/x11/mgapdesk/Makefile
index efe69468bd8a..77f5bdfbdbc4 100644
--- a/x11/mgapdesk/Makefile
+++ b/x11/mgapdesk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mgapdesk
PORTVERSION= 1.0.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= ftp://ftp.matrox.com/pub/mga/archive/linux/2001/powerdesk_1_00_7/
DISTNAME= ${PORTNAME}-1_00-7beta_src
@@ -16,6 +16,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Matrox Powerdesk for *nix
+IGNORE= needs an old XFree86/X.org header file to build
+
USE_X_PREFIX= YES
USE_GNOME= gtk12
USE_GMAKE= YES
diff --git a/x11/mkcomposecache/Makefile b/x11/mkcomposecache/Makefile
new file mode 100644
index 000000000000..357153c18c84
--- /dev/null
+++ b/x11/mkcomposecache/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for: mkcomposecache
+# Date Created: 30 Jan 2007
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= mkcomposecache
+PORTVERSION= 1.2
+PORTREVISION= 1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Program to create Compose cache files
+
+XORG_CAT= app
+USE_XORG= x11
+
+PLIST_FILES= sbin/mkcomposecache
+
+MAN8= mkcomposecache.8
+
+.include <bsd.port.mk>
diff --git a/x11/mkcomposecache/distinfo b/x11/mkcomposecache/distinfo
new file mode 100644
index 000000000000..3d45d86ba287
--- /dev/null
+++ b/x11/mkcomposecache/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/mkcomposecache-1.2.tar.bz2) = c8237b4aea1ae0c15441deab6b12c5c0
+SHA256 (xorg/app/mkcomposecache-1.2.tar.bz2) = 8c34cdd03f7d11ac86c681349d39a4faf88854faaad928f0663da55f125aedfb
+SIZE (xorg/app/mkcomposecache-1.2.tar.bz2) = 65262
diff --git a/x11/mkcomposecache/pkg-descr b/x11/mkcomposecache/pkg-descr
new file mode 100644
index 000000000000..b3b220ae5a62
--- /dev/null
+++ b/x11/mkcomposecache/pkg-descr
@@ -0,0 +1,4 @@
+mkcomposecache is used for creating global (system-wide) Compose cache files.
+
+Compose cache files help with application startup times and memory usage,
+especially in locales with large Compose tables (e.g. all UTF-8 locales).
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 2417f2cd1907..87189a3e4dc5 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mlterm
PORTVERSION= 2.9.3
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile
index 9353ef4ba436..0556dcf92e89 100644
--- a/x11/mrxvt-devel/Makefile
+++ b/x11/mrxvt-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mrxvt-devel
PORTVERSION= 0.5.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= materm
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index 16909312a82c..6d8dfed6f60f 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mrxvt
PORTVERSION= 0.4.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= materm
diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile
index 4a90ff49a444..95f40bd33035 100644
--- a/x11/multi-aterm/Makefile
+++ b/x11/multi-aterm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= multi-aterm
PORTVERSION= 0.2.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.nongnu.org/materm/
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index d4a229bf9398..34370c360929 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -7,7 +7,7 @@
PORTNAME= multi-gnome-terminal
PORTVERSION= 1.6.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= multignometerm
diff --git a/x11/mxico/Makefile b/x11/mxico/Makefile
index 18d3dd20b2c5..580cda88b601 100644
--- a/x11/mxico/Makefile
+++ b/x11/mxico/Makefile
@@ -9,6 +9,7 @@
PORTNAME= mxico
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://people.freebsd.org/~maho/mxico/
diff --git a/x11/numlockx/Makefile b/x11/numlockx/Makefile
index 8240ef992585..3fa142366f7b 100644
--- a/x11/numlockx/Makefile
+++ b/x11/numlockx/Makefile
@@ -8,6 +8,7 @@
PORTNAME= numlockx
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://ktown.kde.org/~seli/numlockx/ \
http://caraldi.com/jbq/numlockx/
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index db8e93020d0d..f247e879474a 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nvidia-driver
PORTVERSION= 1.0.${NVVERSION}
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_NVIDIA}
MASTER_SITE_SUBDIR= freebsd/1.0-${NVVERSION}
@@ -19,6 +20,7 @@ ONLY_FOR_ARCHS= i386
USE_X_PREFIX= yes
NO_PACKAGE= should be recompiled for a particular FreeBSD kernel
+USE_GL= gl
INSTALLS_SHLIB= yes
SUB_FILES+= pkg-message
DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0
@@ -62,13 +64,24 @@ LIB_DEPENDS+= m.3:${PORTSDIR}/misc/compat5x
.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM} == "xorg"
+MODULESDIR= lib/xorg/modules
+XORG_SUB= "@comment "
+XFREE86_SUB= ""
+.else
+MODULESDIR= lib/modules
+XORG_SUB= ""
+XFREE86_SUB= "@comment "
+.endif
+
# XXX Should use ${PKG_INFO} XXX
#
XSERVVERSION!= /usr/sbin/pkg_info -O x11-servers/XFree86-4-Server 2>/dev/null | ${GREP} Server- || /usr/sbin/pkg_info -O x11-servers/xorg-server 2>/dev/null | ${GREP} server- || true
-XLIBVERSION!= /usr/sbin/pkg_info -O x11/XFree86-4-libraries 2>/dev/null | ${GREP} libraries- || /usr/sbin/pkg_info -O x11/xorg-libraries 2>/dev/null | ${GREP} libraries- || true
+XLIBVERSION!= /usr/sbin/pkg_info -O x11/XFree86-4-libraries 2>/dev/null | ${GREP} libraries- || /usr/sbin/pkg_info -O graphics/libGL 2>/dev/null | ${GREP} libGL- || true
PLIST_SUB+= XSERVVERSION=${XSERVVERSION} XLIBVERSION=${XLIBVERSION} \
- LINUXBASE=${LINUXBASE} NVVERSION=${NVVERSION}
+ LINUXBASE=${LINUXBASE} NVVERSION=${NVVERSION} \
+ MODULESDIR=${MODULESDIR} XORG=${XORG_SUB} XFREE86=${XFREE86_SUB}
.if !defined(WITHOUT_LINUX)
# Add explicit X11 libraries dependency since USE_LINUX causes the port to
@@ -118,8 +131,17 @@ post-patch: .SILENT
.else
${REINPLACE_CMD} -E 's/(lib).*/\1/' ${WRKSRC}/x11/Makefile
.endif
+.if ${X_WINDOW_SYSTEM} == "xorg"
+ ${REINPLACE_CMD} -e 's|lib/modules|lib/xorg/modules|' \
+ ${WRKSRC}/x11/driver/Makefile \
+ ${WRKSRC}/x11/extension/Makefile \
+ ${WRKSRC}/x11/lib/Makefile
+.endif
${REINPLACE_CMD} '/bin/d ; /man/d' ${WRKSRC}/x11/Makefile
+pre-install:
+ ${MKDIR} ${PREFIX}/${MODULESDIR}/drivers
+
post-install:
# pkg-plist is already overbloated, so use this hack instead of PLIST_SUB's
.if ${NVVERSION} < 8174
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index 876dae49fb4a..0a08c138aae7 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -1,13 +1,20 @@
@comment I can't add the below files to the package because pkg_delete
@comment will complain when removing this package:
-@comment lib/modules/extensions/XXX-libglx.so.%%XLIBVERSION%%
-@comment lib/modules/extensions/XXX-libGLcore.so.%%XLIBVERSION%%
+@comment %%MODULESDIR%%/extensions/XXX-libglx.so.%%XLIBVERSION%%
+@comment %%MODULESDIR%%/extensions/XXX-libGLcore.so.%%XLIBVERSION%%
@comment lib/XXX-libGL.a.%%XLIBVERSION%%
@comment lib/XXX-libGL.so.1.%%XLIBVERSION%%
@comment They are however restored when this package is removed:
-@unexec mv -f %D/lib/modules/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% %D/lib/modules/extensions/libglx.so
-@unexec mv -f %D/lib/modules/extensions/XXX-libGLcore.so.%%%%.%%XSERVVERSION%% %D/lib/modules/extensions/libGLcore.so
-@unexec mv -f %D/lib/XXX-libGL.a.%%%%.%%XLIBVERSION%% %D/lib/libGL.a
+%%XFREE86%%@exec mv -f %D/%%MODULESDIR%%/extensions/libglx.la %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%%
+%%XFREE86%%@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.la
+@exec mv -f %D/%%MODULESDIR%%/extensions/libglx.so %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%%
+@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.so
+%%XFREE86%%@exec mv -f %D/%%MODULESDIR%%/extensions/libGLcore.la %D/%%MODULESDIR%%/extensions/XXX-libGLcore.la.%%%%.%%XSERVVERSION%%
+%%XFREE86%%@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libGLcore.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libGLcore.la
+@exec mv -f %D/%%MODULESDIR%%/extensions/libGLcore.so %D/%%MODULESDIR%%/extensions/XXX-libGLcore.so.%%%%.%%XSERVVERSION%%
+@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libGLcore.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libGLcore.so
+%%XORG%%@unexec mv -f %D/lib/XXX-libGL.a.%%%%.%%XLIBVERSION%% %D/lib/libGL.a
+@exec mv -f %D/lib/libGL.so.1 %D/lib/XXX-libGL.so.1.%%%%.%%XLIBVERSION%%
lib/libGL.so.1
@unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%XLIBVERSION%% %D/lib/libGL.so.1
@exec ln -sf %D/lib/libGL.so.1 %D/lib/libGL.so
@@ -27,13 +34,13 @@ lib/libnvidia-tls.so.1
@exec ln -sf %D/lib/libnvidia-tls.so.1 %D/lib/libnvidia-tls.so
@unexec rm -f %D/lib/libnvidia-tls.so
lib/libXvMCNVIDIA.a
-lib/modules/libnvidia-wfb.so.1
-@exec ln -sf %D/lib/modules/libnvidia-wfb.so.1 %D/lib/modules/libwfb.so
-@unexec rm -f %D/lib/modules/libwfb.so
-lib/modules/drivers/nvidia_drv.o
-lib/modules/drivers/nvidia_drv.so
-lib/modules/extensions/libglx.so.1
-@exec ln -sf %D/lib/modules/extensions/libglx.so.1 %D/lib/modules/extensions/libglx.so
+%%MODULESDIR%%/libnvidia-wfb.so.1
+@exec ln -sf %D/%%MODULESDIR%%/libnvidia-wfb.so.1 %D/%%MODULESDIR%%/libwfb.so
+@unexec rm -f %D/%%MODULESDIR%%/libwfb.so
+%%MODULESDIR%%/drivers/nvidia_drv.o
+%%MODULESDIR%%/drivers/nvidia_drv.so
+%%MODULESDIR%%/extensions/libglx.so.1
+@exec ln -sf %D/%%MODULESDIR%%/extensions/libglx.so.1 %D/%%MODULESDIR%%/extensions/libglx.so
%%PORTDOCS%%%%DOCSDIR%%/html/appendix-a.html
%%PORTDOCS%%%%DOCSDIR%%/html/appendix-b.html
%%PORTDOCS%%%%DOCSDIR%%/html/appendix-c.html
diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile
index 65db56ee34db..19488cd81d90 100644
--- a/x11/nvidia-settings/Makefile
+++ b/x11/nvidia-settings/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nvidia-settings
PORTVERSION= 1.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_NVIDIA:S,$,XFree86/${PORTNAME}/,} \
${MASTER_SITE_LOCAL:S,$,bland/,}
@@ -18,6 +18,7 @@ COMMENT= Display Control Panel for X NVidia driver
USE_X_PREFIX= yes
USE_GNOME= gtk20
USE_GMAKE= yes
+USE_GL= gl
PLIST_FILES= bin/nvidia-settings
MAN1= nvidia-settings.1
diff --git a/x11/oclock/Makefile b/x11/oclock/Makefile
new file mode 100644
index 000000000000..e2b538981c19
--- /dev/null
+++ b/x11/oclock/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: oclock
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= oclock
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Round clock application for X
+
+XORG_CAT= app
+USE_XORG= x11 xmu xext xt
+
+MAN1= oclock.1
+
+.include <bsd.port.mk>
diff --git a/x11/oclock/distinfo b/x11/oclock/distinfo
new file mode 100644
index 000000000000..5e5130ac4adc
--- /dev/null
+++ b/x11/oclock/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/oclock-1.0.1.tar.bz2) = 91f49547f9ed3cd0137c8b7c3183e360
+SHA256 (xorg/app/oclock-1.0.1.tar.bz2) = 49ab7d4f6402fbbe30714012ee38b49da17789f3a29ac41917987ce18c74217c
+SIZE (xorg/app/oclock-1.0.1.tar.bz2) = 83216
diff --git a/x11/oclock/pkg-descr b/x11/oclock/pkg-descr
new file mode 100644
index 000000000000..fe9a1fb4a125
--- /dev/null
+++ b/x11/oclock/pkg-descr
@@ -0,0 +1,5 @@
+This package contains oclock, which displays the current time on an analog
+display.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/oclock/pkg-plist b/x11/oclock/pkg-plist
new file mode 100644
index 000000000000..098c45563a22
--- /dev/null
+++ b/x11/oclock/pkg-plist
@@ -0,0 +1,3 @@
+bin/oclock
+share/X11/app-defaults/Clock-color
+@dirrmtry share/X11/app-defaults
diff --git a/x11/oooqs/Makefile b/x11/oooqs/Makefile
index 8e77497bcfe6..c89fbe4498cb 100644
--- a/x11/oooqs/Makefile
+++ b/x11/oooqs/Makefile
@@ -6,7 +6,7 @@
PORTNAME= oooqs
PORTVERSION= 2.0.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11
MASTER_SITES= http://download.berlios.de/segfaultskde/
diff --git a/x11/oooqs2/Makefile b/x11/oooqs2/Makefile
index c8bb9a8e3236..1a8c530c477c 100644
--- a/x11/oooqs2/Makefile
+++ b/x11/oooqs2/Makefile
@@ -6,7 +6,7 @@
PORTNAME= oooqs2
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://download.berlios.de/segfaultskde/ \
http://download2.berlios.de/segfaultskde/ \
diff --git a/x11/p5-Clipboard/Makefile b/x11/p5-Clipboard/Makefile
index eb74aa02f793..4f604204b6dd 100644
--- a/x11/p5-Clipboard/Makefile
+++ b/x11/p5-Clipboard/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Clipboard
PORTVERSION= 0.09
+PORTREVISION= 1
CATEGORIES= x11 perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= ../../authors/id/K/KI/KING
diff --git a/x11/p5-X11-GUITest/Makefile b/x11/p5-X11-GUITest/Makefile
index 82c442d781a2..1b4db7cbcc43 100644
--- a/x11/p5-X11-GUITest/Makefile
+++ b/x11/p5-X11-GUITest/Makefile
@@ -8,6 +8,7 @@
PORTNAME= X11-GUITest
PORTVERSION= 0.21
+PORTREVISION= 1
CATEGORIES= x11 perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
diff --git a/x11/p5-X11-IdleTime/Makefile b/x11/p5-X11-IdleTime/Makefile
index 465aa8b002aa..2b82af3b6ac3 100644
--- a/x11/p5-X11-IdleTime/Makefile
+++ b/x11/p5-X11-IdleTime/Makefile
@@ -7,6 +7,7 @@
PORTNAME= X11-IdleTime
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= x11 perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= X11
diff --git a/x11/padkey/Makefile b/x11/padkey/Makefile
index dfd1078c6eb9..dc7649f31053 100644
--- a/x11/padkey/Makefile
+++ b/x11/padkey/Makefile
@@ -7,6 +7,7 @@
PORTNAME= padkey
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= x11 games
MASTER_SITES= http://www.liquidx.org/padkey/releases/dist/
diff --git a/x11/panoramixext/Makefile b/x11/panoramixext/Makefile
index dd18038b3917..4ba271ebb414 100644
--- a/x11/panoramixext/Makefile
+++ b/x11/panoramixext/Makefile
@@ -7,6 +7,7 @@
PORTNAME= panoramixext
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
diff --git a/x11/peeper/Makefile b/x11/peeper/Makefile
index d4496ce794cf..cbe22c2f2e98 100644
--- a/x11/peeper/Makefile
+++ b/x11/peeper/Makefile
@@ -8,7 +8,7 @@
PORTNAME= peeper
PORTVERSION= 0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://peeper.sourceforge.net/
diff --git a/x11/portoseguro/Makefile b/x11/portoseguro/Makefile
index 3e1e871464f7..82dce4324a84 100644
--- a/x11/portoseguro/Makefile
+++ b/x11/portoseguro/Makefile
@@ -7,7 +7,7 @@
PORTNAME= portoseguro
PORTVERSION= 0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= trevor
diff --git a/x11/powershell/Makefile b/x11/powershell/Makefile
index a69ed7b6f583..4faf99eb2ee3 100644
--- a/x11/powershell/Makefile
+++ b/x11/powershell/Makefile
@@ -7,7 +7,7 @@
PORTNAME= powershell
PORTVERSION= 0.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11/printext/Makefile b/x11/printext/Makefile
index c30f81c78a07..2e2ba0a1dec7 100644
--- a/x11/printext/Makefile
+++ b/x11/printext/Makefile
@@ -7,6 +7,7 @@
PORTNAME= printext
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xorg.freedesktop.org/X11R6.7.0/src/ \
${MASTER_SITE_XORG}
diff --git a/x11/printproto/Makefile b/x11/printproto/Makefile
new file mode 100644
index 000000000000..82049577ad59
--- /dev/null
+++ b/x11/printproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: printproto
+# Date Created: 08 Aug 2005
+# Whom: Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= printproto
+PORTVERSION= 1.0.3
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Print extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/printproto/distinfo b/x11/printproto/distinfo
new file mode 100644
index 000000000000..638a4e42bbc3
--- /dev/null
+++ b/x11/printproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/printproto-1.0.3.tar.bz2) = 0f4e7982c6d4ec3b2cf38502dd1293a3
+SHA256 (xorg/proto/printproto-1.0.3.tar.bz2) = 8b375f8cda83dfc7d84be44af41eedd484d0e2499acbd19bdca5b4056dec7235
+SIZE (xorg/proto/printproto-1.0.3.tar.bz2) = 43560
diff --git a/x11/printproto/pkg-descr b/x11/printproto/pkg-descr
new file mode 100644
index 000000000000..c363d52f32fc
--- /dev/null
+++ b/x11/printproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org Print extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/printproto/pkg-plist b/x11/printproto/pkg-plist
new file mode 100644
index 000000000000..44d872813219
--- /dev/null
+++ b/x11/printproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/Print.h
+include/X11/extensions/Printstr.h
+libdata/pkgconfig/printproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/props/Makefile b/x11/props/Makefile
index b8faa07cd9a7..06e4d83afd71 100644
--- a/x11/props/Makefile
+++ b/x11/props/Makefile
@@ -7,6 +7,7 @@
PORTNAME= props
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= fenner
diff --git a/x11/props/pkg-plist b/x11/props/pkg-plist
index 8d37084c15a7..acea2efedaf8 100644
--- a/x11/props/pkg-plist
+++ b/x11/props/pkg-plist
@@ -6,3 +6,5 @@ lib/X11/locale/C/props/en_CA
lib/X11/locale/C/props/en_UK
lib/X11/locale/C/props/en_US
@dirrm lib/X11/locale/C/props
+@dirrm lib/X11/locale/C
+@dirrm lib/X11/locale
diff --git a/x11/py-qt4-opengl/Makefile b/x11/py-qt4-opengl/Makefile
index 6f5548948b32..11a68cd69fce 100644
--- a/x11/py-qt4-opengl/Makefile
+++ b/x11/py-qt4-opengl/Makefile
@@ -6,6 +6,7 @@
PORTNAME= opengl
PORTVERSION= 4.2
+PORTREVISION= 1
CATEGORIES= x11 devel python
MASTER_SITES= http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/ \
http://freebsd.ricin.com/ports/distfiles/
diff --git a/x11/qrash/Makefile b/x11/qrash/Makefile
index 2c4257d4e3da..b7d67d9b3714 100644
--- a/x11/qrash/Makefile
+++ b/x11/qrash/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qrash
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://qmg.org/files/demos/qmg/ \
ftp://qmg.org/pub/demos/qmg/ \
diff --git a/x11/qt4-inputmethods/Makefile b/x11/qt4-inputmethods/Makefile
index 8cd426d83e66..abdea88f3501 100644
--- a/x11/qt4-inputmethods/Makefile
+++ b/x11/qt4-inputmethods/Makefile
@@ -8,7 +8,7 @@
PORTNAME= inputmethods
PORTVERSION= 4.2.3
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES?= x11
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
diff --git a/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile
index 37028a719bb7..1b6abf32f8e7 100644
--- a/x11/qt4-opengl/Makefile
+++ b/x11/qt4-opengl/Makefile
@@ -8,7 +8,7 @@
PORTNAME= opengl
PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= x11
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
diff --git a/x11/randrext/Makefile b/x11/randrext/Makefile
index 0100ed2092d3..97e05ef65494 100644
--- a/x11/randrext/Makefile
+++ b/x11/randrext/Makefile
@@ -7,6 +7,7 @@
PORTNAME= randrext
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
diff --git a/x11/randrproto/Makefile b/x11/randrproto/Makefile
new file mode 100644
index 000000000000..0815c2276944
--- /dev/null
+++ b/x11/randrproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: randrproto
+# Date Created: 08 Aug 2005
+# Whom: Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= randrproto
+PORTVERSION= 1.2.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Randr extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/randrproto/distinfo b/x11/randrproto/distinfo
new file mode 100644
index 000000000000..a44ea325d5f9
--- /dev/null
+++ b/x11/randrproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/randrproto-1.2.1.tar.bz2) = e2e45564f8ce22e00e1360e79c8ccdeb
+SHA256 (xorg/proto/randrproto-1.2.1.tar.bz2) = 102fd42f8f2562450f4e45c28bfb0390c2d30ffa6a805eead15d67018930f654
+SIZE (xorg/proto/randrproto-1.2.1.tar.bz2) = 54962
diff --git a/x11/randrproto/pkg-descr b/x11/randrproto/pkg-descr
new file mode 100644
index 000000000000..3b5914edab2a
--- /dev/null
+++ b/x11/randrproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org Randr extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/randrproto/pkg-plist b/x11/randrproto/pkg-plist
new file mode 100644
index 000000000000..13c2f1d90c8c
--- /dev/null
+++ b/x11/randrproto/pkg-plist
@@ -0,0 +1,6 @@
+include/X11/extensions/randr.h
+include/X11/extensions/randrproto.h
+libdata/pkgconfig/randrproto.pc
+%%DOCSDIR%%/randrproto.txt
+@dirrmtry include/X11/extensions
+@dirrm %%DOCSDIR%%
diff --git a/x11/recordproto/Makefile b/x11/recordproto/Makefile
new file mode 100644
index 000000000000..208c23a5f52d
--- /dev/null
+++ b/x11/recordproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: recordproto
+# Date Created: 06 Feb 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= recordproto
+PORTVERSION= 1.13.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= RECORD extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/recordproto/distinfo b/x11/recordproto/distinfo
new file mode 100644
index 000000000000..ea16d442c939
--- /dev/null
+++ b/x11/recordproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/recordproto-1.13.2.tar.bz2) = 0ed4706564a34fc2aff724aa16d3ff00
+SHA256 (xorg/proto/recordproto-1.13.2.tar.bz2) = 04e77a8b14f373a1825bbe0116cd0db8b2c5dee17b34ba9bddd27e576609cff9
+SIZE (xorg/proto/recordproto-1.13.2.tar.bz2) = 39340
diff --git a/x11/recordproto/pkg-descr b/x11/recordproto/pkg-descr
new file mode 100644
index 000000000000..129d2324260c
--- /dev/null
+++ b/x11/recordproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org RECORD extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/recordproto/pkg-plist b/x11/recordproto/pkg-plist
new file mode 100644
index 000000000000..7b90206b4504
--- /dev/null
+++ b/x11/recordproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/record.h
+include/X11/extensions/recordstr.h
+libdata/pkgconfig/recordproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/rendercheck/Makefile b/x11/rendercheck/Makefile
index 4e3610bb63df..36bd6c517bcb 100644
--- a/x11/rendercheck/Makefile
+++ b/x11/rendercheck/Makefile
@@ -6,15 +6,16 @@
#
PORTNAME= rendercheck
-PORTVERSION= 1.0.3
+PORTVERSION= 1.2
+PORTREVISION= 1
CATEGORIES= x11
-MASTER_SITES= http://xapps.freedesktop.org/release/
MAINTAINER= anholt@FreeBSD.org
COMMENT= A small program for testing basic Render extension conformance
-USE_XLIB= yes
-USE_BZIP2= yes
-GNU_CONFIGURE= yes
+XORG_CAT= app
+USE_XORG= xrender
+
+MAN1= rendercheck.1
.include <bsd.port.mk>
diff --git a/x11/rendercheck/distinfo b/x11/rendercheck/distinfo
index 425e4e9bffad..10f93f79f5c1 100644
--- a/x11/rendercheck/distinfo
+++ b/x11/rendercheck/distinfo
@@ -1,3 +1,3 @@
-MD5 (rendercheck-1.0.3.tar.bz2) = 2243292499588ea0708c8ec498a532bb
-SHA256 (rendercheck-1.0.3.tar.bz2) = d783108e140e0632276a10fe559679adfbfef188723cacb732fe7d0099e3bd3a
-SIZE (rendercheck-1.0.3.tar.bz2) = 63448
+MD5 (xorg/app/rendercheck-1.2.tar.bz2) = 76ffc65a3b708d380a66823a56b7be15
+SHA256 (xorg/app/rendercheck-1.2.tar.bz2) = 4e2a837b688ff6b50f3e17c2e3a2d6b836fb2eb75560a7c6f2818183d5e64677
+SIZE (xorg/app/rendercheck-1.2.tar.bz2) = 76245
diff --git a/x11/renderext/Makefile b/x11/renderext/Makefile
index ca4b5a2b099b..ec99459336bc 100644
--- a/x11/renderext/Makefile
+++ b/x11/renderext/Makefile
@@ -7,7 +7,7 @@
PORTNAME= renderext
PORTVERSION= 0.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
diff --git a/x11/renderproto/Makefile b/x11/renderproto/Makefile
new file mode 100644
index 000000000000..f06f3af06d34
--- /dev/null
+++ b/x11/renderproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: renderproto
+# Date Created: 08 Aug 2005
+# Whom: Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= renderproto
+PORTVERSION= 0.9.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= RenderProto protocol headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/renderproto/distinfo b/x11/renderproto/distinfo
new file mode 100644
index 000000000000..00ced5d63ca5
--- /dev/null
+++ b/x11/renderproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/renderproto-0.9.2.tar.bz2) = 28fbe8a59ebd31f098b90ec64f3d133a
+SHA256 (xorg/proto/renderproto-0.9.2.tar.bz2) = 7754dfbbb1e3818f28720fa9647b8a593e9d54626a7896771c2bfac7f75e2726
+SIZE (xorg/proto/renderproto-0.9.2.tar.bz2) = 40056
diff --git a/x11/renderproto/pkg-descr b/x11/renderproto/pkg-descr
new file mode 100644
index 000000000000..813b21cb5def
--- /dev/null
+++ b/x11/renderproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org RenderProto protocol headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/renderproto/pkg-plist b/x11/renderproto/pkg-plist
new file mode 100644
index 000000000000..0b7b61817bdb
--- /dev/null
+++ b/x11/renderproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/render.h
+include/X11/extensions/renderproto.h
+libdata/pkgconfig/renderproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/resourceext/Makefile b/x11/resourceext/Makefile
index 7cfa50a222e8..7099a19b89a2 100644
--- a/x11/resourceext/Makefile
+++ b/x11/resourceext/Makefile
@@ -7,7 +7,7 @@
PORTNAME= resourceext
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
diff --git a/x11/resourceproto/Makefile b/x11/resourceproto/Makefile
new file mode 100644
index 000000000000..be801f371f39
--- /dev/null
+++ b/x11/resourceproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: resourceproto
+# Date Created: 08 Aug 2005
+# Whom: Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= resourceproto
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Resource extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/resourceproto/distinfo b/x11/resourceproto/distinfo
new file mode 100644
index 000000000000..f326dfbb342f
--- /dev/null
+++ b/x11/resourceproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/resourceproto-1.0.2.tar.bz2) = b823b314e37eb19dae1f297951d2e933
+SHA256 (xorg/proto/resourceproto-1.0.2.tar.bz2) = 0c33d6fceef5483001459bdc934b5831502250b27f1f4ad370ab044f8ab53487
+SIZE (xorg/proto/resourceproto-1.0.2.tar.bz2) = 36859
diff --git a/x11/resourceproto/pkg-descr b/x11/resourceproto/pkg-descr
new file mode 100644
index 000000000000..28688a4db9e1
--- /dev/null
+++ b/x11/resourceproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org Resource extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/resourceproto/pkg-plist b/x11/resourceproto/pkg-plist
new file mode 100644
index 000000000000..527067aaa442
--- /dev/null
+++ b/x11/resourceproto/pkg-plist
@@ -0,0 +1,3 @@
+include/X11/extensions/XResproto.h
+libdata/pkgconfig/resourceproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/rgb/Makefile b/x11/rgb/Makefile
new file mode 100644
index 000000000000..3f6c75193467
--- /dev/null
+++ b/x11/rgb/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for: rgb
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= rgb
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Uncompile an rgb corl-name database
+
+CONFIGURE_ARGS= --with-rgb-db-dir=${PREFIX}/lib/X11/rgb
+
+XORG_CAT= app
+USE_XORG= x11 xproto
+
+PLIST_FILES= bin/showrgb lib/X11/rgb.txt
+
+MAN1= showrgb.1
+
+.include <bsd.port.mk>
diff --git a/x11/rgb/distinfo b/x11/rgb/distinfo
new file mode 100644
index 000000000000..43941f4519aa
--- /dev/null
+++ b/x11/rgb/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/rgb-1.0.1.tar.bz2) = 255222b3ab3af671289a6b4844e9f393
+SHA256 (xorg/app/rgb-1.0.1.tar.bz2) = f635bc02f72f62c248af8a19aa6931e9f2d061cca258c12c1468d486602990ad
+SIZE (xorg/app/rgb-1.0.1.tar.bz2) = 91473
diff --git a/x11/rgb/pkg-descr b/x11/rgb/pkg-descr
new file mode 100644
index 000000000000..949c3fd4e280
--- /dev/null
+++ b/x11/rgb/pkg-descr
@@ -0,0 +1,6 @@
+This package contains showrgb, a program that reads an rgb color-name
+database compiled for use with the dbm database routines and converts it
+back to source form, printing the result to standard output.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/rox-wallpaper/Makefile b/x11/rox-wallpaper/Makefile
index 26c22bdbec58..fcdf95b774f0 100644
--- a/x11/rox-wallpaper/Makefile
+++ b/x11/rox-wallpaper/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rox-wallpaper
PORTVERSION= 2.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= rox
diff --git a/x11/roxbg/Makefile b/x11/roxbg/Makefile
index ba6427dbdd72..2f1f9331ec11 100644
--- a/x11/roxbg/Makefile
+++ b/x11/roxbg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= roxbg
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= x11 deskutils
MASTER_SITES= http://vvelox.net/programs/unix/x11/
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/x11/rsibreak-kde4/Makefile b/x11/rsibreak-kde4/Makefile
index 56c77cfc3ac2..50e51db66bed 100644
--- a/x11/rsibreak-kde4/Makefile
+++ b/x11/rsibreak-kde4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rsibreak
PORTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= http://www.rsibreak.org/images/e/e0/
DISTFILES= Rsibreak-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/x11/rsibreak-kde4/pkg-plist b/x11/rsibreak-kde4/pkg-plist
index 58acda366e65..1b9cf5a38a00 100644
--- a/x11/rsibreak-kde4/pkg-plist
+++ b/x11/rsibreak-kde4/pkg-plist
@@ -94,19 +94,3 @@ share/locale/tr/LC_MESSAGES/rsibreak.mo
@dirrm share/doc/HTML/nl/rsibreak
@dirrm share/doc/HTML/pt/rsibreak
@dirrm share/doc/HTML/sv/rsibreak
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
diff --git a/x11/rsibreak/Makefile b/x11/rsibreak/Makefile
index 56c77cfc3ac2..50e51db66bed 100644
--- a/x11/rsibreak/Makefile
+++ b/x11/rsibreak/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rsibreak
PORTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= http://www.rsibreak.org/images/e/e0/
DISTFILES= Rsibreak-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/x11/rsibreak/pkg-plist b/x11/rsibreak/pkg-plist
index 58acda366e65..1b9cf5a38a00 100644
--- a/x11/rsibreak/pkg-plist
+++ b/x11/rsibreak/pkg-plist
@@ -94,19 +94,3 @@ share/locale/tr/LC_MESSAGES/rsibreak.mo
@dirrm share/doc/HTML/nl/rsibreak
@dirrm share/doc/HTML/pt/rsibreak
@dirrm share/doc/HTML/sv/rsibreak
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
diff --git a/x11/rstart/Makefile b/x11/rstart/Makefile
new file mode 100644
index 000000000000..258bc19dda44
--- /dev/null
+++ b/x11/rstart/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: rstart
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= rstart
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Sample implementation of a Remote Start client
+
+XORG_CAT= app
+USE_XORG= x11
+
+MAN1= rstart.1 rstartd.1
+
+.include <bsd.port.mk>
diff --git a/x11/rstart/distinfo b/x11/rstart/distinfo
new file mode 100644
index 000000000000..f648424763a9
--- /dev/null
+++ b/x11/rstart/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/rstart-1.0.2.tar.bz2) = 99aea04a27197056368a4431f30f9cdb
+SHA256 (xorg/app/rstart-1.0.2.tar.bz2) = 02fc48b5069018e4262f0e5ebb669acedc04167307c98f0fdb2ca22e568e9596
+SIZE (xorg/app/rstart-1.0.2.tar.bz2) = 92924
diff --git a/x11/rstart/pkg-descr b/x11/rstart/pkg-descr
new file mode 100644
index 000000000000..15df1d2064c3
--- /dev/null
+++ b/x11/rstart/pkg-descr
@@ -0,0 +1,5 @@
+This package contains rstart, a sample implementation of a Remote Start
+client.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/rstart/pkg-plist b/x11/rstart/pkg-plist
new file mode 100644
index 000000000000..39e8858e79fb
--- /dev/null
+++ b/x11/rstart/pkg-plist
@@ -0,0 +1,17 @@
+bin/rstart
+bin/rstartd
+lib/X11/rstart/config
+lib/X11/rstart/rstartd.real
+lib/X11/rstart/commands/x11r6/@List
+lib/X11/rstart/commands/x11r6/Terminal
+lib/X11/rstart/commands/x11r6/LoadMonitor
+lib/X11/rstart/commands/ListGenericCommands
+lib/X11/rstart/commands/@List
+lib/X11/rstart/commands/ListContexts
+lib/X11/rstart/contexts/default
+lib/X11/rstart/contexts/x11r6
+lib/X11/rstart/contexts/@List
+@dirrm lib/X11/rstart/contexts
+@dirrm lib/X11/rstart/commands/x11r6
+@dirrm lib/X11/rstart/commands
+@dirrm lib/X11/rstart
diff --git a/x11/ruby-gnome2-all/Makefile b/x11/ruby-gnome2-all/Makefile
index 61ff5c02acb1..8a197c283869 100644
--- a/x11/ruby-gnome2-all/Makefile
+++ b/x11/ruby-gnome2-all/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome2-all
PORTVERSION= ${RUBY_GNOME_PORTVERSION}
+PORTREVISION= 1
CATEGORIES= x11 ruby gnome
MASTER_SITES= # none
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
diff --git a/x11/ruby-gnome2/Makefile b/x11/ruby-gnome2/Makefile
index e1076d63308c..867ab8647c92 100644
--- a/x11/ruby-gnome2/Makefile
+++ b/x11/ruby-gnome2/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome2
PORTVERSION= ${RUBY_GNOME_PORTVERSION}
+PORTREVISION= 1
CATEGORIES= x11 ruby
MASTER_SITES= ${RUBY_GNOME_MASTER_SITES}
MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR}
diff --git a/x11/ruby-gtktrayicon/Makefile b/x11/ruby-gtktrayicon/Makefile
index bcf5b6ee704b..975116bb76a1 100644
--- a/x11/ruby-gtktrayicon/Makefile
+++ b/x11/ruby-gtktrayicon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtktrayicon
PORTVERSION= 0.1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 gnome ruby
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ruby-gnome2
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index 4fe0d0978d66..6a3dd5e257bd 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -10,7 +10,7 @@
PORTNAME= rxvt
PORTVERSION= 2.7.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES+= x11
MASTER_SITES= \
http://slackware.osuosl.org/slackware_source/xap/rxvt/ \
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 6137128a46d8..c3597c38e17b 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -7,6 +7,7 @@
PORTNAME= rxvt-unicode
PORTVERSION= 8.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://dist.schmorp.de/rxvt-unicode/%SUBDIR%/
MASTER_SITE_SUBDIR= . Attic
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 7573694851d6..c89206ea62cb 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -10,7 +10,7 @@
PORTNAME= rxvt
PORTVERSION= 2.6.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES+= x11
MASTER_SITES= \
http://public.planetmirror.com/pub/rxvt/%SUBDIR%/ \
diff --git a/x11/scripts/Makefile b/x11/scripts/Makefile
new file mode 100644
index 000000000000..e6342c364759
--- /dev/null
+++ b/x11/scripts/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: scripts
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= scripts
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Various X related scripts
+
+XORG_CAT= app
+USE_XORG= x11
+
+MAN1= xon.1
+
+.include <bsd.port.mk>
diff --git a/x11/scripts/distinfo b/x11/scripts/distinfo
new file mode 100644
index 000000000000..2a6dde2a2289
--- /dev/null
+++ b/x11/scripts/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/scripts-1.0.1.tar.bz2) = 08c7f078fc351196c21db3a8206d482d
+SHA256 (xorg/app/scripts-1.0.1.tar.bz2) = 1b154b4359302ca499818c45396325aef9ff364d6ff4ce5c3769e4803994a136
+SIZE (xorg/app/scripts-1.0.1.tar.bz2) = 72301
diff --git a/x11/scripts/pkg-descr b/x11/scripts/pkg-descr
new file mode 100644
index 000000000000..b93ee760df89
--- /dev/null
+++ b/x11/scripts/pkg-descr
@@ -0,0 +1 @@
+This package contains scripts, a collection of various X related scripts.
diff --git a/x11/scripts/pkg-plist b/x11/scripts/pkg-plist
new file mode 100644
index 000000000000..1135a62d4315
--- /dev/null
+++ b/x11/scripts/pkg-plist
@@ -0,0 +1,4 @@
+bin/xauth_switch_to_sun-des-1
+bin/fontname.sh
+bin/fontprop.sh
+bin/xon
diff --git a/x11/scrnsaverproto/Makefile b/x11/scrnsaverproto/Makefile
new file mode 100644
index 000000000000..c622be384be5
--- /dev/null
+++ b/x11/scrnsaverproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: scrnsaverproto
+# Date Created: 21 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= scrnsaverproto
+PORTVERSION= 1.1.0
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= ScrnSaver extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/scrnsaverproto/distinfo b/x11/scrnsaverproto/distinfo
new file mode 100644
index 000000000000..fa64dda6cb0a
--- /dev/null
+++ b/x11/scrnsaverproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/scrnsaverproto-1.1.0.tar.bz2) = 5d551850e6f4acdf49a13f4eb3a5bbfa
+SHA256 (xorg/proto/scrnsaverproto-1.1.0.tar.bz2) = db09abf73cc339c05c0488639731794372a4770cfca76c2645f503f9fccd478f
+SIZE (xorg/proto/scrnsaverproto-1.1.0.tar.bz2) = 38066
diff --git a/x11/scrnsaverproto/pkg-descr b/x11/scrnsaverproto/pkg-descr
new file mode 100644
index 000000000000..1c4a92a44911
--- /dev/null
+++ b/x11/scrnsaverproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org ScrnSaver extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/scrnsaverproto/pkg-plist b/x11/scrnsaverproto/pkg-plist
new file mode 100644
index 000000000000..61b64df0f8b2
--- /dev/null
+++ b/x11/scrnsaverproto/pkg-plist
@@ -0,0 +1,5 @@
+include/X11/extensions/saver.h
+include/X11/extensions/saverproto.h
+include/X11/extensions/scrnsaver.h
+libdata/pkgconfig/scrnsaverproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile
new file mode 100644
index 000000000000..effe0637e665
--- /dev/null
+++ b/x11/sessreg/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: sessreg
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= sessreg
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Manage utmp/wtmp entries for non-init X clients
+
+XORG_CAT= app
+USE_XORG= x11
+
+PLIST_FILES= bin/sessreg
+
+MAN1= sessreg.1
+
+.include <bsd.port.mk>
diff --git a/x11/sessreg/distinfo b/x11/sessreg/distinfo
new file mode 100644
index 000000000000..34b2e135aba4
--- /dev/null
+++ b/x11/sessreg/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/sessreg-1.0.2.tar.bz2) = bee5d87d40615e67c84ab0b0c65049ba
+SHA256 (xorg/app/sessreg-1.0.2.tar.bz2) = c23c12259854c7cec6d19bf397afff4a542a22170b14de73b321aa8cafcf3a86
+SIZE (xorg/app/sessreg-1.0.2.tar.bz2) = 94745
diff --git a/x11/sessreg/files/patch-sessreg.h b/x11/sessreg/files/patch-sessreg.h
new file mode 100644
index 000000000000..4c4683b11cfc
--- /dev/null
+++ b/x11/sessreg/files/patch-sessreg.h
@@ -0,0 +1,10 @@
+--- sessreg.h.orig Wed Dec 6 16:33:46 2006
++++ sessreg.h Wed Dec 6 16:34:00 2006
+@@ -55,6 +55,7 @@
+
+ #include "config.h"
+
++#include <sys/types.h>
+ #include <time.h>
+ #include <utmp.h>
+
diff --git a/x11/sessreg/pkg-descr b/x11/sessreg/pkg-descr
new file mode 100644
index 000000000000..64ada8d0511a
--- /dev/null
+++ b/x11/sessreg/pkg-descr
@@ -0,0 +1,5 @@
+This package contains sessreg, which is a simple program for managing
+utmp/wtmp entries for xdm sessions.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/setxkbmap/Makefile b/x11/setxkbmap/Makefile
new file mode 100644
index 000000000000..70a9ca71f562
--- /dev/null
+++ b/x11/setxkbmap/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for: setxkbmap
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= setxkbmap
+PORTVERSION= 1.0.3
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Set the keyboard using the X Keyboard Extension
+
+XORG_CAT= app
+USE_XORG= xkbfile x11
+
+CONFIGURE_ARGS= --with-xkb-config-root=${X11BASE}/share/X11/xkb
+
+PLIST_FILES= bin/setxkbmap
+
+MAN1= setxkbmap.1
+
+.include <bsd.port.mk>
diff --git a/x11/setxkbmap/distinfo b/x11/setxkbmap/distinfo
new file mode 100644
index 000000000000..f872272e8521
--- /dev/null
+++ b/x11/setxkbmap/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/setxkbmap-1.0.3.tar.bz2) = 2b53542095a35a8a5731164118643883
+SHA256 (xorg/app/setxkbmap-1.0.3.tar.bz2) = 086f67c8272ceca059c64e127dbdb66ccad8de6f532aee02d22786543718a508
+SIZE (xorg/app/setxkbmap-1.0.3.tar.bz2) = 86655
diff --git a/x11/setxkbmap/pkg-descr b/x11/setxkbmap/pkg-descr
new file mode 100644
index 000000000000..b4016ffb56c1
--- /dev/null
+++ b/x11/setxkbmap/pkg-descr
@@ -0,0 +1,5 @@
+This package contains setxkbmp, a program for setting the keyboard using
+the X Keyboard Extension.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/silo/Makefile b/x11/silo/Makefile
index b9eafd6fcad7..0038f31580aa 100644
--- a/x11/silo/Makefile
+++ b/x11/silo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= silo
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://doublef.nm.ru/silo/sources/
diff --git a/x11/sisctrl/Makefile b/x11/sisctrl/Makefile
index 9055f07d8d49..45d9f900ca57 100644
--- a/x11/sisctrl/Makefile
+++ b/x11/sisctrl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sisctrl
PORTVERSION= 0.0.20051202
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.winischhofer.net/sis/
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index b4b651a09ca5..49f8695febe0 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -7,7 +7,7 @@
PORTNAME= slim
PORTVERSION= 1.2.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_BERLIOS} \
http://depot.fsck.ch/mirror/distfiles/
diff --git a/x11/slock/Makefile b/x11/slock/Makefile
index 8629107e421f..032136f062eb 100644
--- a/x11/slock/Makefile
+++ b/x11/slock/Makefile
@@ -7,6 +7,7 @@
PORTNAME= slock
PORTVERSION= 0.6
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.suckless.org/download/ CENKES
diff --git a/x11/smproxy/Makefile b/x11/smproxy/Makefile
new file mode 100644
index 000000000000..33b7cf2ac697
--- /dev/null
+++ b/x11/smproxy/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: smproxy
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= smproxy
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Session Manager Proxy
+
+XORG_CAT= app
+USE_XORG= xt xmu
+
+PLIST_FILES= bin/smproxy
+
+MAN1= smproxy.1
+
+.include <bsd.port.mk>
diff --git a/x11/smproxy/distinfo b/x11/smproxy/distinfo
new file mode 100644
index 000000000000..77a9c7b77116
--- /dev/null
+++ b/x11/smproxy/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/smproxy-1.0.2.tar.bz2) = 31da204a0255ba8c6a65386e65dc1c90
+SHA256 (xorg/app/smproxy-1.0.2.tar.bz2) = 76d22f0cf07c8c4386a15c5c935b58319bd747befb940a0f03f652d59c4f67d2
+SIZE (xorg/app/smproxy-1.0.2.tar.bz2) = 87139
diff --git a/x11/smproxy/pkg-descr b/x11/smproxy/pkg-descr
new file mode 100644
index 000000000000..98f9ecdcda45
--- /dev/null
+++ b/x11/smproxy/pkg-descr
@@ -0,0 +1,5 @@
+This package contains smproxy, a Session Manager Proxy for the X Window
+System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/stalonetray/Makefile b/x11/stalonetray/Makefile
index f64739864105..401a7d8c2b98 100644
--- a/x11/stalonetray/Makefile
+++ b/x11/stalonetray/Makefile
@@ -7,6 +7,7 @@
PORTNAME= stalonetray
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index 78322de5f1c5..85b79486de82 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -7,6 +7,7 @@
PORTNAME= startup-notification
PORTVERSION= 0.9
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://www.freedesktop.org/software/startup-notification/releases/
diff --git a/x11/sxpc/Makefile b/x11/sxpc/Makefile
index d88317869255..c1d6fe3a6bcd 100644
--- a/x11/sxpc/Makefile
+++ b/x11/sxpc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= sxpc
PORTVERSION= 1.4
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
diff --git a/x11/temperature.app/Makefile b/x11/temperature.app/Makefile
index 3e73979a11ea..418b37d3df10 100644
--- a/x11/temperature.app/Makefile
+++ b/x11/temperature.app/Makefile
@@ -7,7 +7,7 @@
PORTNAME= temperature.app
PORTVERSION= 1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 windowmaker
MASTER_SITES= http://www.fukt.bth.se/~per/temperature/
DISTNAME= Temperature.app-${PORTVERSION}
diff --git a/x11/terminal.app/Makefile b/x11/terminal.app/Makefile
index fbcf304cfd9e..f2442f974774 100644
--- a/x11/terminal.app/Makefile
+++ b/x11/terminal.app/Makefile
@@ -7,6 +7,7 @@
PORTNAME= terminal.app
PORTVERSION= 0.9.4
+PORTREVISION= 1
DISTVERSIONSUFFIX= +cvs20051125.orig
CATEGORIES= x11 gnustep
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
diff --git a/x11/thinglaunch/Makefile b/x11/thinglaunch/Makefile
index e19513fe9e47..c15967fbebfc 100644
--- a/x11/thinglaunch/Makefile
+++ b/x11/thinglaunch/Makefile
@@ -7,6 +7,7 @@
PORTNAME= thinglaunch
PORTVERSION= 1.03
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://critical.ch/distfiles/ \
http://energy.critical.ch/distfiles/
diff --git a/x11/tilda/Makefile b/x11/tilda/Makefile
index c9ef86c7dc9b..4b81e8c6ea21 100644
--- a/x11/tilda/Makefile
+++ b/x11/tilda/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tilda
PORTVERSION= 0.9.4
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11/tilda/pkg-plist b/x11/tilda/pkg-plist
index 004959b348d6..23066a1bcc1a 100644
--- a/x11/tilda/pkg-plist
+++ b/x11/tilda/pkg-plist
@@ -1,7 +1,6 @@
bin/tilda
share/applications/tilda.desktop
share/pixmaps/tilda.png
-@dirrmtry share/pixmaps
@dirrmtry share/applications
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
diff --git a/x11/tkXwin/Makefile b/x11/tkXwin/Makefile
index c5dc871e53cc..d4284ca1fe3c 100644
--- a/x11/tkXwin/Makefile
+++ b/x11/tkXwin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tkXwin
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITES_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11/tkgoodstuff/Makefile b/x11/tkgoodstuff/Makefile
index a37c6c745648..3376bc1d820d 100644
--- a/x11/tkgoodstuff/Makefile
+++ b/x11/tkgoodstuff/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tkgoodstuff
PORTVERSION= 8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 tk80
#
# No longer published by original developer. This port still works, although
diff --git a/x11/trapproto/Makefile b/x11/trapproto/Makefile
new file mode 100644
index 000000000000..c9fbcd9788c1
--- /dev/null
+++ b/x11/trapproto/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for: trapproto
+# Date Created: 06 Feb 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= trapproto
+PORTVERSION= 3.4.3
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= DEC-XTRAP extension headers
+
+XORG_CAT= proto
+
+USE_XORG= xt:both
+
+.include <bsd.port.mk>
diff --git a/x11/trapproto/distinfo b/x11/trapproto/distinfo
new file mode 100644
index 000000000000..91d9f1b82a5a
--- /dev/null
+++ b/x11/trapproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/trapproto-3.4.3.tar.bz2) = 3b713239e5e6b269b31cb665563358df
+SHA256 (xorg/proto/trapproto-3.4.3.tar.bz2) = ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1
+SIZE (xorg/proto/trapproto-3.4.3.tar.bz2) = 48785
diff --git a/x11/trapproto/pkg-descr b/x11/trapproto/pkg-descr
new file mode 100644
index 000000000000..a32dc1071b65
--- /dev/null
+++ b/x11/trapproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org DEC-XTRAP extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/trapproto/pkg-plist b/x11/trapproto/pkg-plist
new file mode 100644
index 000000000000..2b8601c4063b
--- /dev/null
+++ b/x11/trapproto/pkg-plist
@@ -0,0 +1,9 @@
+include/X11/extensions/xtrapbits.h
+include/X11/extensions/xtrapddmi.h
+include/X11/extensions/xtrapdi.h
+include/X11/extensions/xtrapemacros.h
+include/X11/extensions/xtraplib.h
+include/X11/extensions/xtraplibp.h
+include/X11/extensions/xtrapproto.h
+libdata/pkgconfig/trapproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/trayer/Makefile b/x11/trayer/Makefile
index 61bcfc302476..6feb85453241 100644
--- a/x11/trayer/Makefile
+++ b/x11/trayer/Makefile
@@ -6,6 +6,7 @@
PORTNAME= trayer
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/t/trayer
diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile
index f8c522c6c185..5e0d52ce79a0 100644
--- a/x11/tycoon/Makefile
+++ b/x11/tycoon/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tycoon
PORTVERSION= 1.07o
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/desktop
diff --git a/x11/vdesk/Makefile b/x11/vdesk/Makefile
index 0db1337b2b1e..a0fac25a14e9 100644
--- a/x11/vdesk/Makefile
+++ b/x11/vdesk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= vdesk
PORTVERSION= 1.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://offog.org/files/
diff --git a/x11/videoproto/Makefile b/x11/videoproto/Makefile
new file mode 100644
index 000000000000..fef7e25c2993
--- /dev/null
+++ b/x11/videoproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: videoproto
+# Date Created: 09 Aug 2005
+# Whom: Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= videoproto
+PORTVERSION= 2.2.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Video extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/videoproto/distinfo b/x11/videoproto/distinfo
new file mode 100644
index 000000000000..a38e0b813efb
--- /dev/null
+++ b/x11/videoproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/videoproto-2.2.2.tar.bz2) = 44292d74a9a3c94b1ecb9d77a0da83e8
+SHA256 (xorg/proto/videoproto-2.2.2.tar.bz2) = ab088478830cd30c2fe34fb7f44ffd4d177af7711c225c24676d3e9e9f24780c
+SIZE (xorg/proto/videoproto-2.2.2.tar.bz2) = 42744
diff --git a/x11/videoproto/pkg-descr b/x11/videoproto/pkg-descr
new file mode 100644
index 000000000000..94edb581eb84
--- /dev/null
+++ b/x11/videoproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org Video extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/videoproto/pkg-plist b/x11/videoproto/pkg-plist
new file mode 100644
index 000000000000..4aa2da55519b
--- /dev/null
+++ b/x11/videoproto/pkg-plist
@@ -0,0 +1,7 @@
+include/X11/extensions/Xv.h
+include/X11/extensions/XvMC.h
+include/X11/extensions/XvMCproto.h
+include/X11/extensions/Xvproto.h
+include/X11/extensions/vldXvMC.h
+libdata/pkgconfig/videoproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/viewres/Makefile b/x11/viewres/Makefile
new file mode 100644
index 000000000000..ef09510911c0
--- /dev/null
+++ b/x11/viewres/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: viewres
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= viewres
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Graphical class browser for Xt
+
+XORG_CAT= app
+USE_XORG= xt xaw
+
+MAN1= viewres.1
+
+.include <bsd.port.mk>
diff --git a/x11/viewres/distinfo b/x11/viewres/distinfo
new file mode 100644
index 000000000000..82ff7aa8c86c
--- /dev/null
+++ b/x11/viewres/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/viewres-1.0.1.tar.bz2) = cdbed540daf7975b56000420c9aa5bf9
+SHA256 (xorg/app/viewres-1.0.1.tar.bz2) = bf49cd45ffb197a6992b3b7c99c94161eaf7cf6a2b661d3905ac382bedce34b8
+SIZE (xorg/app/viewres-1.0.1.tar.bz2) = 84802
diff --git a/x11/viewres/pkg-descr b/x11/viewres/pkg-descr
new file mode 100644
index 000000000000..b447f4e61a28
--- /dev/null
+++ b/x11/viewres/pkg-descr
@@ -0,0 +1,5 @@
+This package contains viewres, a graphical class browser that displays
+a tree showing the widget class hierarchy of the Athena Widget Set.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/viewres/pkg-plist b/x11/viewres/pkg-plist
new file mode 100644
index 000000000000..2f510647f7a5
--- /dev/null
+++ b/x11/viewres/pkg-plist
@@ -0,0 +1,3 @@
+bin/viewres
+share/X11/app-defaults/Viewres
+@dirrmtry share/X11/app-defaults
diff --git a/x11/wbar/Makefile b/x11/wbar/Makefile
index 50d7f2b9175a..9c4716520f85 100644
--- a/x11/wbar/Makefile
+++ b/x11/wbar/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wbar
PORTVERSION= 1.3
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.tecapli.com.ar/rodolfo/ \
http://nivi.interfree.it/distfiles/${PORTNAME}/
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 26e17b990e72..0f371c7f5994 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wdm
PORTVERSION= 1.28
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 windowmaker
MASTER_SITES= http://voins.program.ru/wdm/:wdm \
http://wolfram.schneider.org/bsd/gif/bsd/:pic_large \
diff --git a/x11/widgetfactory/Makefile b/x11/widgetfactory/Makefile
index 317da627e5c0..3743314338dc 100644
--- a/x11/widgetfactory/Makefile
+++ b/x11/widgetfactory/Makefile
@@ -7,6 +7,7 @@
PORTNAME= widgetfactory
PORTVERSION= 0.2.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.stellingwerff.com/TheWidgetFactory/
DISTNAME= the${PORTNAME}-${PORTVERSION}
diff --git a/x11/wmappl/Makefile b/x11/wmappl/Makefile
index 4afe5aaeddb2..e8f337f19755 100644
--- a/x11/wmappl/Makefile
+++ b/x11/wmappl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmappl
PORTVERSION= 0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 windowmaker
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:main/}
MASTER_SITE_SUBDIR=${PORTNAME}/:main
diff --git a/x11/wmblob/Makefile b/x11/wmblob/Makefile
index cef5bd182c47..568e9c3dc150 100644
--- a/x11/wmblob/Makefile
+++ b/x11/wmblob/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmblob
PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 windowmaker
MASTER_SITES= http://dockapps.org/files/155/541/
diff --git a/x11/wmbutton/Makefile b/x11/wmbutton/Makefile
index 7c2674a602a5..ae4e6c589936 100644
--- a/x11/wmbutton/Makefile
+++ b/x11/wmbutton/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wmbutton
PORTVERSION= 0.6.1
+PORTREVISION= 1
CATEGORIES= x11 windowmaker
MASTER_SITES= http://greek0.net/~greek0/wmbutton/
diff --git a/x11/wmcliphist/Makefile b/x11/wmcliphist/Makefile
index 3c1ee35ea091..65689b3fba51 100644
--- a/x11/wmcliphist/Makefile
+++ b/x11/wmcliphist/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmcliphist
PORTVERSION= 0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 windowmaker
MASTER_SITES= http://linux.nawebu.cz/wmcliphist/
diff --git a/x11/wmctrl/Makefile b/x11/wmctrl/Makefile
index bf40d3bd91e2..fb5c79a78954 100644
--- a/x11/wmctrl/Makefile
+++ b/x11/wmctrl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmctrl
PORTVERSION= 1.07
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://sweb.cz/tripie/utils/wmctrl/dist/
diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile
index 1ae50d170758..f213401932b7 100644
--- a/x11/wmdrawer/Makefile
+++ b/x11/wmdrawer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= wmdrawer
PORTVERSION= 0.10.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 windowmaker
MASTER_SITES= http://people.easter-eggs.org/~valos/wmdrawer/:tarball \
http://wikitest.freebsd.org/wiki/common/:pixmap
diff --git a/x11/wmfstatus/Makefile b/x11/wmfstatus/Makefile
index f5674486bf3f..03b6a04a8d90 100644
--- a/x11/wmfstatus/Makefile
+++ b/x11/wmfstatus/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wmfstatus
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.finik.net/files/
diff --git a/x11/wmmatrix/Makefile b/x11/wmmatrix/Makefile
index 5d4bb3d5448c..f15060308db4 100644
--- a/x11/wmmatrix/Makefile
+++ b/x11/wmmatrix/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmmatrix
PORTVERSION= 0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 windowmaker
MASTER_SITES= http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/
DISTNAME= wmMatrix-${PORTVERSION}
diff --git a/x11/wmmenu/Makefile b/x11/wmmenu/Makefile
index 3bdd02519f4e..2952984ef003 100644
--- a/x11/wmmenu/Makefile
+++ b/x11/wmmenu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmmenu
PORTVERSION= 1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= http://www.fcoutant.freesurf.fr/download/
diff --git a/x11/wmmsg/Makefile b/x11/wmmsg/Makefile
index 4ea344f1cff2..be6e7ed7246a 100644
--- a/x11/wmmsg/Makefile
+++ b/x11/wmmsg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmmsg
PORTVERSION= 1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 windowmaker
MASTER_SITES= http://mirror.israel.net/pub/FreeBSD/distfiles/
diff --git a/x11/wmoldmenu2new/Makefile b/x11/wmoldmenu2new/Makefile
index 5d1c9a650c4d..4b43de499195 100644
--- a/x11/wmoldmenu2new/Makefile
+++ b/x11/wmoldmenu2new/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wmoldmenu2new
PORTVERSION= 20020609
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://largo.windowmaker.org/files/
DISTNAME= wm-oldmenu2new
diff --git a/x11/wmxss/Makefile b/x11/wmxss/Makefile
index 15448f5576fb..2cd3cda27394 100644
--- a/x11/wmxss/Makefile
+++ b/x11/wmxss/Makefile
@@ -7,6 +7,7 @@
PORTNAME= wmxss
PORTVERSION= 0.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index a801829ba9b6..1ceea6168a3e 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -7,6 +7,7 @@
PORTNAME= workrave
PORTVERSION= 1.8.3
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= SF
diff --git a/x11/wrapper/Makefile b/x11/wrapper/Makefile
index 0817e457df48..7e87b29c11dc 100644
--- a/x11/wrapper/Makefile
+++ b/x11/wrapper/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wrapper
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
DISTNAME= # intentionally left blank
EXTRACT_SUFX= # intentionally left blank
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index cc404a76fbea..22f52306da9e 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wterm
PORTVERSION= 6.2.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11/x11perf/Makefile b/x11/x11perf/Makefile
new file mode 100644
index 000000000000..627fd24d7605
--- /dev/null
+++ b/x11/x11perf/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: x11perf
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= x11perf
+PORTVERSION= 1.4.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X11 server performance test program
+
+XORG_CAT= app
+USE_XORG= x11 xmuu xrender xft xext
+
+MAN1= Xmark.1 \
+ x11perf.1 \
+ x11perfcomp.1
+
+.include <bsd.port.mk>
diff --git a/x11/x11perf/distinfo b/x11/x11perf/distinfo
new file mode 100644
index 000000000000..62ad1a0226d0
--- /dev/null
+++ b/x11/x11perf/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/x11perf-1.4.1.tar.bz2) = fd06c8b8e3572a0e14af65a49e0dd7d1
+SHA256 (xorg/app/x11perf-1.4.1.tar.bz2) = c81819618ec596fda55b950ef80f2ee02e5ce149ea99f1f741cedb459b4d3064
+SIZE (xorg/app/x11perf-1.4.1.tar.bz2) = 126784
diff --git a/x11/x11perf/pkg-descr b/x11/x11perf/pkg-descr
new file mode 100644
index 000000000000..af297f6ae226
--- /dev/null
+++ b/x11/x11perf/pkg-descr
@@ -0,0 +1,4 @@
+This package contains x11perf, an X11 server performance test program.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/x11perf/pkg-plist b/x11/x11perf/pkg-plist
new file mode 100644
index 000000000000..dd7d17277145
--- /dev/null
+++ b/x11/x11perf/pkg-plist
@@ -0,0 +1,7 @@
+bin/x11perf
+bin/x11perfcomp
+lib/X11/x11perfcomp/fillblnk
+lib/X11/x11perfcomp/perfboth
+lib/X11/x11perfcomp/perfratio
+lib/X11/x11perfcomp/Xmark
+@dirrm lib/X11/x11perfcomp
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index ceb6eb5bb5c2..0f423b2d7823 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -7,6 +7,7 @@
PORTNAME= x3270
PORTVERSION= 3.3.5
+PORTREVISION= 1
DISTVERSIONSUFFIX= p6
CATEGORIES= x11 net
MASTER_SITES= SFE
diff --git a/x11/xaniroc/Makefile b/x11/xaniroc/Makefile
index 5a823f3d9d3a..1cf58baddb45 100644
--- a/x11/xaniroc/Makefile
+++ b/x11/xaniroc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xaniroc
PORTVERSION= 1.02
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.42.org/pub/orphan/
DISTNAME= ${PORTNAME}
diff --git a/x11/xantfarm/Makefile b/x11/xantfarm/Makefile
index 1e91a7e095cc..4841ffa5df58 100644
--- a/x11/xantfarm/Makefile
+++ b/x11/xantfarm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xantfarm
PORTVERSION= 1.16
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.acme.com/software/xantfarm/
DISTNAME= ${PORTNAME}_23oct1991
diff --git a/x11/xauth/Makefile b/x11/xauth/Makefile
new file mode 100644
index 000000000000..65007f16644b
--- /dev/null
+++ b/x11/xauth/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xauth
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xauth
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X authority file utility
+
+XORG_CAT= app
+USE_XORG= x11 xau xext xmuu
+
+PLIST_FILES= bin/xauth
+
+MAN1= xauth.1
+
+.include <bsd.port.mk>
diff --git a/x11/xauth/distinfo b/x11/xauth/distinfo
new file mode 100644
index 000000000000..9573c12bf938
--- /dev/null
+++ b/x11/xauth/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xauth-1.0.2.tar.bz2) = 31b956edaeb453ddaa640420e97b25b2
+SHA256 (xorg/app/xauth-1.0.2.tar.bz2) = 569e5a581e5eb16abf1c04a66da22c6dade14578ab34e5e78b8724bb655f1f17
+SIZE (xorg/app/xauth-1.0.2.tar.bz2) = 110215
diff --git a/x11/xauth/pkg-descr b/x11/xauth/pkg-descr
new file mode 100644
index 000000000000..5d60b7db4126
--- /dev/null
+++ b/x11/xauth/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org X authority file utility.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index bed57cf08042..8a3ab27288d0 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xautolock
PORTVERSION= 2.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/screensavers
diff --git a/x11/xautomation/Makefile b/x11/xautomation/Makefile
index 803be8ad8e52..6e6eaa729dc0 100644
--- a/x11/xautomation/Makefile
+++ b/x11/xautomation/Makefile
@@ -8,6 +8,7 @@
PORTNAME= xautomation
PORTVERSION= 0.96
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://hoopajoo.net/static/projects/
diff --git a/x11/xballoon/Makefile b/x11/xballoon/Makefile
index 5bc73835aa82..21dba0a6ba66 100644
--- a/x11/xballoon/Makefile
+++ b/x11/xballoon/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xballoon
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.saturn.dti.ne.jp/~hsakai/myfreesoft/
diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile
index c50574bd2a90..47d78ad3de38 100644
--- a/x11/xbanner/Makefile
+++ b/x11/xbanner/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xbanner
PORTVERSION= 1.31
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/xutils
diff --git a/x11/xbelld/Makefile b/x11/xbelld/Makefile
index 1e0a5247eb12..8755679b6385 100644
--- a/x11/xbelld/Makefile
+++ b/x11/xbelld/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xbelld
PORTVERSION= 0.2b2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.meowfishies.com/code/
DISTNAME= ${PORTNAME}-0.2beta2
diff --git a/x11/xbiff/Makefile b/x11/xbiff/Makefile
new file mode 100644
index 000000000000..5199eee6e1fe
--- /dev/null
+++ b/x11/xbiff/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xbiff
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xbiff
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Mailbox flag for X
+
+XORG_CAT= app
+USE_XORG= xbitmaps xext xaw
+MAN1= xbiff.1
+PLIST_FILES= bin/xbiff
+
+.include <bsd.port.mk>
diff --git a/x11/xbiff/distinfo b/x11/xbiff/distinfo
new file mode 100644
index 000000000000..fdbf55355a2c
--- /dev/null
+++ b/x11/xbiff/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xbiff-1.0.1.tar.bz2) = 404f5add4537d22dd109c33e518a5190
+SHA256 (xorg/app/xbiff-1.0.1.tar.bz2) = 9845b1fa8a1cfd408f01fd69b66808068e847cdc925d114c7723c17934a96503
+SIZE (xorg/app/xbiff-1.0.1.tar.bz2) = 83634
diff --git a/x11/xbiff/pkg-descr b/x11/xbiff/pkg-descr
new file mode 100644
index 000000000000..ad2c037510bc
--- /dev/null
+++ b/x11/xbiff/pkg-descr
@@ -0,0 +1,6 @@
+This package contains xbiff, which displays a little image of a mailbox in
+the X Window System. The flag on the mailbox is down when there is no mail,
+and the flag goes up when new mail arrives.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile
index fae9d56b568f..110812de9e9b 100644
--- a/x11/xbindkeys/Makefile
+++ b/x11/xbindkeys/Makefile
@@ -8,6 +8,7 @@
PORTNAME= xbindkeys
PORTVERSION= 1.8.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://hocwp.free.fr/xbindkeys/
diff --git a/x11/xbindkeys_config/Makefile b/x11/xbindkeys_config/Makefile
index 4889fe3e0d61..5b0671133085 100644
--- a/x11/xbindkeys_config/Makefile
+++ b/x11/xbindkeys_config/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xbindkeys_config
PORTVERSION= 0.1.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= trevor
diff --git a/x11/xbitmaps/Makefile b/x11/xbitmaps/Makefile
new file mode 100644
index 000000000000..debaed25a78d
--- /dev/null
+++ b/x11/xbitmaps/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for: xbitmaps
+# Date Created: 17 Feb 2006
+# Whom: Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xbitmaps
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org bitmaps data
+
+CONFLICTS= XFree86-libraries-* xorg-libraries-6.*
+
+USE_GNOME= gnomehack
+
+XORG_CAT= data
+
+.include <bsd.port.mk>
diff --git a/x11/xbitmaps/distinfo b/x11/xbitmaps/distinfo
new file mode 100644
index 000000000000..a53229f90ba2
--- /dev/null
+++ b/x11/xbitmaps/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/data/xbitmaps-1.0.1.tar.bz2) = b28a9840cde3c38d7c09716372fea257
+SHA256 (xorg/data/xbitmaps-1.0.1.tar.bz2) = 5aa5be594e77f772b85d39f0c25f61a61c7f6fa02ba940e614c5ee386deeb867
+SIZE (xorg/data/xbitmaps-1.0.1.tar.bz2) = 55570
diff --git a/x11/xbitmaps/pkg-descr b/x11/xbitmaps/pkg-descr
new file mode 100644
index 000000000000..df006bcf2041
--- /dev/null
+++ b/x11/xbitmaps/pkg-descr
@@ -0,0 +1,2 @@
+This package contains xbitmaps, which provides static graphics needed by
+X.Org applications to draw screen elements.
diff --git a/x11/xbitmaps/pkg-plist b/x11/xbitmaps/pkg-plist
new file mode 100644
index 000000000000..a2c9f61cc2d6
--- /dev/null
+++ b/x11/xbitmaps/pkg-plist
@@ -0,0 +1,71 @@
+include/X11/bitmaps/1x1
+include/X11/bitmaps/2x2
+include/X11/bitmaps/black
+include/X11/bitmaps/boxes
+include/X11/bitmaps/calculator
+include/X11/bitmaps/cntr_ptr
+include/X11/bitmaps/cntr_ptrmsk
+include/X11/bitmaps/cross_weave
+include/X11/bitmaps/dimple1
+include/X11/bitmaps/dimple3
+include/X11/bitmaps/dot
+include/X11/bitmaps/dropbar7
+include/X11/bitmaps/dropbar8
+include/X11/bitmaps/escherknot
+include/X11/bitmaps/flagdown
+include/X11/bitmaps/flagup
+include/X11/bitmaps/flipped_gray
+include/X11/bitmaps/gray
+include/X11/bitmaps/gray1
+include/X11/bitmaps/gray3
+include/X11/bitmaps/grid16
+include/X11/bitmaps/grid2
+include/X11/bitmaps/grid4
+include/X11/bitmaps/grid8
+include/X11/bitmaps/hlines2
+include/X11/bitmaps/hlines3
+include/X11/bitmaps/icon
+include/X11/bitmaps/keyboard16
+include/X11/bitmaps/left_ptr
+include/X11/bitmaps/left_ptrmsk
+include/X11/bitmaps/letters
+include/X11/bitmaps/light_gray
+include/X11/bitmaps/mailempty
+include/X11/bitmaps/mailemptymsk
+include/X11/bitmaps/mailfull
+include/X11/bitmaps/mailfullmsk
+include/X11/bitmaps/mensetmanus
+include/X11/bitmaps/menu10
+include/X11/bitmaps/menu12
+include/X11/bitmaps/menu16
+include/X11/bitmaps/menu6
+include/X11/bitmaps/menu8
+include/X11/bitmaps/noletters
+include/X11/bitmaps/opendot
+include/X11/bitmaps/opendotMask
+include/X11/bitmaps/plaid
+include/X11/bitmaps/right_ptr
+include/X11/bitmaps/right_ptrmsk
+include/X11/bitmaps/root_weave
+include/X11/bitmaps/scales
+include/X11/bitmaps/sipb
+include/X11/bitmaps/star
+include/X11/bitmaps/starMask
+include/X11/bitmaps/stipple
+include/X11/bitmaps/target
+include/X11/bitmaps/terminal
+include/X11/bitmaps/tie_fighter
+include/X11/bitmaps/vlines2
+include/X11/bitmaps/vlines3
+include/X11/bitmaps/weird_size
+include/X11/bitmaps/wide_weave
+include/X11/bitmaps/wingdogs
+include/X11/bitmaps/woman
+include/X11/bitmaps/xfd_icon
+include/X11/bitmaps/xlogo11
+include/X11/bitmaps/xlogo16
+include/X11/bitmaps/xlogo32
+include/X11/bitmaps/xlogo64
+include/X11/bitmaps/xsnow
+libdata/pkgconfig/xbitmaps.pc
+@dirrmtry include/X11/bitmaps
diff --git a/x11/xcalc/Makefile b/x11/xcalc/Makefile
new file mode 100644
index 000000000000..c42a2c7c3d57
--- /dev/null
+++ b/x11/xcalc/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xcalc
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xcalc
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Scientific calculator for X
+
+XORG_CAT= app
+USE_XORG= xt xaw
+
+MAN1= xcalc.1
+
+.include <bsd.port.mk>
diff --git a/x11/xcalc/distinfo b/x11/xcalc/distinfo
new file mode 100644
index 000000000000..a4c944349f8d
--- /dev/null
+++ b/x11/xcalc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xcalc-1.0.1.tar.bz2) = 07b948cf671fde88df1a59bfb0cab3b8
+SHA256 (xorg/app/xcalc-1.0.1.tar.bz2) = 17484e5fec0ebe7dd8df7218fde1449c52be3f4c6377a85a9fd86e377a7f4248
+SIZE (xorg/app/xcalc-1.0.1.tar.bz2) = 93745
diff --git a/x11/xcalc/pkg-descr b/x11/xcalc/pkg-descr
new file mode 100644
index 000000000000..8183cbf9c0b9
--- /dev/null
+++ b/x11/xcalc/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xcalc, a scientific calculator desktop accessory
+for the X Window System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xcalc/pkg-plist b/x11/xcalc/pkg-plist
new file mode 100644
index 000000000000..ebbcd5c8a67b
--- /dev/null
+++ b/x11/xcalc/pkg-plist
@@ -0,0 +1,4 @@
+bin/xcalc
+share/X11/app-defaults/XCalc
+share/X11/app-defaults/XCalc-color
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xcalib/Makefile b/x11/xcalib/Makefile
index 25a99b660f0f..ab4b631d1a01 100644
--- a/x11/xcalib/Makefile
+++ b/x11/xcalib/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xcalib
PORTVERSION= 0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 graphics
MASTER_SITES= http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/
DISTNAME= ${PORTNAME}-source-${PORTVERSION}
diff --git a/x11/xcb-proto/pkg-plist b/x11/xcb-proto/pkg-plist
index d9b578d7cb5f..97b109a1573c 100644
--- a/x11/xcb-proto/pkg-plist
+++ b/x11/xcb-proto/pkg-plist
@@ -17,6 +17,7 @@ libdata/pkgconfig/xcb-proto.pc
%%DATADIR%%/xevie.xml
%%DATADIR%%/xf86dri.xml
%%DATADIR%%/xfixes.xml
+%%DATADIR%%/xinerama.xml
%%DATADIR%%/xprint.xml
%%DATADIR%%/xproto.xml
%%DATADIR%%/xtest.xml
diff --git a/x11/xcb/Makefile b/x11/xcb/Makefile
index 8fc9127a8ee4..09a28e20b652 100644
--- a/x11/xcb/Makefile
+++ b/x11/xcb/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xcb
PORTVERSION= 2.4
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.goof.com/pcg/marc/data/
diff --git a/x11/xclick/Makefile b/x11/xclick/Makefile
index 27cfeb4a114c..5ad86f05a49b 100644
--- a/x11/xclick/Makefile
+++ b/x11/xclick/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xclick
PORTVERSION= 0.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://members.shaw.ca/gehrehmee/ \
http://bg.rifetech.com/
diff --git a/x11/xclip/Makefile b/x11/xclip/Makefile
index 12e085f1ee78..d304ab9303d3 100644
--- a/x11/xclip/Makefile
+++ b/x11/xclip/Makefile
@@ -8,6 +8,7 @@
PORTNAME= xclip
PORTVERSION= 0.08
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://people.debian.org/~kims/xclip/
diff --git a/x11/xclipboard/Makefile b/x11/xclipboard/Makefile
new file mode 100644
index 000000000000..83492f24b0d6
--- /dev/null
+++ b/x11/xclipboard/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xclipboard
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xclipboard
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X clipboard client
+
+XORG_CAT= app
+USE_XORG= xt xaw
+
+MAN1= xclipboard.1 xcutsel.1
+
+.include <bsd.port.mk>
diff --git a/x11/xclipboard/distinfo b/x11/xclipboard/distinfo
new file mode 100644
index 000000000000..eee5df66f41c
--- /dev/null
+++ b/x11/xclipboard/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xclipboard-1.0.1.tar.bz2) = 2c6ecedb10dc51adbb64c95f22fd99c2
+SHA256 (xorg/app/xclipboard-1.0.1.tar.bz2) = 3399a27101285112ea578e1855c8374254afa8d427a3c5943458abc27c4d70fc
+SIZE (xorg/app/xclipboard-1.0.1.tar.bz2) = 83681
diff --git a/x11/xclipboard/pkg-descr b/x11/xclipboard/pkg-descr
new file mode 100644
index 000000000000..3dbd7590b489
--- /dev/null
+++ b/x11/xclipboard/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xclipboard, an X clipboard client.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xclipboard/pkg-plist b/x11/xclipboard/pkg-plist
new file mode 100644
index 000000000000..1eb7294f7254
--- /dev/null
+++ b/x11/xclipboard/pkg-plist
@@ -0,0 +1,4 @@
+bin/xclipboard
+bin/xcutsel
+share/X11/app-defaults/XClipboard
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xclock/Makefile b/x11/xclock/Makefile
new file mode 100644
index 000000000000..23bfdc02bb29
--- /dev/null
+++ b/x11/xclock/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xclock
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xclock
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Analog and digital clock for X
+
+XORG_CAT= app
+USE_XORG= xrender xft xkbfile xt xaw
+
+MAN1= xclock.1
+
+.include <bsd.port.mk>
diff --git a/x11/xclock/distinfo b/x11/xclock/distinfo
new file mode 100644
index 000000000000..e30567695300
--- /dev/null
+++ b/x11/xclock/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xclock-1.0.2.tar.bz2) = 6b930326f71993fb54b7203902b387cd
+SHA256 (xorg/app/xclock-1.0.2.tar.bz2) = ced648762382eab09e0ccb87371cb745646ede08ffcb068faa6025d20c4d1f3d
+SIZE (xorg/app/xclock-1.0.2.tar.bz2) = 104335
diff --git a/x11/xclock/pkg-descr b/x11/xclock/pkg-descr
new file mode 100644
index 000000000000..c8261821a87a
--- /dev/null
+++ b/x11/xclock/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xclock, a program for the X Window System that display
+the time in analog or digital form.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xclock/pkg-plist b/x11/xclock/pkg-plist
new file mode 100644
index 000000000000..23774c3db023
--- /dev/null
+++ b/x11/xclock/pkg-plist
@@ -0,0 +1,4 @@
+bin/xclock
+share/X11/app-defaults/XClock-color
+share/X11/app-defaults/XClock
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xcmd/Makefile b/x11/xcmd/Makefile
index 47ad16eee9ea..4f4580d7aa2b 100644
--- a/x11/xcmd/Makefile
+++ b/x11/xcmd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xcmd
PORTVERSION= 1.8
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://www.breuninger.org/files/distfiles/
diff --git a/x11/xcmiscproto/Makefile b/x11/xcmiscproto/Makefile
new file mode 100644
index 000000000000..481facc39c45
--- /dev/null
+++ b/x11/xcmiscproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: xcmiscproto
+# Date Created: 08 Aug 2005
+# Whom: Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xcmiscproto
+PORTVERSION= 1.1.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= XCMisc extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/xcmiscproto/distinfo b/x11/xcmiscproto/distinfo
new file mode 100644
index 000000000000..44a00f483a14
--- /dev/null
+++ b/x11/xcmiscproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xcmiscproto-1.1.2.tar.bz2) = fde0b050901f024b19159cdacdcfbd20
+SHA256 (xorg/proto/xcmiscproto-1.1.2.tar.bz2) = b2807e96a9d632b7bbf1782a43095de51f3feae3d2e25374d3df00c6c68792ab
+SIZE (xorg/proto/xcmiscproto-1.1.2.tar.bz2) = 36750
diff --git a/x11/xcmiscproto/pkg-descr b/x11/xcmiscproto/pkg-descr
new file mode 100644
index 000000000000..2eb54f046456
--- /dev/null
+++ b/x11/xcmiscproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org XCMisc extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xcmiscproto/pkg-plist b/x11/xcmiscproto/pkg-plist
new file mode 100644
index 000000000000..384401d8ac76
--- /dev/null
+++ b/x11/xcmiscproto/pkg-plist
@@ -0,0 +1,3 @@
+include/X11/extensions/xcmiscstr.h
+libdata/pkgconfig/xcmiscproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/xcmsdb/Makefile b/x11/xcmsdb/Makefile
new file mode 100644
index 000000000000..fd4c90e38ca6
--- /dev/null
+++ b/x11/xcmsdb/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xcmsdb
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xcmsdb
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Device Color Characterization utility for X
+
+XORG_CAT= app
+USE_XORG= x11
+
+PLIST_FILES= bin/xcmsdb
+
+MAN1= xcmsdb.1
+
+.include <bsd.port.mk>
diff --git a/x11/xcmsdb/distinfo b/x11/xcmsdb/distinfo
new file mode 100644
index 000000000000..95d33176320c
--- /dev/null
+++ b/x11/xcmsdb/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xcmsdb-1.0.1.tar.bz2) = 8579d5f50ba7f0c4a5bf16b9670fea01
+SHA256 (xorg/app/xcmsdb-1.0.1.tar.bz2) = e275a39f41ffae854db77b2c5decfad2cac32afbcd158842032dc9ca04efe92e
+SIZE (xorg/app/xcmsdb-1.0.1.tar.bz2) = 96423
diff --git a/x11/xcmsdb/pkg-descr b/x11/xcmsdb/pkg-descr
new file mode 100644
index 000000000000..4c1b31bb4e62
--- /dev/null
+++ b/x11/xcmsdb/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xcmsdb, a Device Color Characterization utility
+for the X Color Management System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xco/Makefile b/x11/xco/Makefile
index 977db85f3413..c1108c6d0ea2 100644
--- a/x11/xco/Makefile
+++ b/x11/xco/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xco
PORTVERSION= 1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
DISTNAME= ${PORTNAME}
diff --git a/x11/xcoloredit/Makefile b/x11/xcoloredit/Makefile
index 7b514db8d02d..d3cf70c17370 100644
--- a/x11/xcoloredit/Makefile
+++ b/x11/xcoloredit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xcoloredit
PORTVERSION= 1.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.x.org/R5contrib/
DISTNAME= ${PORTNAME}
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index 4eb6c08341b0..6afc3bbdb013 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xcolors
PORTVERSION= 1.3
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= markp
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index 7dbc73724b98..c707e6c73ee0 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -7,10 +7,11 @@
PORTNAME= xcolorsel
PORTVERSION= 1.1a
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
-DISTNAME= ${PKGNAME}-src
+DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org
COMMENT= X utility to translate rgb values into X color names
diff --git a/x11/xconsole/Makefile b/x11/xconsole/Makefile
new file mode 100644
index 000000000000..cc6795e93578
--- /dev/null
+++ b/x11/xconsole/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xconsole
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xconsole
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Monitor system console messages with X
+
+XORG_CAT= app
+USE_XORG= xt xaw
+
+MAN1= xconsole.1
+
+.include <bsd.port.mk>
diff --git a/x11/xconsole/distinfo b/x11/xconsole/distinfo
new file mode 100644
index 000000000000..c8d887af52b2
--- /dev/null
+++ b/x11/xconsole/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xconsole-1.0.2.tar.bz2) = 8678ddd23573022d68dcd883ae239be8
+SHA256 (xorg/app/xconsole-1.0.2.tar.bz2) = 45db847e810a932bb962041a4c242f97779142f7e36feec64ec5f9073bd9b377
+SIZE (xorg/app/xconsole-1.0.2.tar.bz2) = 86486
diff --git a/x11/xconsole/pkg-descr b/x11/xconsole/pkg-descr
new file mode 100644
index 000000000000..119267f85533
--- /dev/null
+++ b/x11/xconsole/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xconsole, a utility for monitoring system console
+messages with X.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xconsole/pkg-plist b/x11/xconsole/pkg-plist
new file mode 100644
index 000000000000..df1f64464d17
--- /dev/null
+++ b/x11/xconsole/pkg-plist
@@ -0,0 +1,3 @@
+bin/xconsole
+share/X11/app-defaults/XConsole
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xcurs/Makefile b/x11/xcurs/Makefile
index 83a862ae5fb8..3466a9fd6f5d 100644
--- a/x11/xcurs/Makefile
+++ b/x11/xcurs/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xcurs
PORTVERSION= 0.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 python
MASTER_SITES= http://varg.dyndns.org/psi/files/xcurs/ \
http://freebsd.nsu.ru/distfiles/
diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile
new file mode 100644
index 000000000000..57e5bcff4cbc
--- /dev/null
+++ b/x11/xcursorgen/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for: xcursorgen
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xcursorgen
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Create an X cursor file from a collection of PNG images
+
+LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
+
+XORG_CAT= app
+USE_XORG= x11 xcursor
+
+PLIST_FILES= bin/xcursorgen
+
+MAN1= xcursorgen.1
+
+.include <bsd.port.mk>
diff --git a/x11/xcursorgen/distinfo b/x11/xcursorgen/distinfo
new file mode 100644
index 000000000000..21665c40bb99
--- /dev/null
+++ b/x11/xcursorgen/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xcursorgen-1.0.1.tar.bz2) = 39e1e62f5bd92603b0230b8b948c2fc4
+SHA256 (xorg/app/xcursorgen-1.0.1.tar.bz2) = 18d3e0d64853089c2154f1f867df087fc15f87e03e09fabc98ee5e265d8a53ef
+SIZE (xorg/app/xcursorgen-1.0.1.tar.bz2) = 82300
diff --git a/x11/xcursorgen/pkg-descr b/x11/xcursorgen/pkg-descr
new file mode 100644
index 000000000000..47fbf37de9a0
--- /dev/null
+++ b/x11/xcursorgen/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xcursorgen, a program for creating an X cursor file
+from a collection of PNG images.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xcut/Makefile b/x11/xcut/Makefile
index d0b6119b3bdc..1e57403b8f40 100644
--- a/x11/xcut/Makefile
+++ b/x11/xcut/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xcut
PORTVERSION= 0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://acsys.anu.edu.au/~tpot/%SUBDIR%/
diff --git a/x11/xdbedizzy/Makefile b/x11/xdbedizzy/Makefile
new file mode 100644
index 000000000000..6a5f604ce65e
--- /dev/null
+++ b/x11/xdbedizzy/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xdbedizzy
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xdbedizzy
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Demo of DBE creating a double buffered spinning scene
+
+XORG_CAT= app
+USE_XORG= xp xext xprintutil xp xau xext
+
+PLIST_FILES= bin/xdbedizzy
+
+MAN1= xdbedizzy.1
+
+.include <bsd.port.mk>
diff --git a/x11/xdbedizzy/distinfo b/x11/xdbedizzy/distinfo
new file mode 100644
index 000000000000..e8ed35d8d7a1
--- /dev/null
+++ b/x11/xdbedizzy/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xdbedizzy-1.0.2.tar.bz2) = ecef9cfd197d00980e0d69ee4126d890
+SHA256 (xorg/app/xdbedizzy-1.0.2.tar.bz2) = 74e882e9fee7ebeb274caf43071afff92531b8a41f34650376146a131166012d
+SIZE (xorg/app/xdbedizzy-1.0.2.tar.bz2) = 87631
diff --git a/x11/xdbedizzy/pkg-descr b/x11/xdbedizzy/pkg-descr
new file mode 100644
index 000000000000..686fb0ee2f75
--- /dev/null
+++ b/x11/xdbedizzy/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xdbedizzy, a demo of DBE creating a double buffered
+spinning scene.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index 8be4d3d6efc3..9a2fd04b8324 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xdialog
PORTVERSION= 2.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://thgodef.nerim.net/xdialog/
DISTNAME= ${PORTNAME:S/x/X/}-${PORTVERSION}
diff --git a/x11/xditview/Makefile b/x11/xditview/Makefile
new file mode 100644
index 000000000000..fbf4b6d49182
--- /dev/null
+++ b/x11/xditview/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xditview
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xditview
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Display ditroff output
+
+XORG_CAT= app
+USE_XORG= xt xaw
+
+MAN1= xditview.1
+
+.include <bsd.port.mk>
diff --git a/x11/xditview/distinfo b/x11/xditview/distinfo
new file mode 100644
index 000000000000..d1ca40c41279
--- /dev/null
+++ b/x11/xditview/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xditview-1.0.1.tar.bz2) = e9a7192ef29453b8c810ddd556a463c0
+SHA256 (xorg/app/xditview-1.0.1.tar.bz2) = 177194e5f83b31c2f934e3a0b573e8ae359edf2ef1a2403ee8e1dad383558117
+SIZE (xorg/app/xditview-1.0.1.tar.bz2) = 102979
diff --git a/x11/xditview/pkg-descr b/x11/xditview/pkg-descr
new file mode 100644
index 000000000000..325a228281ca
--- /dev/null
+++ b/x11/xditview/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xditview, a program for displaying ditroff output
+on an X display.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xditview/pkg-plist b/x11/xditview/pkg-plist
new file mode 100644
index 000000000000..c070b4957cfb
--- /dev/null
+++ b/x11/xditview/pkg-plist
@@ -0,0 +1,7 @@
+bin/xditview
+include/X11/bitmaps/ldblarrow
+include/X11/bitmaps/rdblarrow
+share/X11/app-defaults/Xditview
+share/X11/app-defaults/Xditview-chrtr
+@dirrmtry share/X11/app-defaults
+@dirrmtry include/X11/bitmaps
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
new file mode 100644
index 000000000000..21228ae93803
--- /dev/null
+++ b/x11/xdm/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for: xdm
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xdm
+PORTVERSION= 1.1.4
+PORTREVISION= 1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org X display manager
+
+XORG_CAT= app
+USE_XORG= xmu x11 xau xinerama xpm xdmcp xt xext xaw
+
+MAN1= xdm.1
+
+.include <bsd.port.mk>
diff --git a/x11/xdm/distinfo b/x11/xdm/distinfo
new file mode 100644
index 000000000000..422010e75603
--- /dev/null
+++ b/x11/xdm/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xdm-1.1.4.tar.bz2) = a2b4c280f3e324d081a0d9ed76a8a123
+SHA256 (xorg/app/xdm-1.1.4.tar.bz2) = 928238ea20e074372659b2902de0e0d754083196911319319795fdbfd1ca6073
+SIZE (xorg/app/xdm-1.1.4.tar.bz2) = 386272
diff --git a/x11/xdm/files/patch-greeter-greet.c b/x11/xdm/files/patch-greeter-greet.c
new file mode 100644
index 000000000000..b8a221de6e37
--- /dev/null
+++ b/x11/xdm/files/patch-greeter-greet.c
@@ -0,0 +1,19 @@
+--- greeter/greet.c.orig Sat Feb 3 01:25:25 2007
++++ greeter/greet.c Wed Apr 4 14:03:31 2007
+@@ -612,6 +617,7 @@ greet_user_rtn GreetUser(
+ }
+ DeleteXloginResources (d, *dpy);
+ CloseGreet (d);
++ login = NULL;
+ Debug ("Greet loop finished\n");
+ /*
+ * Run system-wide initialization file
+@@ -697,6 +704,8 @@ static int pamconv(int num_msg,
+ m = *msg;
+ r = *response;
+
++ if (login == NULL) goto pam_error;
++
+ for (i = 0; i < num_msg; i++ , m++ , r++) {
+ char *username;
+ int promptId = 0;
diff --git a/x11/xdm/pkg-descr b/x11/xdm/pkg-descr
new file mode 100644
index 000000000000..83b0099172ed
--- /dev/null
+++ b/x11/xdm/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xdm, the X.Org X Display manager.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xdm/pkg-plist b/x11/xdm/pkg-plist
new file mode 100644
index 000000000000..d25049043c4f
--- /dev/null
+++ b/x11/xdm/pkg-plist
@@ -0,0 +1,23 @@
+bin/xdm
+bin/xdmshell
+lib/X11/xdm/pixmaps/xorg-bw.xpm
+lib/X11/xdm/pixmaps/xorg.xpm
+lib/X11/xdm/Xaccess
+lib/X11/xdm/GiveConsole
+lib/X11/xdm/TakeConsole
+lib/X11/xdm/Xsetup_0
+lib/X11/xdm/Xstartup
+lib/X11/xdm/Xreset
+lib/X11/xdm/Xwilling
+lib/X11/xdm/xdm-config
+lib/X11/xdm/Xresources
+lib/X11/xdm/Xservers
+lib/X11/xdm/Xsession
+lib/X11/xdm/libXdmGreet.so
+lib/X11/xdm/libXdmGreet.la
+lib/X11/xdm/libXdmGreet.a
+lib/X11/xdm/chooser
+share/X11/app-defaults/Chooser
+@dirrmtry share/X11/app-defaults
+@dirrm lib/X11/xdm/pixmaps
+@dirrm lib/X11/xdm
diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile
new file mode 100644
index 000000000000..5c9daf9d92fb
--- /dev/null
+++ b/x11/xdpyinfo/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xdpyinfo
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xdpyinfo
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Display information utility for X
+
+XORG_CAT= app
+USE_XORG= xext x11 xtst
+
+PLIST_FILES= bin/xdpyinfo
+
+MAN1= xdpyinfo.1
+
+.include <bsd.port.mk>
diff --git a/x11/xdpyinfo/distinfo b/x11/xdpyinfo/distinfo
new file mode 100644
index 000000000000..576b1d3adde6
--- /dev/null
+++ b/x11/xdpyinfo/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xdpyinfo-1.0.1.tar.bz2) = 84cc4798fe62c1d8c67c3f38e8158f70
+SHA256 (xorg/app/xdpyinfo-1.0.1.tar.bz2) = 1ccdb5862f60bbc9712e21ee415699af88e260ced431ccfcfde8f95c34a45c61
+SIZE (xorg/app/xdpyinfo-1.0.1.tar.bz2) = 87678
diff --git a/x11/xdpyinfo/pkg-descr b/x11/xdpyinfo/pkg-descr
new file mode 100644
index 000000000000..6e6c88be7042
--- /dev/null
+++ b/x11/xdpyinfo/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xdpyinfo, which is a utility for displaying
+information about an X server.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xdriinfo/Makefile b/x11/xdriinfo/Makefile
new file mode 100644
index 000000000000..1f6a3008c2ad
--- /dev/null
+++ b/x11/xdriinfo/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for: xdriinfo
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xdriinfo
+PORTVERSION= 1.0.1
+PORTREVISION= 1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Query configuration information of DRI drivers
+
+USE_GL= gl
+
+XORG_CAT= app
+USE_XORG= x11 glproto
+MAN1= xdriinfo.1
+PLIST_FILES= bin/xdriinfo
+
+.include <bsd.port.mk>
diff --git a/x11/xdriinfo/distinfo b/x11/xdriinfo/distinfo
new file mode 100644
index 000000000000..5610c99178bb
--- /dev/null
+++ b/x11/xdriinfo/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xdriinfo-1.0.1.tar.bz2) = be3c5a9b242a57226b5bb5f22ec341ca
+SHA256 (xorg/app/xdriinfo-1.0.1.tar.bz2) = f693977bdaea7eb6b095a6b6bc60b8a62110ecdef4c455211346e592f59c3772
+SIZE (xorg/app/xdriinfo-1.0.1.tar.bz2) = 81557
diff --git a/x11/xdriinfo/pkg-descr b/x11/xdriinfo/pkg-descr
new file mode 100644
index 000000000000..933072d04bc2
--- /dev/null
+++ b/x11/xdriinfo/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xdriinfo, an utility that can be used to query
+configuration information of direct rendering devices.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile
index fd6b527766b9..56a667784883 100644
--- a/x11/xdtm/Makefile
+++ b/x11/xdtm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xdtm
PORTVERSION= 2.5.8
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
diff --git a/x11/xedit/Makefile b/x11/xedit/Makefile
new file mode 100644
index 000000000000..afffb6232202
--- /dev/null
+++ b/x11/xedit/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xedit
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xedit
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Simple text editor for X
+
+XORG_CAT= app
+USE_XORG= xt xaw xp xprintutil
+
+MAN1= xedit.1
+
+.include <bsd.port.mk>
diff --git a/x11/xedit/distinfo b/x11/xedit/distinfo
new file mode 100644
index 000000000000..c99bb879f4cc
--- /dev/null
+++ b/x11/xedit/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xedit-1.0.2.tar.bz2) = c56160e93c24ddf17e69891ed50deb72
+SHA256 (xorg/app/xedit-1.0.2.tar.bz2) = 2658d78bbaf8c9effac261f3c229c035fbfda817fa9636dea1e46078213362df
+SIZE (xorg/app/xedit-1.0.2.tar.bz2) = 455400
diff --git a/x11/xedit/pkg-descr b/x11/xedit/pkg-descr
new file mode 100644
index 000000000000..fb8c2034c470
--- /dev/null
+++ b/x11/xedit/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xedit, a simple text editor for the X Window System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xedit/pkg-plist b/x11/xedit/pkg-plist
new file mode 100644
index 000000000000..af76d09fa139
--- /dev/null
+++ b/x11/xedit/pkg-plist
@@ -0,0 +1,24 @@
+bin/xedit
+lib/X11/xedit/lisp/progmodes/c.lsp
+lib/X11/xedit/lisp/progmodes/html.lsp
+lib/X11/xedit/lisp/progmodes/imake.lsp
+lib/X11/xedit/lisp/progmodes/lisp.lsp
+lib/X11/xedit/lisp/progmodes/make.lsp
+lib/X11/xedit/lisp/progmodes/man.lsp
+lib/X11/xedit/lisp/progmodes/patch.lsp
+lib/X11/xedit/lisp/progmodes/rpm.lsp
+lib/X11/xedit/lisp/progmodes/sgml.lsp
+lib/X11/xedit/lisp/progmodes/sh.lsp
+lib/X11/xedit/lisp/progmodes/xconf.lsp
+lib/X11/xedit/lisp/progmodes/xlog.lsp
+lib/X11/xedit/lisp/progmodes/xrdb.lsp
+lib/X11/xedit/lisp/lisp.lsp
+lib/X11/xedit/lisp/xedit.lsp
+lib/X11/xedit/lisp/syntax.lsp
+lib/X11/xedit/lisp/indent.lsp
+share/X11/app-defaults/Xedit-color
+share/X11/app-defaults/Xedit
+@dirrmtry share/X11/app-defaults
+@dirrm lib/X11/xedit/lisp/progmodes
+@dirrm lib/X11/xedit/lisp
+@dirrm lib/X11/xedit
diff --git a/x11/xev/Makefile b/x11/xev/Makefile
new file mode 100644
index 000000000000..1f265b8c37e0
--- /dev/null
+++ b/x11/xev/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xev
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xev
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Print contents of X events
+
+XORG_CAT= app
+USE_XORG= x11
+
+PLIST_FILES= bin/xev
+
+MAN1= xev.1
+
+.include <bsd.port.mk>
diff --git a/x11/xev/distinfo b/x11/xev/distinfo
new file mode 100644
index 000000000000..0d51b68173fa
--- /dev/null
+++ b/x11/xev/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xev-1.0.2.tar.bz2) = e3008eb0655da3026c162a5597d70869
+SHA256 (xorg/app/xev-1.0.2.tar.bz2) = cac2771b67942d9a00b46532176feb18b2f82c434e0f6ece578d95953ef33053
+SIZE (xorg/app/xev-1.0.2.tar.bz2) = 84097
diff --git a/x11/xev/pkg-descr b/x11/xev/pkg-descr
new file mode 100644
index 000000000000..eddd0caccffc
--- /dev/null
+++ b/x11/xev/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xev, which is a application that monitors X events.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xextensions/Makefile b/x11/xextensions/Makefile
index 3907fdea0c03..93ad2d68e191 100644
--- a/x11/xextensions/Makefile
+++ b/x11/xextensions/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xextensions
PORTVERSION= 1.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/
diff --git a/x11/xextproto/Makefile b/x11/xextproto/Makefile
new file mode 100644
index 000000000000..fcf8b6a457a3
--- /dev/null
+++ b/x11/xextproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: xextproto
+# Date Created: 07 Aug 2005
+# Whom: Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xextproto
+PORTVERSION= 7.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= XExt extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/xextproto/distinfo b/x11/xextproto/distinfo
new file mode 100644
index 000000000000..3be185fe3d90
--- /dev/null
+++ b/x11/xextproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xextproto-7.0.2.tar.bz2) = 242388ab65dde3a3dd313eeee265e429
+SHA256 (xorg/proto/xextproto-7.0.2.tar.bz2) = 53f3039ae769b08bd139d4474a7debe0b6f24048e7c514c835c8a1880f11e0d9
+SIZE (xorg/proto/xextproto-7.0.2.tar.bz2) = 68323
diff --git a/x11/xextproto/pkg-descr b/x11/xextproto/pkg-descr
new file mode 100644
index 000000000000..f9c9a9995397
--- /dev/null
+++ b/x11/xextproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org XExt extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xextproto/pkg-plist b/x11/xextproto/pkg-plist
new file mode 100644
index 000000000000..e997f23be10d
--- /dev/null
+++ b/x11/xextproto/pkg-plist
@@ -0,0 +1,38 @@
+include/X11/extensions/MITMisc.h
+include/X11/extensions/XEVI.h
+include/X11/extensions/XEVIstr.h
+include/X11/extensions/XLbx.h
+include/X11/extensions/XShm.h
+include/X11/extensions/XTest.h
+include/X11/extensions/Xag.h
+include/X11/extensions/Xagsrv.h
+include/X11/extensions/Xagstr.h
+include/X11/extensions/Xcup.h
+include/X11/extensions/Xcupstr.h
+include/X11/extensions/Xdbe.h
+include/X11/extensions/Xdbeproto.h
+include/X11/extensions/Xext.h
+include/X11/extensions/dpms.h
+include/X11/extensions/dpmsstr.h
+include/X11/extensions/extutil.h
+include/X11/extensions/lbxbuf.h
+include/X11/extensions/lbxbufstr.h
+include/X11/extensions/lbxdeltastr.h
+include/X11/extensions/lbximage.h
+include/X11/extensions/lbxopts.h
+include/X11/extensions/lbxstr.h
+include/X11/extensions/lbxzlib.h
+include/X11/extensions/mitmiscstr.h
+include/X11/extensions/multibuf.h
+include/X11/extensions/multibufst.h
+include/X11/extensions/security.h
+include/X11/extensions/securstr.h
+include/X11/extensions/shape.h
+include/X11/extensions/shapestr.h
+include/X11/extensions/shmstr.h
+include/X11/extensions/sync.h
+include/X11/extensions/syncstr.h
+include/X11/extensions/xtestext1.h
+include/X11/extensions/xteststr.h
+libdata/pkgconfig/xextproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/xeyes/Makefile b/x11/xeyes/Makefile
new file mode 100644
index 000000000000..e398a8780fcd
--- /dev/null
+++ b/x11/xeyes/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xeyes
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xeyes
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= A follow the mouse X demo
+
+XORG_CAT= app
+USE_XORG= x11 xt xext xmu
+
+PLIST_FILES= bin/xeyes
+
+MAN1= xeyes.1
+
+.include <bsd.port.mk>
diff --git a/x11/xeyes/distinfo b/x11/xeyes/distinfo
new file mode 100644
index 000000000000..bd62c4efe34d
--- /dev/null
+++ b/x11/xeyes/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xeyes-1.0.1.tar.bz2) = 033f14f7c4e30d1f4edbb22d5ef86883
+SHA256 (xorg/app/xeyes-1.0.1.tar.bz2) = 530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029
+SIZE (xorg/app/xeyes-1.0.1.tar.bz2) = 81097
diff --git a/x11/xeyes/pkg-descr b/x11/xeyes/pkg-descr
new file mode 100644
index 000000000000..e7d7d4fd56a4
--- /dev/null
+++ b/x11/xeyes/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xeyes, which is a "follow the mouse" X demo application.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xf86dga/Makefile b/x11/xf86dga/Makefile
new file mode 100644
index 000000000000..3ee9a942aff2
--- /dev/null
+++ b/x11/xf86dga/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xf86dga
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86dga
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Test program for the XFree86-DGA extension
+
+XORG_CAT= app
+USE_XORG= x11 xxf86dga xt xaw7 xmu
+
+PLIST_FILES= bin/dga
+
+MAN1= dga.1
+
+.include <bsd.port.mk>
diff --git a/x11/xf86dga/distinfo b/x11/xf86dga/distinfo
new file mode 100644
index 000000000000..e9313a6086fa
--- /dev/null
+++ b/x11/xf86dga/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xf86dga-1.0.2.tar.bz2) = 66feef21fb4e769cc1e2f193ae461a8c
+SHA256 (xorg/app/xf86dga-1.0.2.tar.bz2) = 650633b83796e5a24d4c5ec30adfeb3958f75d9d0785060d5c42bab55ccc1857
+SIZE (xorg/app/xf86dga-1.0.2.tar.bz2) = 80170
diff --git a/x11/xf86dga/pkg-descr b/x11/xf86dga/pkg-descr
new file mode 100644
index 000000000000..2f3628cea264
--- /dev/null
+++ b/x11/xf86dga/pkg-descr
@@ -0,0 +1,5 @@
+This package contains dga, a simple test client for the XFree86-DGA
+extension.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xf86dgaproto/Makefile b/x11/xf86dgaproto/Makefile
new file mode 100644
index 000000000000..070a66a55cd6
--- /dev/null
+++ b/x11/xf86dgaproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: xf86bigfontproto
+# Date Created: 06 Feb 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86dgaproto
+PORTVERSION= 2.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= XFree86-DGA extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/xf86dgaproto/distinfo b/x11/xf86dgaproto/distinfo
new file mode 100644
index 000000000000..4d9afff2c34c
--- /dev/null
+++ b/x11/xf86dgaproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xf86dgaproto-2.0.2.tar.bz2) = 461aa291a23e8cf387b70f3efa71b05c
+SHA256 (xorg/proto/xf86dgaproto-2.0.2.tar.bz2) = 3ee1db2481ea222269bd201eef4d0e5d8ca4dbdb5eeb4852cf1efc42d4269b60
+SIZE (xorg/proto/xf86dgaproto-2.0.2.tar.bz2) = 40066
diff --git a/x11/xf86dgaproto/pkg-descr b/x11/xf86dgaproto/pkg-descr
new file mode 100644
index 000000000000..0d54abac204b
--- /dev/null
+++ b/x11/xf86dgaproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org XFree86-DGA extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xf86dgaproto/pkg-plist b/x11/xf86dgaproto/pkg-plist
new file mode 100644
index 000000000000..6ffd6b28b310
--- /dev/null
+++ b/x11/xf86dgaproto/pkg-plist
@@ -0,0 +1,6 @@
+include/X11/extensions/xf86dga.h
+include/X11/extensions/xf86dga1.h
+include/X11/extensions/xf86dga1str.h
+include/X11/extensions/xf86dgastr.h
+libdata/pkgconfig/xf86dgaproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/xf86driproto/Makefile b/x11/xf86driproto/Makefile
new file mode 100644
index 000000000000..5050dc0d49f8
--- /dev/null
+++ b/x11/xf86driproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: xf86bigfontproto
+# Date Created: 06 Feb 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86driproto
+PORTVERSION= 2.0.3
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= XFree86-DRI extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/xf86driproto/distinfo b/x11/xf86driproto/distinfo
new file mode 100644
index 000000000000..8bc28ed9ccc2
--- /dev/null
+++ b/x11/xf86driproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xf86driproto-2.0.3.tar.bz2) = e4a282cfd708b8892fca4425fee9cd7b
+SHA256 (xorg/proto/xf86driproto-2.0.3.tar.bz2) = 111c469a24374803b08104c725d8318760b226cedccd12b199c83d1b2756b8d6
+SIZE (xorg/proto/xf86driproto-2.0.3.tar.bz2) = 42828
diff --git a/x11/xf86driproto/pkg-descr b/x11/xf86driproto/pkg-descr
new file mode 100644
index 000000000000..8ccf4c7141ff
--- /dev/null
+++ b/x11/xf86driproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org XFree86-DRI extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xf86driproto/pkg-plist b/x11/xf86driproto/pkg-plist
new file mode 100644
index 000000000000..ad29f350c9d3
--- /dev/null
+++ b/x11/xf86driproto/pkg-plist
@@ -0,0 +1,7 @@
+include/GL/internal/dri_interface.h
+include/X11/dri/xf86dri.h
+include/X11/dri/xf86dristr.h
+libdata/pkgconfig/xf86driproto.pc
+@dirrm include/X11/dri
+@dirrmtry include/GL/internal
+@dirrmtry include/GL
diff --git a/x11/xf86ext/Makefile b/x11/xf86ext/Makefile
index 0aeb7c4cfdf8..8e4bc9fbc934 100644
--- a/x11/xf86ext/Makefile
+++ b/x11/xf86ext/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xf86ext
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xorg.freedesktop.org/X11R6.7.0/src/ \
${MASTER_SITE_XORG}
diff --git a/x11/xf86miscproto/Makefile b/x11/xf86miscproto/Makefile
new file mode 100644
index 000000000000..3b6abc2c0808
--- /dev/null
+++ b/x11/xf86miscproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: xf86bigfontproto
+# Date Created: 06 Feb 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86miscproto
+PORTVERSION= 0.9.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= XFree86-Misc extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/xf86miscproto/distinfo b/x11/xf86miscproto/distinfo
new file mode 100644
index 000000000000..8a92b725454e
--- /dev/null
+++ b/x11/xf86miscproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xf86miscproto-0.9.2.tar.bz2) = acae8edeb05a406f7f60bcbb218a8f1d
+SHA256 (xorg/proto/xf86miscproto-0.9.2.tar.bz2) = aaab4cbf19c73ded4785ba69cdd7ae23aaf103c7040559283f85fc1237dad6e6
+SIZE (xorg/proto/xf86miscproto-0.9.2.tar.bz2) = 38464
diff --git a/x11/xf86miscproto/pkg-descr b/x11/xf86miscproto/pkg-descr
new file mode 100644
index 000000000000..59d4ff755432
--- /dev/null
+++ b/x11/xf86miscproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org XFree86-Misc extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xf86miscproto/pkg-plist b/x11/xf86miscproto/pkg-plist
new file mode 100644
index 000000000000..148debce1918
--- /dev/null
+++ b/x11/xf86miscproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/xf86misc.h
+include/X11/extensions/xf86mscstr.h
+libdata/pkgconfig/xf86miscproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/xf86rushproto/Makefile b/x11/xf86rushproto/Makefile
new file mode 100644
index 000000000000..95916a3433cc
--- /dev/null
+++ b/x11/xf86rushproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: xf86rushproto
+# Date Created: 06 Feb 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86rushproto
+PORTVERSION= 1.1.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= XFree86-Rush extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/xf86rushproto/distinfo b/x11/xf86rushproto/distinfo
new file mode 100644
index 000000000000..715738dd53c3
--- /dev/null
+++ b/x11/xf86rushproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xf86rushproto-1.1.2.tar.bz2) = b6a96ffdae084e27487a58314008b000
+SHA256 (xorg/proto/xf86rushproto-1.1.2.tar.bz2) = 07d9b237541f2d6313b5b28f5335d987a766b36c87b133f77cc48f31d969a3ae
+SIZE (xorg/proto/xf86rushproto-1.1.2.tar.bz2) = 37695
diff --git a/x11/xf86rushproto/pkg-descr b/x11/xf86rushproto/pkg-descr
new file mode 100644
index 000000000000..4add51bc469c
--- /dev/null
+++ b/x11/xf86rushproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org XFree86-Rush extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xf86rushproto/pkg-plist b/x11/xf86rushproto/pkg-plist
new file mode 100644
index 000000000000..4371db2ff835
--- /dev/null
+++ b/x11/xf86rushproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/xf86rush.h
+include/X11/extensions/xf86rushstr.h
+libdata/pkgconfig/xf86rushproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/xf86vidmodeproto/Makefile b/x11/xf86vidmodeproto/Makefile
new file mode 100644
index 000000000000..8c081362db1a
--- /dev/null
+++ b/x11/xf86vidmodeproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: xf86vidmodeproto
+# Date Created: 06 Feb 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86vidmodeproto
+PORTVERSION= 2.2.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= XFree86-VidModeExtension extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/xf86vidmodeproto/distinfo b/x11/xf86vidmodeproto/distinfo
new file mode 100644
index 000000000000..81b04a7cf261
--- /dev/null
+++ b/x11/xf86vidmodeproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xf86vidmodeproto-2.2.2.tar.bz2) = f00844a63d6e76b69eb0eb5e41eed843
+SHA256 (xorg/proto/xf86vidmodeproto-2.2.2.tar.bz2) = 07152f990cc79ec5931989decc4a90b1919147e98ff6fcfe39507a9d3fc4d96e
+SIZE (xorg/proto/xf86vidmodeproto-2.2.2.tar.bz2) = 39615
diff --git a/x11/xf86vidmodeproto/pkg-descr b/x11/xf86vidmodeproto/pkg-descr
new file mode 100644
index 000000000000..872e3328e990
--- /dev/null
+++ b/x11/xf86vidmodeproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org XFree86-VidModeExtension extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xf86vidmodeproto/pkg-plist b/x11/xf86vidmodeproto/pkg-plist
new file mode 100644
index 000000000000..410f26100f65
--- /dev/null
+++ b/x11/xf86vidmodeproto/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/extensions/xf86vmode.h
+include/X11/extensions/xf86vmstr.h
+libdata/pkgconfig/xf86vidmodeproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index f10378724902..9e258e0e0455 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-clipman-plugin
PORTVERSION= 0.8.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile
index 9c43310a7ac3..7f05baac6584 100644
--- a/x11/xfce4-quicklauncher-plugin/Makefile
+++ b/x11/xfce4-quicklauncher-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-quicklauncher-plugin
PORTVERSION= 1.9.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index 584ee89e86f1..40317521b6c0 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-screenshooter-plugin
PORTVERSION= 1.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index 28920cd6bd5f..b591de6c5932 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-taskmanager
PORTVERSION= 0.4.0.r2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 xfce
MASTER_SITES= http://xfce4-taskmanager.nebulon.de/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/-rc/}
diff --git a/x11/xfce4-xfapplet-plugin/Makefile b/x11/xfce4-xfapplet-plugin/Makefile
index e1508200583f..5d94718c415d 100644
--- a/x11/xfce4-xfapplet-plugin/Makefile
+++ b/x11/xfce4-xfapplet-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-xfapplet-plugin
PORTVERSION= 0.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/x11/xfce4-xfapplet-plugin/pkg-plist b/x11/xfce4-xfapplet-plugin/pkg-plist
index b3d4bc3c1408..23ead8bf11a0 100644
--- a/x11/xfce4-xfapplet-plugin/pkg-plist
+++ b/x11/xfce4-xfapplet-plugin/pkg-plist
@@ -20,4 +20,3 @@ share/xfce4/panel-plugins/xfapplet.desktop
@dirrmtry share/xfce4
@dirrmtry libexec/xfce4/panel-plugins
@dirrmtry libexec/xfce4
-@dirrmtry share/pixmaps
diff --git a/x11/xfd/Makefile b/x11/xfd/Makefile
new file mode 100644
index 000000000000..9dae7d24052f
--- /dev/null
+++ b/x11/xfd/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for: xfd
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xfd
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Display all characters in an X font
+
+LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
+BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+
+XORG_CAT= app
+USE_XORG= xft xt xaw
+
+MAN1= xfd.1
+
+.include <bsd.port.mk>
diff --git a/x11/xfd/distinfo b/x11/xfd/distinfo
new file mode 100644
index 000000000000..9b2bde22a3c2
--- /dev/null
+++ b/x11/xfd/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xfd-1.0.1.tar.bz2) = c72abd90f50ef459bc14b39ec9fcc7f8
+SHA256 (xorg/app/xfd-1.0.1.tar.bz2) = 111baa16780429d6739ab69b7393a18d75a10b7615dcc8cd0b0878ab9a5e2e1e
+SIZE (xorg/app/xfd-1.0.1.tar.bz2) = 88927
diff --git a/x11/xfd/pkg-descr b/x11/xfd/pkg-descr
new file mode 100644
index 000000000000..9c764d197c92
--- /dev/null
+++ b/x11/xfd/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xfd, an applications used for displying all
+characters in an X font.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xfd/pkg-plist b/x11/xfd/pkg-plist
new file mode 100644
index 000000000000..0665ed7eef79
--- /dev/null
+++ b/x11/xfd/pkg-plist
@@ -0,0 +1,3 @@
+bin/xfd
+share/X11/app-defaults/Xfd
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xfindproxy/Makefile b/x11/xfindproxy/Makefile
new file mode 100644
index 000000000000..13deb0d448a5
--- /dev/null
+++ b/x11/xfindproxy/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xfindproxy
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xfindproxy
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Locate available proxy services
+
+XORG_CAT= app
+USE_XORG= x11 ice xt xproxymngproto
+
+PLIST_FILES= bin/xfindproxy
+
+MAN1= xfindproxy.1
+
+.include <bsd.port.mk>
diff --git a/x11/xfindproxy/distinfo b/x11/xfindproxy/distinfo
new file mode 100644
index 000000000000..801363a7d820
--- /dev/null
+++ b/x11/xfindproxy/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xfindproxy-1.0.1.tar.bz2) = 5df3a162429bdd6ce5aea3ca5f6365b8
+SHA256 (xorg/app/xfindproxy-1.0.1.tar.bz2) = 6b585ceadd3e17b433e177d80837e485869d6704f1181b6f3457ae56ba1988ea
+SIZE (xorg/app/xfindproxy-1.0.1.tar.bz2) = 77645
diff --git a/x11/xfindproxy/pkg-descr b/x11/xfindproxy/pkg-descr
new file mode 100644
index 000000000000..63e6fd154be7
--- /dev/null
+++ b/x11/xfindproxy/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xfindproxy, a program for locating available
+proxy services.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xfishtank/Makefile b/x11/xfishtank/Makefile
index 090547d8ea98..a6473cff281d 100644
--- a/x11/xfishtank/Makefile
+++ b/x11/xfishtank/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfishtank
PORTVERSION= 2.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.uni-koeln.de/windows/xcontrib/
diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile
index f6d647c02bf4..0757c79229fd 100644
--- a/x11/xfree86_xkb_xml/Makefile
+++ b/x11/xfree86_xkb_xml/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfree86_xkb_xml
PORTVERSION= 0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gswitchit
diff --git a/x11/xfwp/Makefile b/x11/xfwp/Makefile
new file mode 100644
index 000000000000..0a7f721ef5bd
--- /dev/null
+++ b/x11/xfwp/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xfwp
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xfwp
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X firewall proxy
+
+XORG_CAT= app
+USE_XORG= x11 ice xproxymngproto
+
+PLIST_FILES= bin/xfwp
+
+MAN1= xfwp.1
+
+.include <bsd.port.mk>
diff --git a/x11/xfwp/distinfo b/x11/xfwp/distinfo
new file mode 100644
index 000000000000..fa9c2835f8c8
--- /dev/null
+++ b/x11/xfwp/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xfwp-1.0.1.tar.bz2) = 0dbde8b3867032b9e4a383d46dfd7e48
+SHA256 (xorg/app/xfwp-1.0.1.tar.bz2) = cdd6ecb453c62086dd01808a26787641add419dd42469349f79d0adeb89a6d93
+SIZE (xorg/app/xfwp-1.0.1.tar.bz2) = 104576
diff --git a/x11/xfwp/pkg-descr b/x11/xfwp/pkg-descr
new file mode 100644
index 000000000000..e2cda8002b11
--- /dev/null
+++ b/x11/xfwp/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X firewall proxy (xfwp).
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xgamma/Makefile b/x11/xgamma/Makefile
new file mode 100644
index 000000000000..651fc44e01fb
--- /dev/null
+++ b/x11/xgamma/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xgamma
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xgamma
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Gamma correction through the X server.
+
+XORG_CAT= app
+USE_XORG= x11 xxf86vm
+
+PLIST_FILES= bin/xgamma
+
+MAN1= xgamma.1
+
+.include <bsd.port.mk>
diff --git a/x11/xgamma/distinfo b/x11/xgamma/distinfo
new file mode 100644
index 000000000000..e4d70f2270a7
--- /dev/null
+++ b/x11/xgamma/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xgamma-1.0.1.tar.bz2) = 45d8fa3c85d4bfda87251798fd605a45
+SHA256 (xorg/app/xgamma-1.0.1.tar.bz2) = 085330064fdb90a152d2d44474fa20bb81ccb6c587c144f5f9c323cb9cc31eee
+SIZE (xorg/app/xgamma-1.0.1.tar.bz2) = 74971
diff --git a/x11/xgamma/pkg-descr b/x11/xgamma/pkg-descr
new file mode 100644
index 000000000000..9f19276b41cc
--- /dev/null
+++ b/x11/xgamma/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xgamma, a tool for altering the gamma correction
+through the X server.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xgc/Makefile b/x11/xgc/Makefile
new file mode 100644
index 000000000000..fd106632376c
--- /dev/null
+++ b/x11/xgc/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xgc
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xgc
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X graphics demo
+
+XORG_CAT= app
+USE_XORG= xt xaw
+
+MAN1= xgc.1
+
+.include <bsd.port.mk>
diff --git a/x11/xgc/distinfo b/x11/xgc/distinfo
new file mode 100644
index 000000000000..6e43f4e242db
--- /dev/null
+++ b/x11/xgc/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xgc-1.0.1.tar.bz2) = 72fc8dd68f585000c0a542eba0264571
+SHA256 (xorg/app/xgc-1.0.1.tar.bz2) = 7caddfc6c34f62a4ab2dba2ba34085f6b2343b36ec1bec3b522a2188170e1093
+SIZE (xorg/app/xgc-1.0.1.tar.bz2) = 128931
diff --git a/x11/xgc/pkg-descr b/x11/xgc/pkg-descr
new file mode 100644
index 000000000000..9d294688031a
--- /dev/null
+++ b/x11/xgc/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xgc, which is a program that demonstrates various
+features of the X graphics primitives.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xgc/pkg-plist b/x11/xgc/pkg-plist
new file mode 100644
index 000000000000..7e093927b895
--- /dev/null
+++ b/x11/xgc/pkg-plist
@@ -0,0 +1,3 @@
+bin/xgc
+share/X11/app-defaults/Xgc
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile
index e893d52109e9..75041aef7b93 100644
--- a/x11/xgrab/Makefile
+++ b/x11/xgrab/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xgrab
PORTVERSION= 2.41
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
@@ -18,13 +18,10 @@ MAINTAINER= jmz@FreeBSD.org
COMMENT= An X11 image grabber
BUILD_DEPENDS= xrdb:${X_CLIENTS_PORT}
-.if defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
- ${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
-.endif
USE_X_PREFIX= yes
USE_IMAKE= yes
+USE_DISPLAY= yes
MAKE_FLAGS= BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \
XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f
diff --git a/x11/xhost/Makefile b/x11/xhost/Makefile
new file mode 100644
index 000000000000..c8c84546ff78
--- /dev/null
+++ b/x11/xhost/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xhost
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xhost
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Server access control program for X
+
+XORG_CAT= app
+USE_XORG= x11 xmuu xau
+
+PLIST_FILES= bin/xhost
+
+MAN1= xhost.1
+
+.include <bsd.port.mk>
diff --git a/x11/xhost/distinfo b/x11/xhost/distinfo
new file mode 100644
index 000000000000..5e173eddbb7a
--- /dev/null
+++ b/x11/xhost/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xhost-1.0.1.tar.bz2) = 5300c9aafa58878c8f6e85379d5c199c
+SHA256 (xorg/app/xhost-1.0.1.tar.bz2) = b03b8c9a083064c35c2e7b76af2b0c28d756ced17d3c31549300fea057fd3822
+SIZE (xorg/app/xhost-1.0.1.tar.bz2) = 90034
diff --git a/x11/xhost/pkg-descr b/x11/xhost/pkg-descr
new file mode 100644
index 000000000000..7ef86f82225d
--- /dev/null
+++ b/x11/xhost/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xhost, a server access control program for the
+X Window System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xidle/Makefile b/x11/xidle/Makefile
index 1c737d145528..40f1ce0fb3fb 100644
--- a/x11/xidle/Makefile
+++ b/x11/xidle/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xidle
PORTVERSION= 24102005
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= novel
diff --git a/x11/xineramaproto/Makefile b/x11/xineramaproto/Makefile
new file mode 100644
index 000000000000..54c0efcae56e
--- /dev/null
+++ b/x11/xineramaproto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: xineramaproto
+# Date Created: 06 Feb 2006
+# Whom: Eric Anholt <anholt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xineramaproto
+PORTVERSION= 1.1.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Xinerama extension headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/xineramaproto/distinfo b/x11/xineramaproto/distinfo
new file mode 100644
index 000000000000..bab5c1b43688
--- /dev/null
+++ b/x11/xineramaproto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xineramaproto-1.1.2.tar.bz2) = 1cc292c562962ad0ad3a253cae68c632
+SHA256 (xorg/proto/xineramaproto-1.1.2.tar.bz2) = e8a62b1cafbcfc3b9fed147612ed4320233d0c9d6de30c991c2cd0c691c40910
+SIZE (xorg/proto/xineramaproto-1.1.2.tar.bz2) = 38413
diff --git a/x11/xineramaproto/pkg-descr b/x11/xineramaproto/pkg-descr
new file mode 100644
index 000000000000..2ef9ec7ac930
--- /dev/null
+++ b/x11/xineramaproto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org Xinerama extension headers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xineramaproto/pkg-plist b/x11/xineramaproto/pkg-plist
new file mode 100644
index 000000000000..10905a2ac56d
--- /dev/null
+++ b/x11/xineramaproto/pkg-plist
@@ -0,0 +1,5 @@
+include/X11/extensions/Xinerama.h
+include/X11/extensions/panoramiXext.h
+include/X11/extensions/panoramiXproto.h
+libdata/pkgconfig/xineramaproto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
new file mode 100644
index 000000000000..d10a1865c772
--- /dev/null
+++ b/x11/xinit/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for: xinit
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xinit
+PORTVERSION= 1.0.3
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X Window System initializer
+
+XORG_CAT= app
+USE_XORG= x11
+
+PLIST_FILES= bin/startx bin/xinit lib/X11/xinit/xinitrc
+PLIST_DIRS= lib/X11/xinit
+
+MAN1= startx.1 xinit.1
+
+.include <bsd.port.mk>
diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo
new file mode 100644
index 000000000000..70c1d87028e6
--- /dev/null
+++ b/x11/xinit/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xinit-1.0.3.tar.bz2) = f04a903cc0e18b3c338f58eb90f6caf8
+SHA256 (xorg/app/xinit-1.0.3.tar.bz2) = c77a58cba815eb1dde2242a819e80d7d84d753678837ac24d385e3ec65d33186
+SIZE (xorg/app/xinit-1.0.3.tar.bz2) = 97629
diff --git a/x11/xinit/pkg-descr b/x11/xinit/pkg-descr
new file mode 100644
index 000000000000..495f443cc3b3
--- /dev/null
+++ b/x11/xinit/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xinit, the X Window System initializer.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile
index 9c40419e1226..bcf6ece6fcc9 100644
--- a/x11/xinput/Makefile
+++ b/x11/xinput/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xinput
PORTVERSION= 1.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR=utilities
diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile
new file mode 100644
index 000000000000..14882d8276f5
--- /dev/null
+++ b/x11/xkbcomp/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xkbcomp
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xkbcomp
+PORTVERSION= 1.0.3
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Compile XKB keyboard description
+
+XORG_CAT= app
+USE_XORG= x11 xkbfile
+
+PLIST_FILES= bin/xkbcomp
+
+MAN1= xkbcomp.1
+
+.include <bsd.port.mk>
diff --git a/x11/xkbcomp/distinfo b/x11/xkbcomp/distinfo
new file mode 100644
index 000000000000..89f85b369efc
--- /dev/null
+++ b/x11/xkbcomp/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xkbcomp-1.0.3.tar.bz2) = 2fbcae1323c266edf5b6c61751f2e343
+SHA256 (xorg/app/xkbcomp-1.0.3.tar.bz2) = 0635bae5dae3c933ebba997475ae14fa213aee1f2ea8aaff2ca76c50f8aec716
+SIZE (xorg/app/xkbcomp-1.0.3.tar.bz2) = 189992
diff --git a/x11/xkbcomp/pkg-descr b/x11/xkbcomp/pkg-descr
new file mode 100644
index 000000000000..fce557314593
--- /dev/null
+++ b/x11/xkbcomp/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xkbcomp, the X.Org keymap compiler.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xkbctrl/Makefile b/x11/xkbctrl/Makefile
index 294a1dcbb37f..d81112bd99b7 100644
--- a/x11/xkbctrl/Makefile
+++ b/x11/xkbctrl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xkbctrl
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG}
MASTER_SITE_SUBDIR= unsupported/test/Xkb/programs
diff --git a/x11/xkbevd/Makefile b/x11/xkbevd/Makefile
new file mode 100644
index 000000000000..d807980d4f91
--- /dev/null
+++ b/x11/xkbevd/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xkbevd
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xkbevd
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= XKB event daemon
+
+XORG_CAT= app
+USE_XORG= xkbfile x11
+
+PLIST_FILES= bin/xkbevd
+
+MAN1= xkbevd.1
+
+.include <bsd.port.mk>
diff --git a/x11/xkbevd/distinfo b/x11/xkbevd/distinfo
new file mode 100644
index 000000000000..7f1a7af88f21
--- /dev/null
+++ b/x11/xkbevd/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xkbevd-1.0.2.tar.bz2) = 68f2a143716c23b566f8509d9498f516
+SHA256 (xorg/app/xkbevd-1.0.2.tar.bz2) = 4b78e316ecf9a9498291f634a7e9ee712ba429d5606f300c0a27eacdaaa1f72b
+SIZE (xorg/app/xkbevd-1.0.2.tar.bz2) = 107794
diff --git a/x11/xkbevd/pkg-descr b/x11/xkbevd/pkg-descr
new file mode 100644
index 000000000000..d93652d67c0f
--- /dev/null
+++ b/x11/xkbevd/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xkbevd, the XKB event daemon.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xkbprint/Makefile b/x11/xkbprint/Makefile
new file mode 100644
index 000000000000..be4469df9ae5
--- /dev/null
+++ b/x11/xkbprint/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xkbprint
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xkbprint
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Utility for printing an XKB keyboard description
+
+XORG_CAT= app
+USE_XORG= xkbfile x11
+
+PLIST_FILES= bin/xkbprint
+
+MAN1= xkbprint.1
+
+.include <bsd.port.mk>
diff --git a/x11/xkbprint/distinfo b/x11/xkbprint/distinfo
new file mode 100644
index 000000000000..ce46307d7a44
--- /dev/null
+++ b/x11/xkbprint/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xkbprint-1.0.1.tar.bz2) = b98ae2d8b21c545b7b322d0b302efefa
+SHA256 (xorg/app/xkbprint-1.0.1.tar.bz2) = 008dffea5b213880cb3ebd40d0b9bf0cc10392fb0349831efdebf2a428dd2e17
+SIZE (xorg/app/xkbprint-1.0.1.tar.bz2) = 115206
diff --git a/x11/xkbprint/pkg-descr b/x11/xkbprint/pkg-descr
new file mode 100644
index 000000000000..ce84f5663f3d
--- /dev/null
+++ b/x11/xkbprint/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xkbprint, an utility for printing an XKB keyboard
+description.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile
index ffaa9c1f60e1..847b7a69b438 100644
--- a/x11/xkbset/Makefile
+++ b/x11/xkbset/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xkbset
PORTVERSION= 0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://www.math.missouri.edu/~stephen/software/xkbset/
diff --git a/x11/xkbutils/Makefile b/x11/xkbutils/Makefile
new file mode 100644
index 000000000000..6c81d07d8769
--- /dev/null
+++ b/x11/xkbutils/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for: xkbutils
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xkbutils
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= XKB utility demos
+
+XORG_CAT= app
+USE_XORG= xkbfile x11 xaw
+
+.include <bsd.port.mk>
diff --git a/x11/xkbutils/distinfo b/x11/xkbutils/distinfo
new file mode 100644
index 000000000000..e044034538cb
--- /dev/null
+++ b/x11/xkbutils/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xkbutils-1.0.1.tar.bz2) = 84396a3dd75337caaae29d8fa5616fb1
+SHA256 (xorg/app/xkbutils-1.0.1.tar.bz2) = aaad73ed8db764978a18bc6ba774d38a4c1330c86622c0b47ae3ced09c175856
+SIZE (xorg/app/xkbutils-1.0.1.tar.bz2) = 65805
diff --git a/x11/xkbutils/pkg-descr b/x11/xkbutils/pkg-descr
new file mode 100644
index 000000000000..28b5236b5f9a
--- /dev/null
+++ b/x11/xkbutils/pkg-descr
@@ -0,0 +1 @@
+This package contains xkbutils, a collection of XKB utility demos.
diff --git a/x11/xkbutils/pkg-plist b/x11/xkbutils/pkg-plist
new file mode 100644
index 000000000000..d946aac18f93
--- /dev/null
+++ b/x11/xkbutils/pkg-plist
@@ -0,0 +1,3 @@
+bin/xkbvleds
+bin/xkbwatch
+bin/xkbbell
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
new file mode 100644
index 000000000000..cb6ad0d295f1
--- /dev/null
+++ b/x11/xkeyboard-config/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for: xkeyboard-config
+# Date Created: Dec 20 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xkeyboard-config
+PORTVERSION= 0.9
+PORTREVISION= 2
+CATEGORIES= x11
+MASTER_SITES= http://xlibs.freedesktop.org/xkbdesc/
+DISTNAME= xkeyboard-config-${PORTVERSION}
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X Keyboard Configuration Database
+
+BUILD_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp \
+ ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+
+# XXX - sigh
+PREFIX= ${X11BASE}
+
+USE_BZIP2= yes
+USE_ICONV= yes
+USE_GMAKE= yes
+USE_GETTEXT= yes
+USE_PERL5_BUILD=yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-xkb-base=${PREFIX}/share/X11/xkb \
+ --with-xkb-rules-symlink=xorg
+
+post-install:
+ ${MKDIR} /var/lib/xkb
+
+.include <bsd.port.mk>
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
new file mode 100644
index 000000000000..a350ba349705
--- /dev/null
+++ b/x11/xkeyboard-config/distinfo
@@ -0,0 +1,3 @@
+MD5 (xkeyboard-config-0.9.tar.bz2) = 52afe60101ace8532881e70f6c2dc020
+SHA256 (xkeyboard-config-0.9.tar.bz2) = bb84c40036c4eab0f88bf09951bf36c867d0196988636edfd6efa14d61be777d
+SIZE (xkeyboard-config-0.9.tar.bz2) = 471807
diff --git a/x11/xkeyboard-config/pkg-descr b/x11/xkeyboard-config/pkg-descr
new file mode 100644
index 000000000000..e1b900241aa0
--- /dev/null
+++ b/x11/xkeyboard-config/pkg-descr
@@ -0,0 +1,10 @@
+The non-arch keyboard configuration database for X Window.
+The goal is to provide the consistent, well-structured,
+frequently released open source of X keyboard configuration
+data for X Window System implementations (free, open source
+and commercial). The project is targetted to XKB-based systems.
+
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
new file mode 100644
index 000000000000..875d06fe90d5
--- /dev/null
+++ b/x11/xkeyboard-config/pkg-plist
@@ -0,0 +1,312 @@
+share/X11/xkb/compat.dir
+share/X11/xkb/compat/accessx
+share/X11/xkb/compat/basic
+share/X11/xkb/compat/complete
+share/X11/xkb/compat/default
+share/X11/xkb/compat/iso9995
+share/X11/xkb/compat/japan
+share/X11/xkb/compat/keypad
+share/X11/xkb/compat/ledcaps
+share/X11/xkb/compat/lednum
+share/X11/xkb/compat/ledscroll
+share/X11/xkb/compat/level5
+share/X11/xkb/compat/misc
+share/X11/xkb/compat/mousekeys
+share/X11/xkb/compat/norepeat
+share/X11/xkb/compat/pc
+share/X11/xkb/compat/pc98
+share/X11/xkb/compat/xfree86
+share/X11/xkb/compat/xtest
+share/X11/xkb/compat/README
+share/X11/xkb/compiled
+share/X11/xkb/geometry/digital_vndr/lk
+share/X11/xkb/geometry/digital_vndr/pc
+share/X11/xkb/geometry/digital_vndr/unix
+share/X11/xkb/geometry/sgi_vndr/indigo
+share/X11/xkb/geometry/sgi_vndr/indy
+share/X11/xkb/geometry/sgi_vndr/O2
+share/X11/xkb/geometry/amiga
+share/X11/xkb/geometry/ataritt
+share/X11/xkb/geometry/chicony
+share/X11/xkb/geometry/dell
+share/X11/xkb/geometry/everex
+share/X11/xkb/geometry/fujitsu
+share/X11/xkb/geometry/hp
+share/X11/xkb/geometry/keytronic
+share/X11/xkb/geometry/kinesis
+share/X11/xkb/geometry/macintosh
+share/X11/xkb/geometry/microsoft
+share/X11/xkb/geometry/nec
+share/X11/xkb/geometry/northgate
+share/X11/xkb/geometry/pc
+share/X11/xkb/geometry/sony
+share/X11/xkb/geometry/sun
+share/X11/xkb/geometry/thinkpad
+share/X11/xkb/geometry/winbook
+share/X11/xkb/geometry/README
+share/X11/xkb/geometry.dir
+share/X11/xkb/keycodes/digital_vndr/lk
+share/X11/xkb/keycodes/digital_vndr/pc
+share/X11/xkb/keycodes/sgi_vndr/indigo
+share/X11/xkb/keycodes/sgi_vndr/indy
+share/X11/xkb/keycodes/sgi_vndr/iris
+share/X11/xkb/keycodes/aliases
+share/X11/xkb/keycodes/amiga
+share/X11/xkb/keycodes/ataritt
+share/X11/xkb/keycodes/evdev
+share/X11/xkb/keycodes/fujitsu
+share/X11/xkb/keycodes/hp
+share/X11/xkb/keycodes/ibm
+share/X11/xkb/keycodes/macintosh
+share/X11/xkb/keycodes/powerpcps2
+share/X11/xkb/keycodes/sony
+share/X11/xkb/keycodes/sun
+share/X11/xkb/keycodes/xfree86
+share/X11/xkb/keycodes/xfree98
+share/X11/xkb/keycodes/README
+share/X11/xkb/keycodes.dir
+share/X11/xkb/keymap/digital_vndr/us
+share/X11/xkb/keymap/sgi_vndr/be
+share/X11/xkb/keymap/sgi_vndr/bg
+share/X11/xkb/keymap/sgi_vndr/ca
+share/X11/xkb/keymap/sgi_vndr/ch
+share/X11/xkb/keymap/sgi_vndr/cz
+share/X11/xkb/keymap/sgi_vndr/de
+share/X11/xkb/keymap/sgi_vndr/dk
+share/X11/xkb/keymap/sgi_vndr/dvorak
+share/X11/xkb/keymap/sgi_vndr/es
+share/X11/xkb/keymap/sgi_vndr/fi
+share/X11/xkb/keymap/sgi_vndr/fr
+share/X11/xkb/keymap/sgi_vndr/gb
+share/X11/xkb/keymap/sgi_vndr/hu
+share/X11/xkb/keymap/sgi_vndr/it
+share/X11/xkb/keymap/sgi_vndr/jp
+share/X11/xkb/keymap/sgi_vndr/no
+share/X11/xkb/keymap/sgi_vndr/pl
+share/X11/xkb/keymap/sgi_vndr/pt
+share/X11/xkb/keymap/sgi_vndr/ru
+share/X11/xkb/keymap/sgi_vndr/se
+share/X11/xkb/keymap/sgi_vndr/sk
+share/X11/xkb/keymap/sgi_vndr/th
+share/X11/xkb/keymap/sgi_vndr/us
+share/X11/xkb/keymap/sun_vndr/all
+share/X11/xkb/keymap/sun_vndr/de
+share/X11/xkb/keymap/sun_vndr/es
+share/X11/xkb/keymap/sun_vndr/fi
+share/X11/xkb/keymap/sun_vndr/fr
+share/X11/xkb/keymap/sun_vndr/no
+share/X11/xkb/keymap/sun_vndr/pl
+share/X11/xkb/keymap/sun_vndr/ru
+share/X11/xkb/keymap/sun_vndr/se
+share/X11/xkb/keymap/sun_vndr/uk
+share/X11/xkb/keymap/sun_vndr/us
+share/X11/xkb/keymap/amiga
+share/X11/xkb/keymap/ataritt
+share/X11/xkb/keymap/macintosh
+share/X11/xkb/keymap/sony
+share/X11/xkb/keymap/xfree86
+share/X11/xkb/keymap/xfree98
+share/X11/xkb/keymap/README
+share/X11/xkb/keymap.dir
+share/X11/xkb/rules/base
+share/X11/xkb/rules/base.lst
+share/X11/xkb/rules/base.xml
+share/X11/xkb/rules/sgi
+share/X11/xkb/rules/sun
+share/X11/xkb/rules/xfree98
+share/X11/xkb/rules/xkb.dtd
+share/X11/xkb/rules/xorg
+share/X11/xkb/rules/xorg.lst
+share/X11/xkb/rules/xorg.xml
+share/X11/xkb/rules/README
+share/X11/xkb/semantics.dir
+share/X11/xkb/semantics/basic
+share/X11/xkb/semantics/complete
+share/X11/xkb/semantics/default
+share/X11/xkb/semantics/xtest
+share/X11/xkb/symbols/digital_vndr/lk
+share/X11/xkb/symbols/digital_vndr/pc
+share/X11/xkb/symbols/digital_vndr/us
+share/X11/xkb/symbols/digital_vndr/vt
+share/X11/xkb/symbols/fujitsu_vndr/jp
+share/X11/xkb/symbols/fujitsu_vndr/us
+share/X11/xkb/symbols/hp_vndr/us
+share/X11/xkb/symbols/macintosh_vndr/apple
+share/X11/xkb/symbols/macintosh_vndr/ch
+share/X11/xkb/symbols/macintosh_vndr/de
+share/X11/xkb/symbols/macintosh_vndr/dk
+share/X11/xkb/symbols/macintosh_vndr/es
+share/X11/xkb/symbols/macintosh_vndr/fi
+share/X11/xkb/symbols/macintosh_vndr/fr
+share/X11/xkb/symbols/macintosh_vndr/gb
+share/X11/xkb/symbols/macintosh_vndr/is
+share/X11/xkb/symbols/macintosh_vndr/it
+share/X11/xkb/symbols/macintosh_vndr/nl
+share/X11/xkb/symbols/macintosh_vndr/no
+share/X11/xkb/symbols/macintosh_vndr/pt
+share/X11/xkb/symbols/macintosh_vndr/se
+share/X11/xkb/symbols/macintosh_vndr/us
+share/X11/xkb/symbols/nec_vndr/jp
+share/X11/xkb/symbols/sgi_vndr/jp
+share/X11/xkb/symbols/sony_vndr/us
+share/X11/xkb/symbols/sun_vndr/cs
+share/X11/xkb/symbols/sun_vndr/cz
+share/X11/xkb/symbols/sun_vndr/de
+share/X11/xkb/symbols/sun_vndr/dk
+share/X11/xkb/symbols/sun_vndr/es
+share/X11/xkb/symbols/sun_vndr/fi
+share/X11/xkb/symbols/sun_vndr/fr
+share/X11/xkb/symbols/sun_vndr/gb
+share/X11/xkb/symbols/sun_vndr/gr
+share/X11/xkb/symbols/sun_vndr/hu
+share/X11/xkb/symbols/sun_vndr/it
+share/X11/xkb/symbols/sun_vndr/jp
+share/X11/xkb/symbols/sun_vndr/ko
+share/X11/xkb/symbols/sun_vndr/lt
+share/X11/xkb/symbols/sun_vndr/lv
+share/X11/xkb/symbols/sun_vndr/nl
+share/X11/xkb/symbols/sun_vndr/no
+share/X11/xkb/symbols/sun_vndr/pl
+share/X11/xkb/symbols/sun_vndr/pt
+share/X11/xkb/symbols/sun_vndr/ru
+share/X11/xkb/symbols/sun_vndr/se
+share/X11/xkb/symbols/sun_vndr/solaris
+share/X11/xkb/symbols/sun_vndr/sw
+share/X11/xkb/symbols/sun_vndr/tr
+share/X11/xkb/symbols/sun_vndr/tuv
+share/X11/xkb/symbols/sun_vndr/tw
+share/X11/xkb/symbols/sun_vndr/us
+share/X11/xkb/symbols/sun_vndr/usb
+share/X11/xkb/symbols/xfree68_vndr/amiga
+share/X11/xkb/symbols/xfree68_vndr/ataritt
+share/X11/xkb/symbols/ad
+share/X11/xkb/symbols/af
+share/X11/xkb/symbols/al
+share/X11/xkb/symbols/am
+share/X11/xkb/symbols/ara
+share/X11/xkb/symbols/az
+share/X11/xkb/symbols/be
+share/X11/xkb/symbols/bd
+share/X11/xkb/symbols/bg
+share/X11/xkb/symbols/br
+share/X11/xkb/symbols/ba
+share/X11/xkb/symbols/bt
+share/X11/xkb/symbols/by
+share/X11/xkb/symbols/ca
+share/X11/xkb/symbols/cd
+share/X11/xkb/symbols/ch
+share/X11/xkb/symbols/cs
+share/X11/xkb/symbols/cz
+share/X11/xkb/symbols/de
+share/X11/xkb/symbols/dk
+share/X11/xkb/symbols/ee
+share/X11/xkb/symbols/epo
+share/X11/xkb/symbols/es
+share/X11/xkb/symbols/fi
+share/X11/xkb/symbols/fo
+share/X11/xkb/symbols/fr
+share/X11/xkb/symbols/gb
+share/X11/xkb/symbols/ge
+share/X11/xkb/symbols/gh
+share/X11/xkb/symbols/gr
+share/X11/xkb/symbols/hr
+share/X11/xkb/symbols/hu
+share/X11/xkb/symbols/ie
+share/X11/xkb/symbols/il
+share/X11/xkb/symbols/in
+share/X11/xkb/symbols/iq
+share/X11/xkb/symbols/ir
+share/X11/xkb/symbols/is
+share/X11/xkb/symbols/it
+share/X11/xkb/symbols/jp
+share/X11/xkb/symbols/kg
+share/X11/xkb/symbols/kh
+share/X11/xkb/symbols/kr
+share/X11/xkb/symbols/kz
+share/X11/xkb/symbols/la
+share/X11/xkb/symbols/latam
+share/X11/xkb/symbols/latin
+share/X11/xkb/symbols/lk
+share/X11/xkb/symbols/lt
+share/X11/xkb/symbols/lv
+share/X11/xkb/symbols/mao
+share/X11/xkb/symbols/mk
+share/X11/xkb/symbols/mm
+share/X11/xkb/symbols/mn
+share/X11/xkb/symbols/mt
+share/X11/xkb/symbols/mv
+share/X11/xkb/symbols/nbsp
+share/X11/xkb/symbols/ng
+share/X11/xkb/symbols/nl
+share/X11/xkb/symbols/no
+share/X11/xkb/symbols/np
+share/X11/xkb/symbols/pc
+share/X11/xkb/symbols/pk
+share/X11/xkb/symbols/pl
+share/X11/xkb/symbols/pt
+share/X11/xkb/symbols/ro
+share/X11/xkb/symbols/ru
+share/X11/xkb/symbols/se
+share/X11/xkb/symbols/si
+share/X11/xkb/symbols/sk
+share/X11/xkb/symbols/sy
+share/X11/xkb/symbols/th
+share/X11/xkb/symbols/tj
+share/X11/xkb/symbols/tr
+share/X11/xkb/symbols/ua
+share/X11/xkb/symbols/us
+share/X11/xkb/symbols/uz
+share/X11/xkb/symbols/vn
+share/X11/xkb/symbols/za
+share/X11/xkb/symbols/altwin
+share/X11/xkb/symbols/capslock
+share/X11/xkb/symbols/compose
+share/X11/xkb/symbols/ctrl
+share/X11/xkb/symbols/group
+share/X11/xkb/symbols/inet
+share/X11/xkb/symbols/keypad
+share/X11/xkb/symbols/level3
+share/X11/xkb/symbols/level5
+share/X11/xkb/symbols/srvr_ctrl
+share/X11/xkb/symbols/eurosign
+share/X11/xkb/symbols.dir
+share/X11/xkb/types.dir
+share/X11/xkb/types/basic
+share/X11/xkb/types/cancel
+share/X11/xkb/types/caps
+share/X11/xkb/types/complete
+share/X11/xkb/types/default
+share/X11/xkb/types/extra
+share/X11/xkb/types/iso9995
+share/X11/xkb/types/level5
+share/X11/xkb/types/mousekeys
+share/X11/xkb/types/numpad
+share/X11/xkb/types/pc
+share/X11/xkb/types/README
+@exec mkdir -p /var/lib/xkb
+@dirrm share/X11/xkb/compat
+@dirrm share/X11/xkb/geometry/digital_vndr
+@dirrm share/X11/xkb/geometry/sgi_vndr
+@dirrm share/X11/xkb/geometry
+@dirrm share/X11/xkb/keycodes/digital_vndr
+@dirrm share/X11/xkb/keycodes/sgi_vndr
+@dirrm share/X11/xkb/keycodes
+@dirrm share/X11/xkb/keymap/digital_vndr
+@dirrm share/X11/xkb/keymap/sgi_vndr
+@dirrm share/X11/xkb/keymap/sun_vndr
+@dirrm share/X11/xkb/keymap
+@dirrm share/X11/xkb/rules
+@dirrm share/X11/xkb/semantics
+@dirrm share/X11/xkb/symbols/digital_vndr
+@dirrm share/X11/xkb/symbols/fujitsu_vndr
+@dirrm share/X11/xkb/symbols/hp_vndr
+@dirrm share/X11/xkb/symbols/macintosh_vndr
+@dirrm share/X11/xkb/symbols/nec_vndr
+@dirrm share/X11/xkb/symbols/sgi_vndr
+@dirrm share/X11/xkb/symbols/sony_vndr
+@dirrm share/X11/xkb/symbols/sun_vndr
+@dirrm share/X11/xkb/symbols/xfree68_vndr
+@dirrm share/X11/xkb/symbols
+@dirrm share/X11/xkb/types
+@dirrm share/X11/xkb
+@dirrmtry /var/lib/xkb
diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile
index 7275cd2d7005..7e1a89e736f6 100644
--- a/x11/xkeycaps/Makefile
+++ b/x11/xkeycaps/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xkeycaps
PORTVERSION= 2.46
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://www.jwz.org/xkeycaps/
EXTRACT_SUFX= .tar.Z
@@ -16,6 +16,7 @@ MAINTAINER= jmz@FreeBSD.org
COMMENT= Graphically display and edit the keyboard mapping
USE_IMAKE= yes
+USE_XORG= xbitmaps
MAN1= xkeycaps.1
PLIST_FILES= bin/xkeycaps
diff --git a/x11/xkeywrap/Makefile b/x11/xkeywrap/Makefile
index f320d10b3c13..ca088c06985c 100644
--- a/x11/xkeywrap/Makefile
+++ b/x11/xkeywrap/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xkeywrap
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://hp.vector.co.jp/authors/VA014157/myfreesoft/
diff --git a/x11/xkill/Makefile b/x11/xkill/Makefile
new file mode 100644
index 000000000000..2abf419eb3d9
--- /dev/null
+++ b/x11/xkill/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xkill
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xkill
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Utility for killing a client by its X resource
+
+XORG_CAT= app
+USE_XORG= x11 xmuu
+
+PLIST_FILES= bin/xkill
+
+MAN1= xkill.1
+
+.include <bsd.port.mk>
diff --git a/x11/xkill/distinfo b/x11/xkill/distinfo
new file mode 100644
index 000000000000..31c0d15973af
--- /dev/null
+++ b/x11/xkill/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xkill-1.0.1.tar.bz2) = f66d76abb0f75514ca32272e23cca757
+SHA256 (xorg/app/xkill-1.0.1.tar.bz2) = 77a11aac6e4ae2132d8b7b4335be77de26655e6aa88b40e51fd2ee802f14a9de
+SIZE (xorg/app/xkill-1.0.1.tar.bz2) = 77172
diff --git a/x11/xkill/pkg-descr b/x11/xkill/pkg-descr
new file mode 100644
index 000000000000..38143a4052c7
--- /dev/null
+++ b/x11/xkill/pkg-descr
@@ -0,0 +1,5 @@
+This package contians xkill, which is a utility for forcing the X server
+to close connections to clients.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xload/Makefile b/x11/xload/Makefile
new file mode 100644
index 000000000000..f376cf09c397
--- /dev/null
+++ b/x11/xload/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xload
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xload
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= System load average display for X
+
+XORG_CAT= app
+USE_XORG= xt xaw
+
+MAN1= xload.1
+
+.include <bsd.port.mk>
diff --git a/x11/xload/distinfo b/x11/xload/distinfo
new file mode 100644
index 000000000000..0d0380a2025c
--- /dev/null
+++ b/x11/xload/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xload-1.0.1.tar.bz2) = ba013813f9c21eb015559466f8d02a44
+SHA256 (xorg/app/xload-1.0.1.tar.bz2) = 8d51184d6b18eea2f64e0c5b88cd95edff8353ce6529e780f95b1f2347babbf2
+SIZE (xorg/app/xload-1.0.1.tar.bz2) = 87468
diff --git a/x11/xload/pkg-descr b/x11/xload/pkg-descr
new file mode 100644
index 000000000000..800b8523dcf0
--- /dev/null
+++ b/x11/xload/pkg-descr
@@ -0,0 +1,5 @@
+This pckage contains xload, the X Window System system load average
+display application.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xload/pkg-plist b/x11/xload/pkg-plist
new file mode 100644
index 000000000000..7aa1f18cb26a
--- /dev/null
+++ b/x11/xload/pkg-plist
@@ -0,0 +1,3 @@
+bin/xload
+share/X11/app-defaults/XLoad
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 502c5b982dca..5a58229e6814 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -7,7 +7,7 @@
VERSION= 4.1
REVISION= 16
-PORTREVISION= 0
+PORTREVISION= 1
PORTNAME= xloadimage
PORTVERSION= ${VERSION}.${REVISION}
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 4ab2ffce6945..05e72a0fe887 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xlockmore
PORTVERSION= 5.23
+PORTREVISION= 1
CATEGORIES?= x11
MASTER_SITES= ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
http://www.tux.org/~bagleyd/latest/
diff --git a/x11/xlogo/Makefile b/x11/xlogo/Makefile
new file mode 100644
index 000000000000..c599b449df1a
--- /dev/null
+++ b/x11/xlogo/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xlogo
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xlogo
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Displays the X Window System logo.
+
+XORG_CAT= app
+USE_XORG= xrender xft xext xt xaw xp xprintutil
+
+MAN1= xlogo.1
+
+.include <bsd.port.mk>
diff --git a/x11/xlogo/distinfo b/x11/xlogo/distinfo
new file mode 100644
index 000000000000..a1d249922a91
--- /dev/null
+++ b/x11/xlogo/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xlogo-1.0.1.tar.bz2) = 4c5482552f38a7d42398a694cc9b2ee6
+SHA256 (xorg/app/xlogo-1.0.1.tar.bz2) = de59f9be3d45fe93f445f39bec3cea09753a671e56863ce77e3a797d2df526b2
+SIZE (xorg/app/xlogo-1.0.1.tar.bz2) = 87107
diff --git a/x11/xlogo/pkg-descr b/x11/xlogo/pkg-descr
new file mode 100644
index 000000000000..c93a929dc517
--- /dev/null
+++ b/x11/xlogo/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xlogo, which displays the X Window System logo.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xlogo/pkg-plist b/x11/xlogo/pkg-plist
new file mode 100644
index 000000000000..22312613f56e
--- /dev/null
+++ b/x11/xlogo/pkg-plist
@@ -0,0 +1,4 @@
+bin/xlogo
+share/X11/app-defaults/XLogo
+share/X11/app-defaults/XLogo-color
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xlogout/Makefile b/x11/xlogout/Makefile
index 7e15f10644c4..e32b2837ef93 100644
--- a/x11/xlogout/Makefile
+++ b/x11/xlogout/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xlogout
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.tu-darmstadt.de/pub/X11/other/
EXTRACT_SUFX= .tar.Z
diff --git a/x11/xlsatoms/Makefile b/x11/xlsatoms/Makefile
new file mode 100644
index 000000000000..1ba6c2505936
--- /dev/null
+++ b/x11/xlsatoms/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xlsatoms
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xlsatoms
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= List interned atoms defined on a server
+
+XORG_CAT= app
+USE_XORG= x11 xmuu
+
+PLIST_FILES= bin/xlsatoms
+
+MAN1= xlsatoms.1
+
+.include <bsd.port.mk>
diff --git a/x11/xlsatoms/distinfo b/x11/xlsatoms/distinfo
new file mode 100644
index 000000000000..34c95c27736d
--- /dev/null
+++ b/x11/xlsatoms/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xlsatoms-1.0.1.tar.bz2) = 69adcda848479acc3b82b3928812d191
+SHA256 (xorg/app/xlsatoms-1.0.1.tar.bz2) = 456d575a0cdb37fc9415578a3ad34ba3cf9eb5eb0f6e5a25f97ca41db416d55a
+SIZE (xorg/app/xlsatoms-1.0.1.tar.bz2) = 74852
diff --git a/x11/xlsatoms/pkg-descr b/x11/xlsatoms/pkg-descr
new file mode 100644
index 000000000000..7f7540df4f4d
--- /dev/null
+++ b/x11/xlsatoms/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xlsatoms, an application for listing interned
+atoms defined on server.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xlsclients/Makefile b/x11/xlsclients/Makefile
new file mode 100644
index 000000000000..4d87441eaf3c
--- /dev/null
+++ b/x11/xlsclients/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xlsclients
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xlsclients
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= List client applications running on a display
+
+XORG_CAT= app
+USE_XORG= x11 xmuu
+
+PLIST_FILES= bin/xlsclients
+
+MAN1= xlsclients.1
+
+.include <bsd.port.mk>
diff --git a/x11/xlsclients/distinfo b/x11/xlsclients/distinfo
new file mode 100644
index 000000000000..baa6753a1493
--- /dev/null
+++ b/x11/xlsclients/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xlsclients-1.0.1.tar.bz2) = 44473b880d26bfbe8b3d4d72b183cba7
+SHA256 (xorg/app/xlsclients-1.0.1.tar.bz2) = 988c71c6dc3519523fe5844ee3e49d91f843a83c783dd0baa20526d9d2981698
+SIZE (xorg/app/xlsclients-1.0.1.tar.bz2) = 75484
diff --git a/x11/xlsclients/pkg-descr b/x11/xlsclients/pkg-descr
new file mode 100644
index 000000000000..ea77ec583455
--- /dev/null
+++ b/x11/xlsclients/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xlsclients, which is a utility for listing information
+about the client applications running on a display.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xlupe/Makefile b/x11/xlupe/Makefile
index 63031a65f474..26fd0d89e7ca 100644
--- a/x11/xlupe/Makefile
+++ b/x11/xlupe/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xlupe
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11 accessibility
MASTER_SITES= http://www.core.de/~coto/projects/xlupe/
diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile
new file mode 100644
index 000000000000..b5edabcbd966
--- /dev/null
+++ b/x11/xmag/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xmag
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xmag
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X application for screen magnifying
+
+XORG_CAT= app
+USE_XORG= xt xaw
+
+MAN1= xmag.1
+
+.include <bsd.port.mk>
diff --git a/x11/xmag/distinfo b/x11/xmag/distinfo
new file mode 100644
index 000000000000..d1457369ab63
--- /dev/null
+++ b/x11/xmag/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xmag-1.0.1.tar.bz2) = 058d168d1c7c991b8d12158433ea5f63
+SHA256 (xorg/app/xmag-1.0.1.tar.bz2) = 1f239057cdfb2164b2e8fc229e2518d20b27a853f975e73618a4a81f09ebeb02
+SIZE (xorg/app/xmag-1.0.1.tar.bz2) = 93719
diff --git a/x11/xmag/pkg-descr b/x11/xmag/pkg-descr
new file mode 100644
index 000000000000..585549a3d1b2
--- /dev/null
+++ b/x11/xmag/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xmag, a screen magnifying application for the
+X Window System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xmag/pkg-plist b/x11/xmag/pkg-plist
new file mode 100644
index 000000000000..77c5b31d9246
--- /dev/null
+++ b/x11/xmag/pkg-plist
@@ -0,0 +1,3 @@
+bin/xmag
+share/X11/app-defaults/Xmag
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xman/Makefile b/x11/xman/Makefile
new file mode 100644
index 000000000000..4b31fda28156
--- /dev/null
+++ b/x11/xman/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xman
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xman
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Manual page display program for X
+
+XORG_CAT= app
+USE_XORG= xt xaw xp xprintutil
+
+MAN1= xman.1
+
+.include <bsd.port.mk>
diff --git a/x11/xman/distinfo b/x11/xman/distinfo
new file mode 100644
index 000000000000..150dd47e8a83
--- /dev/null
+++ b/x11/xman/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xman-1.0.2.tar.bz2) = 855f2dbfa2aff58b8b9cd6a1c1120fad
+SHA256 (xorg/app/xman-1.0.2.tar.bz2) = 00bc616892388c94505b09564daffbad2df2e7c684686dea2d78dbcd210212f2
+SIZE (xorg/app/xman-1.0.2.tar.bz2) = 138214
diff --git a/x11/xman/pkg-descr b/x11/xman/pkg-descr
new file mode 100644
index 000000000000..ca408e1c319e
--- /dev/null
+++ b/x11/xman/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xman, a manual page display program for the X
+Window System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xman/pkg-plist b/x11/xman/pkg-plist
new file mode 100644
index 000000000000..9d163bb9b93f
--- /dev/null
+++ b/x11/xman/pkg-plist
@@ -0,0 +1,4 @@
+bin/xman
+share/X11/app-defaults/Xman
+share/X11/xman.help
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xmangekyou/Makefile b/x11/xmangekyou/Makefile
index 2a0f87f66047..4e9e985c855d 100644
--- a/x11/xmangekyou/Makefile
+++ b/x11/xmangekyou/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmangekyou
PORTVERSION= 2.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://hp.vector.co.jp/authors/VA014157/myfreesoft/ \
ftp://ftp.vector.co.jp/pack/unix/art/anime/
diff --git a/x11/xmascot/Makefile b/x11/xmascot/Makefile
index 371c927e1a4b..337248b0fd2d 100644
--- a/x11/xmascot/Makefile
+++ b/x11/xmascot/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmascot
PORTVERSION= 2.6a
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://cclub-flying.dsl.gr.jp/products/xmascot/
DISTNAME= ${PORTNAME}${PORTVERSION}
diff --git a/x11/xmessage/Makefile b/x11/xmessage/Makefile
new file mode 100644
index 000000000000..050a3ab2cfd0
--- /dev/null
+++ b/x11/xmessage/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xmessage
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xmessage
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Display message or query in a X window
+
+XORG_CAT= app
+USE_XORG= xt xaw
+
+MAN1= xmessage.1
+
+.include <bsd.port.mk>
diff --git a/x11/xmessage/distinfo b/x11/xmessage/distinfo
new file mode 100644
index 000000000000..022e7a0291ce
--- /dev/null
+++ b/x11/xmessage/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xmessage-1.0.1.tar.bz2) = b3674c3a00a089764d86aa94e257ccec
+SHA256 (xorg/app/xmessage-1.0.1.tar.bz2) = b921aef62c2a2f5c32048502cd96630e9d42493cd39d1841fde247274f24bbda
+SIZE (xorg/app/xmessage-1.0.1.tar.bz2) = 83465
diff --git a/x11/xmessage/pkg-descr b/x11/xmessage/pkg-descr
new file mode 100644
index 000000000000..965f1f9264a3
--- /dev/null
+++ b/x11/xmessage/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xmessage, an application for displaying messages
+or queries in a X window.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xmessage/pkg-plist b/x11/xmessage/pkg-plist
new file mode 100644
index 000000000000..da5f545d8ae9
--- /dev/null
+++ b/x11/xmessage/pkg-plist
@@ -0,0 +1,4 @@
+bin/xmessage
+share/X11/app-defaults/Xmessage
+share/X11/app-defaults/Xmessage-color
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xmh/Makefile b/x11/xmh/Makefile
new file mode 100644
index 000000000000..bb368e9ba004
--- /dev/null
+++ b/x11/xmh/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xmh
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xmh
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Send and read mail with an X interface to MH
+
+XORG_CAT= app
+USE_XORG= xt xaw
+
+MAN1= xmh.1
+
+.include <bsd.port.mk>
diff --git a/x11/xmh/distinfo b/x11/xmh/distinfo
new file mode 100644
index 000000000000..b69bd773657a
--- /dev/null
+++ b/x11/xmh/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xmh-1.0.1.tar.bz2) = 656bcbdd41818a8b5a9f7dba77a3eeba
+SHA256 (xorg/app/xmh-1.0.1.tar.bz2) = 9471fb455ce0bfc582b865722ab7417c587c9fea82342181e9cd0a9629c2c6fa
+SIZE (xorg/app/xmh-1.0.1.tar.bz2) = 153114
diff --git a/x11/xmh/pkg-descr b/x11/xmh/pkg-descr
new file mode 100644
index 000000000000..a7c2f0ee184c
--- /dev/null
+++ b/x11/xmh/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xmh, a graphical user interface to the MH Message
+Handling System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xmh/pkg-plist b/x11/xmh/pkg-plist
new file mode 100644
index 000000000000..a73c42462001
--- /dev/null
+++ b/x11/xmh/pkg-plist
@@ -0,0 +1,6 @@
+bin/xmh
+include/X11/bitmaps/black6
+include/X11/bitmaps/box6
+share/X11/app-defaults/Xmh
+@dirrmtry share/X11/app-defaults
+@dirrmtry include/X11/bitmaps
diff --git a/x11/xmodmap/Makefile b/x11/xmodmap/Makefile
new file mode 100644
index 000000000000..4674c0dff9bb
--- /dev/null
+++ b/x11/xmodmap/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xmodmap
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xmodmap
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Utility for modifying keymaps and pointer button mappings in X
+
+XORG_CAT= app
+USE_XORG= x11
+
+PLIST_FILES= bin/xmodmap
+
+MAN1= xmodmap.1
+
+.include <bsd.port.mk>
diff --git a/x11/xmodmap/distinfo b/x11/xmodmap/distinfo
new file mode 100644
index 000000000000..d199a6bd64b5
--- /dev/null
+++ b/x11/xmodmap/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xmodmap-1.0.2.tar.bz2) = ea78b3e32e27c3662f86ea68b3aec22f
+SHA256 (xorg/app/xmodmap-1.0.2.tar.bz2) = 4bed79ba6efcaabb3ce055cf88419a5190f8ab9d3408e7b14d722351cbaf4b44
+SIZE (xorg/app/xmodmap-1.0.2.tar.bz2) = 94755
diff --git a/x11/xmodmap/pkg-descr b/x11/xmodmap/pkg-descr
new file mode 100644
index 000000000000..45ddab88b0bd
--- /dev/null
+++ b/x11/xmodmap/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xmodmap, which is a program for editing and displaying
+the keyboard modifier map and keymap table in X.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xmold/Makefile b/x11/xmold/Makefile
index f1fbde176607..92f3f5cdd7d0 100644
--- a/x11/xmold/Makefile
+++ b/x11/xmold/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmold
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://cclub.cc.tut.ac.jp/pub/xwin/
DISTNAME= ${PORTNAME}
diff --git a/x11/xmon/Makefile b/x11/xmon/Makefile
index 7db6c35c4768..67a16d10cf41 100644
--- a/x11/xmon/Makefile
+++ b/x11/xmon/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmon
PORTVERSION= 1.5.6
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= devel_tools
diff --git a/x11/xmore/Makefile b/x11/xmore/Makefile
new file mode 100644
index 000000000000..9bd0d42e3336
--- /dev/null
+++ b/x11/xmore/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xmore
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xmore
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Plain text display program for X
+
+XORG_CAT= app
+USE_XORG= xt xaw xp xprintutil
+
+MAN1= xmore.1
+
+.include <bsd.port.mk>
diff --git a/x11/xmore/distinfo b/x11/xmore/distinfo
new file mode 100644
index 000000000000..eedec05a47fb
--- /dev/null
+++ b/x11/xmore/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xmore-1.0.1.tar.bz2) = d36e918dce779a9d207b7a266f4e87c8
+SHA256 (xorg/app/xmore-1.0.1.tar.bz2) = 653566be73c474bc45f1a6631e14b008445c74557a8f6f46effee1ac3e8f2527
+SIZE (xorg/app/xmore-1.0.1.tar.bz2) = 92060
diff --git a/x11/xmore/pkg-descr b/x11/xmore/pkg-descr
new file mode 100644
index 000000000000..6c19ace2cbb3
--- /dev/null
+++ b/x11/xmore/pkg-descr
@@ -0,0 +1,5 @@
+This package contains the xmore plain text display program for the X Window
+System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xmore/pkg-plist b/x11/xmore/pkg-plist
new file mode 100644
index 000000000000..c8f4c3abbcd3
--- /dev/null
+++ b/x11/xmore/pkg-plist
@@ -0,0 +1,3 @@
+bin/xmore
+share/X11/app-defaults/XMore
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xmotd/Makefile b/x11/xmotd/Makefile
index d1985db59952..8e19697416bb 100644
--- a/x11/xmotd/Makefile
+++ b/x11/xmotd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmotd
DISTVERSION= 1.17.3b
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.ee.ryerson.ca/~elf/pub/
diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile
index 611a47551a0d..ba90479f4bc4 100644
--- a/x11/xmove/Makefile
+++ b/x11/xmove/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmove
PORTVERSION= 2.0b2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.cs.columbia.edu/pub/xmove/
DISTNAME= ${PORTNAME}.${PORTVERSION:S/b/beta/}
diff --git a/x11/xmsg/Makefile b/x11/xmsg/Makefile
index aba395376498..3fb6a4425fc0 100644
--- a/x11/xmsg/Makefile
+++ b/x11/xmsg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmsg
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.generalconcepts.com/resources/software/
diff --git a/x11/xmx/Makefile b/x11/xmx/Makefile
index 44dfe4e55e48..2e027bd6b20d 100644
--- a/x11/xmx/Makefile
+++ b/x11/xmx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmx
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.cs.brown.edu/pub/xmx/
EXTRACT_SUFX= .tar.Z
diff --git a/x11/xnee/Makefile b/x11/xnee/Makefile
index 1d252d1bb96a..bb939ee834e0 100644
--- a/x11/xnee/Makefile
+++ b/x11/xnee/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xnee
PORTVERSION= 2.05
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11/xnodecor/Makefile b/x11/xnodecor/Makefile
index 5599cec47c7a..2c66402de325 100644
--- a/x11/xnodecor/Makefile
+++ b/x11/xnodecor/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xnodecor
PORTVERSION= 0.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.42.org/pub/wmx/contrib/
DISTFILES= xnodecor.c
diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
new file mode 100644
index 000000000000..1df59bb8865f
--- /dev/null
+++ b/x11/xorg-apps/Makefile
@@ -0,0 +1,118 @@
+# New ports collection makefile for: xorg-apps
+# Date created: Jun 22 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xorg-apps
+PORTVERSION= 7.2
+CATEGORIES= x11
+MASTER_SITES= # none
+DISTFILES= # none
+EXTRACT_ONLY= # none
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.org apps meta-port
+
+PREFIX?= ${X11BASE}
+
+RUN_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
+ appres:${PORTSDIR}/x11/appres \
+ beforelight:${PORTSDIR}/x11/beforelight \
+ bitmap:${PORTSDIR}/x11/bitmap \
+ editres:${PORTSDIR}/x11/editres \
+ fonttosfnt:${PORTSDIR}/x11-fonts/fonttosfnt \
+ fslsfonts:${PORTSDIR}/x11-fonts/fslsfonts \
+ fstobdf:${PORTSDIR}/x11/fstobdf \
+ iceauth:${PORTSDIR}/x11/iceauth \
+ ico:${PORTSDIR}/x11/ico \
+ listres:${PORTSDIR}/x11/listres \
+ luit:${PORTSDIR}/x11/luit \
+ ${PREFIX}/sbin/mkcomposecache:${PORTSDIR}/x11/mkcomposecache \
+ oclock:${PORTSDIR}/x11/oclock \
+ showrgb:${PORTSDIR}/x11/rgb \
+ rstart:${PORTSDIR}/x11/rstart \
+ xon:${PORTSDIR}/x11/scripts \
+ sessreg:${PORTSDIR}/x11/sessreg \
+ setxkbmap:${PORTSDIR}/x11/setxkbmap \
+ showfont:${PORTSDIR}/x11-fonts/showfont \
+ smproxy:${PORTSDIR}/x11/smproxy \
+ twm:${PORTSDIR}/x11-wm/twm \
+ viewres:${PORTSDIR}/x11/viewres \
+ x11perf:${PORTSDIR}/x11/x11perf \
+ xauth:${PORTSDIR}/x11/xauth \
+ xbiff:${PORTSDIR}/x11/xbiff \
+ xcalc:${PORTSDIR}/x11/xcalc \
+ xclipboard:${PORTSDIR}/x11/xclipboard \
+ xclock:${PORTSDIR}/x11/xclock \
+ xcmsdb:${PORTSDIR}/x11/xcmsdb \
+ xconsole:${PORTSDIR}/x11/xconsole \
+ xcursorgen:${PORTSDIR}/x11/xcursorgen \
+ xdbedizzy:${PORTSDIR}/x11/xdbedizzy \
+ xditview:${PORTSDIR}/x11/xditview \
+ xdm:${PORTSDIR}/x11/xdm \
+ xdpyinfo:${PORTSDIR}/x11/xdpyinfo \
+ xdriinfo:${PORTSDIR}/x11/xdriinfo \
+ xedit:${PORTSDIR}/x11/xedit \
+ xev:${PORTSDIR}/x11/xev \
+ xeyes:${PORTSDIR}/x11/xeyes \
+ dga:${PORTSDIR}/x11/xf86dga \
+ xfd:${PORTSDIR}/x11/xfd \
+ xfindproxy:${PORTSDIR}/x11/xfindproxy \
+ xfontsel:${PORTSDIR}/x11-fonts/xfontsel \
+ xfs:${PORTSDIR}/x11-fonts/xfs \
+ xfsinfo:${PORTSDIR}/x11-fonts/xfsinfo \
+ xfwp:${PORTSDIR}/x11/xfwp \
+ xgamma:${PORTSDIR}/x11/xgamma \
+ xgc:${PORTSDIR}/x11/xgc \
+ xhost:${PORTSDIR}/x11/xhost \
+ xinit:${PORTSDIR}/x11/xinit \
+ xkbcomp:${PORTSDIR}/x11/xkbcomp \
+ xkbevd:${PORTSDIR}/x11/xkbevd \
+ xkbprint:${PORTSDIR}/x11/xkbprint \
+ xkbvleds:${PORTSDIR}/x11/xkbutils \
+ xkill:${PORTSDIR}/x11/xkill \
+ xload:${PORTSDIR}/x11/xload \
+ xlogo:${PORTSDIR}/x11/xlogo \
+ xlsatoms:${PORTSDIR}/x11/xlsatoms \
+ xlsclients:${PORTSDIR}/x11/xlsclients \
+ xlsfonts:${PORTSDIR}/x11-fonts/xlsfonts \
+ xmag:${PORTSDIR}/x11/xmag \
+ xman:${PORTSDIR}/x11/xman \
+ xmessage:${PORTSDIR}/x11/xmessage \
+ xmh:${PORTSDIR}/x11/xmh \
+ xmodmap:${PORTSDIR}/x11/xmodmap \
+ xmore:${PORTSDIR}/x11/xmore \
+ xphelloworld:${PORTSDIR}/x11/xphelloworld \
+ xplsprinters:${PORTSDIR}/x11/xplsprinters \
+ xpr:${PORTSDIR}/x11/xpr \
+ xprehashprinterlist:${PORTSDIR}/x11/xprehashprinterlist \
+ xprop:${PORTSDIR}/x11/xprop \
+ xrandr:${PORTSDIR}/x11/xrandr \
+ xrdb:${PORTSDIR}/x11/xrdb \
+ xrefresh:${PORTSDIR}/x11/xrefresh \
+ xrx:${PORTSDIR}/x11/xrx \
+ xset:${PORTSDIR}/x11/xset \
+ xsetmode:${PORTSDIR}/x11/xsetmode \
+ xsetpointer:${PORTSDIR}/x11/xsetpointer \
+ xsetroot:${PORTSDIR}/x11/xsetroot \
+ xsm:${PORTSDIR}/x11/xsm \
+ xstdcmap:${PORTSDIR}/x11/xstdcmap \
+ xtrapchar:${PORTSDIR}/x11/xtrap \
+ xvidtune:${PORTSDIR}/x11/xvidtune \
+ xvinfo:${PORTSDIR}/x11/xvinfo \
+ xwd:${PORTSDIR}/x11/xwd \
+ xwininfo:${PORTSDIR}/x11/xwininfo \
+ xwud:${PORTSDIR}/x11/xwud \
+ xterm:${PORTSDIR}/x11/xterm
+
+NO_BUILD= yes
+
+do-install:
+ ${MKDIR} ${PREFIX}/libdata/xorg
+ ${TOUCH} ${PREFIX}/libdata/xorg/apps
+
+.include <bsd.port.mk>
diff --git a/x11/xorg-apps/pkg-descr b/x11/xorg-apps/pkg-descr
new file mode 100644
index 000000000000..bbe7fcfb5556
--- /dev/null
+++ b/x11/xorg-apps/pkg-descr
@@ -0,0 +1,6 @@
+This meta-package installs all X.Org applications.
+
+WWW: http://www.x.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11/xorg-apps/pkg-plist b/x11/xorg-apps/pkg-plist
new file mode 100644
index 000000000000..459b6c97f220
--- /dev/null
+++ b/x11/xorg-apps/pkg-plist
@@ -0,0 +1,2 @@
+libdata/xorg/apps
+@dirrmtry libdata/xorg
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
new file mode 100644
index 000000000000..cd59bc22f74e
--- /dev/null
+++ b/x11/xorg-cf-files/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for: xorg-cf-files
+# Date created: Nov 18 2006
+# Whom: Dave Grochowski
+#
+# $FreeBSD$
+#
+
+PORTNAME= xorg-cf-files
+PORTVERSION= 1.0.2
+PORTREVISION= 2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.org cf files for use with imake builds
+
+XORG_CAT= util
+
+.include <bsd.port.mk>
diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo
new file mode 100644
index 000000000000..06ed7fc59d3d
--- /dev/null
+++ b/x11/xorg-cf-files/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/util/xorg-cf-files-1.0.2.tar.bz2) = 5f62dd5545b782c74f6e4e70d0e6552c
+SHA256 (xorg/util/xorg-cf-files-1.0.2.tar.bz2) = e34613aec2d3d56e1917bd8469f228b9654558f41e335d7e8e49020779fa9597
+SIZE (xorg/util/xorg-cf-files-1.0.2.tar.bz2) = 264638
diff --git a/x11/xorg-cf-files/files/patch-FreeBSD.cf b/x11/xorg-cf-files/files/patch-FreeBSD.cf
new file mode 100644
index 000000000000..524dee86e0ae
--- /dev/null
+++ b/x11/xorg-cf-files/files/patch-FreeBSD.cf
@@ -0,0 +1,64 @@
+--- FreeBSD.cf.orig Sat Aug 14 17:03:36 2004
++++ FreeBSD.cf Fri Sep 10 19:52:31 2004
+@@ -78,6 +78,7 @@
+ #define HasIssetugid YES
+ #define HasPoll YES
+ #endif
++#define BuildHtmlManPages NO
+
+ #if OSMajorVersion >= 4
+ #define HasGetIfAddrs YES
+@@ -117,14 +118,8 @@
+ # if (OSRelVersion < 500043)
+ # define NeedUIThrStubs YES
+ # endif
+-# if (OSRelVersion >= 502102)
+-# define ThreadsLibraries -lpthread
+-# elif (OSRelVersion >= 500016)
+-# define ThreadsLibraries -lc_r
+-# else
+-# define ThreadsLibraries -pthread
+-# endif
+-# define SystemMTDefines -D_THREAD_SAFE
++# define ThreadsLibraries -lpthread
++# define SystemMTDefines
+ #endif
+
+ /* This fixes linking C programs against libGLU on FreeBSD 3.x */
+@@ -338,7 +333,7 @@
+ #ifndef LibraryRpathLoadFlags
+ # if UseRpath
+ # if UseElfFormat
+-# define LibraryRpathLoadFlags -rpath $(USRLIBDIRPATH)
++# define LibraryRpathLoadFlags -Wl,-rpath $(USRLIBDIRPATH)
+ # else
+ # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH)
+ # endif
+@@ -466,14 +461,14 @@
+ /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
+ #ifndef DefaultGcc2i386Opt
+ #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
+-#define DefaultGcc2i386Opt -O2 GccAliasingArgs
++#define DefaultGcc2i386Opt
+ #endif
+ #endif
+
+ #ifdef i386Architecture
+ # define OptimizedCDebugFlags DefaultGcc2i386Opt
+ #else
+-# define OptimizedCDebugFlags -O
++# define OptimizedCDebugFlags
+ #endif
+
+ #ifndef PreIncDir
+@@ -493,6 +493,10 @@
+ #define SystemManDirectory /usr/share/man
+ #endif
+
++#ifndef UseConfDirForAppDefaults
++#define UseConfDirForAppDefaults NO
++#endif
++
+ #define InstKmemFlags -g kmem -m 2755
+
+ /*
diff --git a/x11/xorg-cf-files/files/patch-Imake.rules b/x11/xorg-cf-files/files/patch-Imake.rules
new file mode 100644
index 000000000000..6542cdc94180
--- /dev/null
+++ b/x11/xorg-cf-files/files/patch-Imake.rules
@@ -0,0 +1,29 @@
+--- Imake.rules.orig Tue Dec 18 05:00:37 2001
++++ Imake.rules Mon Jan 21 02:34:48 2002
+@@ -1399,7 +1399,7 @@
+ dest.suffix.html: file.$(MANNEWSUFFIX) RmanCmdDependency @@\
+ RemoveFiles(dest.suffix.html dest.suffix-html) @@\
+ RunProgram(RMAN,$(RMANOPTIONS) < file.$(MANNEWSUFFIX) \ @@\
+- > dest.suffix-html) && $(MV) dest.suffix-html $@ @@\
++ > dest.suffix-html) && $(MV) dest.suffix-html dest.suffix.html @@\
+ @@\
+ install.man:: dest.suffix.html @@\
+ MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\
+@@ -1644,7 +1644,7 @@
+ MakeDir(Concat($(DESTDIR),npath/mdir)) @@\
+ @MakeFlagsToShellFlags(i,set +e); \ @@\
+ if [ -d Concat($(DESTDIR),opath/cdir) ]; then \ @@\
+- RELPATH=`echo opath/cdir | \ @@\
++ RELPATH=`cd opath/cdir; pwd | \ @@\
+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ @@\
+ cd Concat($(DESTDIR),opath/cdir); \ @@\
+ if [ -d rdir -a ! -h rdir ]; then \ @@\
+@@ -1691,7 +1691,7 @@
+ MakeDir(Concat($(DESTDIR),npath)) @@\
+ @MakeFlagsToShellFlags(i,set +e); \ @@\
+ if [ -d Concat($(DESTDIR),opath) ]; then \ @@\
+- RELPATH=`echo opath | \ @@\
++ RELPATH=`cd opath; pwd | \ @@\
+ sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\
+ cd Concat($(DESTDIR),opath); \ @@\
+ if [ -f lfile -a ! -h lfile ]; then \ @@\
diff --git a/x11/xorg-cf-files/files/patch-Imake.tmpl b/x11/xorg-cf-files/files/patch-Imake.tmpl
new file mode 100644
index 000000000000..442fb64463b3
--- /dev/null
+++ b/x11/xorg-cf-files/files/patch-Imake.tmpl
@@ -0,0 +1,20 @@
+--- Imake.tmpl.orig Tue Jul 27 20:24:29 2004
++++ Imake.tmpl Fri Sep 10 18:45:12 2004
+@@ -1798,7 +1798,7 @@
+ CXXOPTIONS = CplusplusOptions
+ CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
+ CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
+- CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
++ CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
+ #endif
+ COMPRESS = CompressCmd
+ GZIPCMD = GzipCmd
+@@ -2038,7 +2038,7 @@
+ */
+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
+- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
++ CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
+ LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
+ LDPRELIB = LdPreLib $(INSTALLED_LIBS)
+ LDPOSTLIB = LdPostLib
diff --git a/x11/xorg-cf-files/files/patch-Library.tmpl b/x11/xorg-cf-files/files/patch-Library.tmpl
new file mode 100644
index 000000000000..1bb60edbd009
--- /dev/null
+++ b/x11/xorg-cf-files/files/patch-Library.tmpl
@@ -0,0 +1,11 @@
+--- Library.tmpl.orig Thu Jan 18 01:22:30 2001
++++ Library.tmpl Mon Jun 4 19:30:34 2001
+@@ -67,7 +67,7 @@
+ STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
+ CDEBUGFLAGS = LibraryCDebugFlags
+ CLIBDEBUGFLAGS = LibraryDebugOpt
+- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
++ CFLAGS += $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
+ # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
+ PICFLAGS = LargePositionIndependentCFlags
+ # endif
diff --git a/x11/xorg-cf-files/pkg-descr b/x11/xorg-cf-files/pkg-descr
new file mode 100644
index 000000000000..e0bb5bcf11a3
--- /dev/null
+++ b/x11/xorg-cf-files/pkg-descr
@@ -0,0 +1 @@
+X.org cf files for use with imake based builds.
diff --git a/x11/xorg-cf-files/pkg-plist b/x11/xorg-cf-files/pkg-plist
new file mode 100644
index 000000000000..05bc2a4a748d
--- /dev/null
+++ b/x11/xorg-cf-files/pkg-plist
@@ -0,0 +1,122 @@
+lib/X11/config/Amoeba.cf
+lib/X11/config/DGUX.cf
+lib/X11/config/DragonFly.cf
+lib/X11/config/FreeBSD.cf
+lib/X11/config/Imake.cf
+lib/X11/config/Imake.rules
+lib/X11/config/Imake.tmpl
+lib/X11/config/Library.tmpl
+lib/X11/config/Mips.cf
+lib/X11/config/Motif.rules
+lib/X11/config/Motif.tmpl
+lib/X11/config/NetBSD.cf
+lib/X11/config/Oki.cf
+lib/X11/config/OpenBSD.cf
+lib/X11/config/OpenBSDLib.rules
+lib/X11/config/OpenBSDLib.tmpl
+lib/X11/config/QNX4.cf
+lib/X11/config/QNX4.rules
+lib/X11/config/Server.tmpl
+lib/X11/config/ServerLib.tmpl
+lib/X11/config/Threads.tmpl
+lib/X11/config/Win32.cf
+lib/X11/config/Win32.rules
+lib/X11/config/WinLib.tmpl
+lib/X11/config/X11.rules
+lib/X11/config/X11.tmpl
+lib/X11/config/apollo.cf
+lib/X11/config/bsd.cf
+lib/X11/config/bsdLib.rules
+lib/X11/config/bsdLib.tmpl
+lib/X11/config/bsdi.cf
+lib/X11/config/bsdiLib.rules
+lib/X11/config/bsdiLib.tmpl
+lib/X11/config/cde.rules
+lib/X11/config/cde.tmpl
+lib/X11/config/convex.cf
+lib/X11/config/cray.cf
+lib/X11/config/cross.def
+lib/X11/config/cross.rules
+lib/X11/config/cygwin.cf
+lib/X11/config/cygwin.rules
+lib/X11/config/cygwin.tmpl
+lib/X11/config/darwin.cf
+lib/X11/config/darwinLib.rules
+lib/X11/config/darwinLib.tmpl
+lib/X11/config/date.def
+lib/X11/config/dmx.cf
+lib/X11/config/fujitsu.cf
+lib/X11/config/generic.cf
+lib/X11/config/gnu.cf
+lib/X11/config/gnuLib.rules
+lib/X11/config/gnuLib.tmpl
+lib/X11/config/host.def
+lib/X11/config/hp.cf
+lib/X11/config/hpLib.rules
+lib/X11/config/hpLib.tmpl
+lib/X11/config/ibm.cf
+lib/X11/config/ibmLib.rules
+lib/X11/config/ibmLib.tmpl
+lib/X11/config/isc.cf
+lib/X11/config/linux.cf
+lib/X11/config/lnxLib.rules
+lib/X11/config/lnxLib.tmpl
+lib/X11/config/lnxdoc.rules
+lib/X11/config/lnxdoc.tmpl
+lib/X11/config/luna.cf
+lib/X11/config/lynx.cf
+lib/X11/config/macII.cf
+lib/X11/config/mach.cf
+lib/X11/config/mingw.cf
+lib/X11/config/mingw.rules
+lib/X11/config/mingw.tmpl
+lib/X11/config/minix.cf
+lib/X11/config/moto.cf
+lib/X11/config/ncr.cf
+lib/X11/config/nec.cf
+lib/X11/config/necLib.rules
+lib/X11/config/necLib.tmpl
+lib/X11/config/noop.rules
+lib/X11/config/nto.cf
+lib/X11/config/nto.rules
+lib/X11/config/oldlib.rules
+lib/X11/config/os2.cf
+lib/X11/config/os2.rules
+lib/X11/config/os2Lib.rules
+lib/X11/config/os2Lib.tmpl
+lib/X11/config/osf1.cf
+lib/X11/config/osfLib.rules
+lib/X11/config/osfLib.tmpl
+lib/X11/config/pegasus.cf
+lib/X11/config/sco.cf
+lib/X11/config/sco5.cf
+lib/X11/config/scoLib.rules
+lib/X11/config/sequent.cf
+lib/X11/config/sequentLib.rules
+lib/X11/config/sgi.cf
+lib/X11/config/sgiLib.rules
+lib/X11/config/sgiLib.tmpl
+lib/X11/config/site.def
+lib/X11/config/sony.cf
+lib/X11/config/sun.cf
+lib/X11/config/sunLib.rules
+lib/X11/config/sunLib.tmpl
+lib/X11/config/sv3Lib.rules
+lib/X11/config/sv3Lib.tmpl
+lib/X11/config/sv4Lib.rules
+lib/X11/config/sv4Lib.tmpl
+lib/X11/config/svr3.cf
+lib/X11/config/svr4.cf
+lib/X11/config/ultrix.cf
+lib/X11/config/usl.cf
+lib/X11/config/version.def
+lib/X11/config/x386.cf
+lib/X11/config/xf86.rules
+lib/X11/config/xf86.tmpl
+lib/X11/config/xf86site.def
+lib/X11/config/xfree86.cf
+lib/X11/config/xorg.cf
+lib/X11/config/xorg.tmpl
+lib/X11/config/xorgsite.def
+lib/X11/config/xorgversion.def
+@dirrm lib/X11/config
diff --git a/x11/xorg-docs/Makefile b/x11/xorg-docs/Makefile
new file mode 100644
index 000000000000..81f6c429fd16
--- /dev/null
+++ b/x11/xorg-docs/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xorg-docs
+# Date Created: Nov 2 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xorg-docs
+PORTVERSION= 1.3
+PORTEPOCH= 1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.org documentation files
+
+CONFLICTS= XFree86-documents-* xorg-documents-*
+
+XORG_CAT= doc
+
+.include <bsd.port.mk>
diff --git a/x11/xorg-docs/distinfo b/x11/xorg-docs/distinfo
new file mode 100644
index 000000000000..5744a5a00b44
--- /dev/null
+++ b/x11/xorg-docs/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/doc/xorg-docs-1.3.tar.bz2) = 792d41a7a9f2e652b2ede4538c4bdf14
+SHA256 (xorg/doc/xorg-docs-1.3.tar.bz2) = 589072096406e67d467de3ec83a66da1ae65bf51a8fd25c8958b0fc54a78d9a1
+SIZE (xorg/doc/xorg-docs-1.3.tar.bz2) = 8248288
diff --git a/x11/xorg-docs/pkg-descr b/x11/xorg-docs/pkg-descr
new file mode 100644
index 000000000000..f9e4211b2729
--- /dev/null
+++ b/x11/xorg-docs/pkg-descr
@@ -0,0 +1,4 @@
+The documentation in this package is from xc/doc in the monolithic
+source tree. It is expected that most of the documentation included
+here will be converted to a new format and then moved to the appropriate
+package.
diff --git a/x11/xorg-docs/pkg-plist b/x11/xorg-docs/pkg-plist
new file mode 100644
index 000000000000..ef07c6d420fc
--- /dev/null
+++ b/x11/xorg-docs/pkg-plist
@@ -0,0 +1,112 @@
+man/man7/Consortium.7
+man/man7/security.7
+man/man7/Standards.7
+man/man7/X.7
+man/man7/XOrgFoundation.7
+man/man7/Xprint.7
+man/man7/XProjectTeam.7
+share/X11/doc/hardcopy/BDF/bdf.PS.gz
+share/X11/doc/hardcopy/CTEXT/ctext.PS.gz
+share/X11/doc/hardcopy/FSProtocol/fsproto.PS.gz
+share/X11/doc/hardcopy/i18n/Framework.PS.gz
+share/X11/doc/hardcopy/i18n/LocaleDB.PS.gz
+share/X11/doc/hardcopy/i18n/Trans.PS.gz
+share/X11/doc/hardcopy/ICCCM/icccm.idx.PS.gz
+share/X11/doc/hardcopy/ICCCM/icccm.PS.gz
+share/X11/doc/hardcopy/ICE/ICElib.PS.gz
+share/X11/doc/hardcopy/ICE/ice.PS.gz
+share/X11/doc/hardcopy/man/man.PS.gz
+share/X11/doc/hardcopy/rstart/rstart.PS.gz
+share/X11/doc/hardcopy/RX/RX.PS.gz
+share/X11/doc/hardcopy/saver/saver.PS.gz
+share/X11/doc/hardcopy/SM/SMlib.PS.gz
+share/X11/doc/hardcopy/SM/xsmp.PS.gz
+share/X11/doc/hardcopy/X11/xlib.idx.PS.gz
+share/X11/doc/hardcopy/X11/xlib.PS.gz
+share/X11/doc/hardcopy/Xaw/widgets.PS.gz
+share/X11/doc/hardcopy/Xaw/widg.idx.PS.gz
+share/X11/doc/hardcopy/XDMCP/xdmcp.PS.gz
+share/X11/doc/hardcopy/Xext/AppGroup.PS.gz
+share/X11/doc/hardcopy/Xext/bigreq.PS.gz
+share/X11/doc/hardcopy/Xext/buffer.PS.gz
+share/X11/doc/hardcopy/Xext/dbelib.PS.gz
+share/X11/doc/hardcopy/Xext/dbe.PS.gz
+share/X11/doc/hardcopy/Xext/DPMSLib.PS.gz
+share/X11/doc/hardcopy/Xext/DPMS.PS.gz
+share/X11/doc/hardcopy/Xext/evi.PS.gz
+share/X11/doc/hardcopy/Xext/lbxalg.PS.gz
+share/X11/doc/hardcopy/Xext/lbx.html
+share/X11/doc/hardcopy/Xext/lbx.PS.gz
+share/X11/doc/hardcopy/Xext/lbxTOC.html
+share/X11/doc/hardcopy/Xext/mit-shm.PS.gz
+share/X11/doc/hardcopy/Xext/recordlib.PS.gz
+share/X11/doc/hardcopy/Xext/record.PS.gz
+share/X11/doc/hardcopy/Xext/security.PS.gz
+share/X11/doc/hardcopy/Xext/shapelib.PS.gz
+share/X11/doc/hardcopy/Xext/shape.PS.gz
+share/X11/doc/hardcopy/Xext/synclib.PS.gz
+share/X11/doc/hardcopy/Xext/sync.PS.gz
+share/X11/doc/hardcopy/Xext/tog-cup.PS.gz
+share/X11/doc/hardcopy/Xext/xc-misc.PS.gz
+share/X11/doc/hardcopy/Xext/xtestlib.PS.gz
+share/X11/doc/hardcopy/Xext/xtest.PS.gz
+share/X11/doc/hardcopy/xfs/design.PS.gz
+share/X11/doc/hardcopy/Xi/lib.PS.gz
+share/X11/doc/hardcopy/Xi/port.PS.gz
+share/X11/doc/hardcopy/Xi/proto.PS.gz
+share/X11/doc/hardcopy/XIM/xim.PS.gz
+share/X11/doc/hardcopy/XKB/XKBlib.ps.gz
+share/X11/doc/hardcopy/XKB/XKBproto.ps.gz
+share/X11/doc/hardcopy/XLFD/xlfd.PS.gz
+share/X11/doc/hardcopy/Xmu/xmu.PS.gz
+share/X11/doc/hardcopy/XPRINT/dtprint_fspec.PS.gz
+share/X11/doc/hardcopy/XPRINT/xp_library.PS.gz
+share/X11/doc/hardcopy/XPRINT/xp_proto.PS.gz
+share/X11/doc/hardcopy/XPRINT/Xprint_FAQ.html
+share/X11/doc/hardcopy/XPRINT/Xprint_FAQ.txt
+share/X11/doc/hardcopy/XPRINT/Xprint_FAQ.xml
+share/X11/doc/hardcopy/XPRINT/Xprint_old_FAQ.txt
+share/X11/doc/hardcopy/XProtocol/proto.idx.PS.gz
+share/X11/doc/hardcopy/XProtocol/proto.PS.gz
+share/X11/doc/hardcopy/Xserver/analysis.PS.gz
+share/X11/doc/hardcopy/Xserver/appgroup.PS.gz
+share/X11/doc/hardcopy/Xserver/ddx.PS.gz
+share/X11/doc/hardcopy/Xserver/fontlib.PS.gz
+share/X11/doc/hardcopy/Xserver/secint.PS.gz
+share/X11/doc/hardcopy/Xserver/Xprt.PS.gz
+share/X11/doc/hardcopy/Xt/intr.idx.PS.gz
+share/X11/doc/hardcopy/Xt/intrinsics.PS.gz
+share/X11/doc/hardcopy/xtrans/Xtrans.PS.gz
+share/X11/doc/hardcopy/Xv/video
+share/X11/doc/hardcopy/Xv/xv-protocol-v2.PS
+share/X11/doc/MAINTAINERS
+@dirrm share/X11/doc/hardcopy/BDF
+@dirrm share/X11/doc/hardcopy/CTEXT
+@dirrm share/X11/doc/hardcopy/FSProtocol
+@dirrm share/X11/doc/hardcopy/i18n
+@dirrm share/X11/doc/hardcopy/ICCCM
+@dirrm share/X11/doc/hardcopy/ICE
+@dirrm share/X11/doc/hardcopy/man
+@dirrm share/X11/doc/hardcopy/rstart
+@dirrm share/X11/doc/hardcopy/RX
+@dirrm share/X11/doc/hardcopy/saver
+@dirrm share/X11/doc/hardcopy/SM
+@dirrm share/X11/doc/hardcopy/X11
+@dirrm share/X11/doc/hardcopy/Xaw
+@dirrm share/X11/doc/hardcopy/XDMCP
+@dirrm share/X11/doc/hardcopy/Xext
+@dirrm share/X11/doc/hardcopy/xfs
+@dirrm share/X11/doc/hardcopy/Xi
+@dirrm share/X11/doc/hardcopy/XIM
+@dirrm share/X11/doc/hardcopy/XKB
+@dirrm share/X11/doc/hardcopy/XLFD
+@dirrm share/X11/doc/hardcopy/Xmu
+@dirrm share/X11/doc/hardcopy/XPRINT
+@dirrm share/X11/doc/hardcopy/XProtocol
+@dirrm share/X11/doc/hardcopy/Xserver
+@dirrm share/X11/doc/hardcopy/Xt
+@dirrm share/X11/doc/hardcopy/xtrans
+@dirrm share/X11/doc/hardcopy/Xv
+@dirrm share/X11/doc/hardcopy
+@dirrm share/X11/doc
+@dirrmtry share/X11
diff --git a/x11/xorg-edit/Makefile b/x11/xorg-edit/Makefile
index 1d00f8ca4593..45ee2a83cbc3 100644
--- a/x11/xorg-edit/Makefile
+++ b/x11/xorg-edit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xorg-edit
PORTVERSION= 07.04.23
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION}_src
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
index f12e21d94428..9761d40f4203 100644
--- a/x11/xorg-libraries/Makefile
+++ b/x11/xorg-libraries/Makefile
@@ -6,72 +6,71 @@
#
PORTNAME= xorg-libraries
-PORTVERSION= 6.9.0
-PORTREVISION= 1
+PORTVERSION= 7.2
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src
-DISTFILES= X11R${PORTVERSION}-src1.tar.gz \
- X11R${PORTVERSION}-src3.tar.gz
-
-PATCHFILES= x11r6.9.0-cidfonts.diff
-PATCH_SITES= ${MASTER_SITE_XORG}
-PATCH_SITE_SUBDIR= X11R${PORTVERSION}/patches
+MASTER_SITES= # none
+DISTFILES= # none
+EXTRACT_ONLY= # none
MAINTAINER= x11@FreeBSD.org
-COMMENT= X11 libraries and headers from X.Org
-
-LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm \
- freetype.9:${PORTSDIR}/print/freetype2 \
- fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
-
-CONFLICTS= Mesa-* XFree86-libraries-* \
- libX11-* libGL-* libGLU-* libICE-* libSM-* libXau-* libXaw-* \
- libXcursor-* libXdmcp-* libXext-* libXfont-* libXi-* \
- libXinerama-* libXmu-* libXp-* libXpm-* libXrandr-* \
- libXrender-* libXres-* libXt-* libXv-* libXxf86-* libxkbfile-* \
- panoramixext-* printext-* randrext-* renderext-* resourceext-* \
- xextensions-* xf86ext-* xlibs-* xpm-* xproto-*
-
-EXTRA_PATCHES= ${CF_PATCHES}
+COMMENT= X.org libraries meta-port
-XBUILD_DIRS= lib nls programs/Xserver/include \
- programs/Xserver/hw/xfree86/parser
-XINSTALL_DIRS= include lib nls programs/Xserver/include \
- programs/Xserver/hw/xfree86/parser
+NO_BUILD= yes
-INSTALLS_SHLIB= yes
+PREFIX?= ${X11BASE}
-post-patch:
- ${CP} ${FILESDIR}/nls-Compose-microsoft-cp1251 ${WRKSRC}/nls/Compose/microsoft-cp1251
- ${MKDIR} ${WRKSRC}/lib/XThrStub
- ${CP} ${FILESDIR}/XThrStub-Imakefile ${WRKSRC}/lib/XThrStub/Imakefile
+# Needs: libGL
-post-install:
- ${MKDIR} ${PREFIX}/libdata/pkgconfig
- ${INSTALL_DATA} ${WRKSRC}/lib/Xcursor/xcursor.pc \
- ${PREFIX}/libdata/pkgconfig
+RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
+ ${X11BASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \
+ ${X11BASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache \
+ ${X11BASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE \
+ ${X11BASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM \
+ ${X11BASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres \
+ ${X11BASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap \
+ ${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau \
+ ${X11BASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw \
+ ${X11BASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite \
+ ${X11BASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor \
+ ${X11BASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage \
+ ${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \
+ ${X11BASE}/libdata/pkgconfig/xevie.pc:${PORTSDIR}/x11/libXevie \
+ ${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \
+ ${X11BASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes \
+ ${X11BASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \
+ ${X11BASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi \
+ ${X11BASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama \
+ ${X11BASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu \
+ ${X11BASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp \
+ ${X11BASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm \
+ ${X11BASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr \
+ ${X11BASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender \
+ ${X11BASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver \
+ ${X11BASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt \
+ ${X11BASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst \
+ ${X11BASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv \
+ ${X11BASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC \
+ ${X11BASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga \
+ ${X11BASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc \
+ ${X11BASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm \
+ ${X11BASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \
+ ${X11BASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui \
+ ${X11BASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft \
+ ${X11BASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil \
+ ${X11BASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil \
+ ${X11BASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc \
+ ${X11BASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \
+ ${X11BASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans \
+ ${X11BASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS \
+ ${X11BASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.pre.mk>
-
-.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE= is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
- distribution. See The X Window System and Virtual Consoles chapter\
- of FAQ for more information
-.endif
-
-# BuildXF86DRI is false for FreeBSD < 4.1
-.if ${OSVERSION} < 410000
-PLIST_SUB+= OSMESA:="@comment "
-.else
-PLIST_SUB+= OSMESA:=""
+.if !defined(XORG_UPGRADE) && !defined(PACKAGE_BUILDING)
+pre-everything::
+ @test -L /usr/X11R6 || ( echo "Read ${PORTSDIR}/UPDATING for the procedure to upgrade to xorg 7.2." && /usr/bin/false )
.endif
-.if ${OSVERSION} >= 500043
-PLIST_SUB+= XTHRSTUB:="@comment "
-.else
-PLIST_SUB+= XTHRSTUB:=""
-.endif
+do-install:
+ ${MKDIR} ${PREFIX}/libdata/xorg
+ ${TOUCH} ${PREFIX}/libdata/xorg/libraries
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/xorg-libraries/distinfo b/x11/xorg-libraries/distinfo
deleted file mode 100644
index 432332001999..000000000000
--- a/x11/xorg-libraries/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
-MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
-SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
-SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
-MD5 (xorg/x11r6.9.0-cidfonts.diff) = 7c0c53f1c7ffd97b429eda1eefdff9cb
-SHA256 (xorg/x11r6.9.0-cidfonts.diff) = c694b6cfe3c41eb36d566765f70b244307e7aa569f84cd8979e36b7d723aa487
-SIZE (xorg/x11r6.9.0-cidfonts.diff) = 2998
diff --git a/x11/xorg-libraries/files/XThrStub-Imakefile b/x11/xorg-libraries/files/XThrStub-Imakefile
deleted file mode 100644
index 83e850325c9a..000000000000
--- a/x11/xorg-libraries/files/XThrStub-Imakefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#define DoNormalLib NormalLibXThrStub
-#define DoSharedLib SharedLibXThrStub
-#define DoExtraLib SharedLibXThrStub
-#define DoDebugLib DebugLibXThrStub
-#define DoProfileLib ProfileLibXThrStub
-#define LibName XThrStub
-#define SoRev SOXTHRSTUBREV
-#define LibHeaders NO
-
-#include <Threads.tmpl>
-
-#ifdef SharedXThrStubReqs
-REQUIREDLIBS = SharedXThrStubReqs
-#endif
-
-#if NeedUIThrStubs
-STUBSRCS = UIThrStubs.c
-STUBOBJS = UIThrStubs.o
-#endif
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
- DEFINES = $(ALLOC_DEFINES)
- INCLUDES =
- SRCS = $(STUBSRCS)
- OBJS = $(STUBOBJS)
- LINTLIBS = $(LINTXLIB)
-
-#include <Library.tmpl>
-
-DependTarget()
-
-LinkSourceFile(UIThrStubs.c,$(XTOP)/lib/X11)
diff --git a/x11/xorg-libraries/files/nls-Compose-microsoft-cp1251 b/x11/xorg-libraries/files/nls-Compose-microsoft-cp1251
deleted file mode 100644
index b7218bdbc7d9..000000000000
--- a/x11/xorg-libraries/files/nls-Compose-microsoft-cp1251
+++ /dev/null
@@ -1,15 +0,0 @@
-XCOMM
-XCOMM microsoft-cp1251 Compose Sequence
-XCOMM
-XCOMM Sequence Definition
-XCOMM
-XCOMM $XFree86$
-XCOMM
-XCOMM This file currently has no entries. It appears that a compose file (even
-XCOMM just an empty one) is required for the appropriate keysyms to work for
-XCOMM this encoding.
-XCOMM
-XCOMM <Multi_key> Means <Compose>
-XCOMM Special Character
-
-XCOMM End of Sequence Definition
diff --git a/x11/xorg-libraries/files/patch-Compose-Imakefile b/x11/xorg-libraries/files/patch-Compose-Imakefile
deleted file mode 100644
index d1b90e4a9fc0..000000000000
--- a/x11/xorg-libraries/files/patch-Compose-Imakefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- nls/Compose/Imakefile.orig Mon Jun 3 22:19:43 2002
-+++ nls/Compose/Imakefile Sat Jan 11 01:00:46 2003
-@@ -54,6 +54,7 @@
- ComposeTarget(koi8-r)
- ComposeTarget(koi8-u)
- ComposeTarget(koi8-c)
-+ComposeTarget(microsoft-cp1251)
- ComposeTarget(mulelao-1)
- ComposeTarget(vi_VN.tcvn)
- ComposeTarget(vi_VN.viscii)
diff --git a/x11/xorg-libraries/files/patch-GL-GL-Imakefile b/x11/xorg-libraries/files/patch-GL-GL-Imakefile
deleted file mode 100644
index 69f1eb2c40d7..000000000000
--- a/x11/xorg-libraries/files/patch-GL-GL-Imakefile
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: lib/GL/GL/Imakefile
-===================================================================
-RCS file: /cvs/xorg/xc/lib/GL/GL/Imakefile,v
-retrieving revision 1.5
-diff -u -r1.5 Imakefile
---- lib/GL/GL/Imakefile 23 Jul 2004 05:25:39 -0000 1.5
-+++ lib/GL/GL/Imakefile 29 Dec 2004 20:51:25 -0000
-@@ -209,8 +209,12 @@
- POBJS = $(GLXPOBJS) $(DRIPOBJS) $(DRVPOBJS) $(DRMPOBJS)
-
- #if LocalThreads
-+#if NeedUIThrStubs
-+ THREADOBJS = $(LDPRELIB) $(XTHRSTUBLIB)
-+#else
- THREADOBJS = $(THREADS_LIBS)
- #endif
-+#endif
-
- #include <Library.tmpl>
-
diff --git a/x11/xorg-libraries/files/patch-GL-Imakefile b/x11/xorg-libraries/files/patch-GL-Imakefile
deleted file mode 100644
index 7d2bb0b12e03..000000000000
--- a/x11/xorg-libraries/files/patch-GL-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/GL/Imakefile.orig Fri May 28 00:23:23 2004
-+++ lib/GL/Imakefile Fri May 28 00:23:52 2004
-@@ -110,7 +110,7 @@
- #if BuildXF86DRI && GlxUseBuiltInDRIDriver
- SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS)
- #else
--SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS)
-+SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS)
- #endif
-
- MakeSubdirs($(SUBDIRS))
diff --git a/x11/xorg-libraries/files/patch-GL-dri-drm-Imakefile b/x11/xorg-libraries/files/patch-GL-dri-drm-Imakefile
deleted file mode 100644
index 21c89aa6217c..000000000000
--- a/x11/xorg-libraries/files/patch-GL-dri-drm-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/GL/dri/drm/Imakefile.orig Sat Dec 24 01:07:33 2005
-+++ lib/GL/dri/drm/Imakefile Sat Dec 24 01:08:59 2005
-@@ -16,7 +16,7 @@
- -I$(XF86OSSRC)/$(OS_SUBDIR)/drm \
- -I$(DRMSRCDIR)/$(OS_SUBDIR)-core \
- -I$(DRMSRCDIR)/$(OS_SUBDIR2)-core \
-- -I$(XF86OSSRC) -I$(DRMSRCDIR)/shared-core
-+ -I$(XF86OSSRC) -I$(DRMSRCDIR)/shared-core -I$(LOCALBASE)/include
- SRCS = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
- OBJS = xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o
-
diff --git a/x11/xorg-libraries/files/patch-GL-glx-Imakefile b/x11/xorg-libraries/files/patch-GL-glx-Imakefile
deleted file mode 100644
index 20affa22736f..000000000000
--- a/x11/xorg-libraries/files/patch-GL-glx-Imakefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/GL/glx/Imakefile.orig Sat Dec 24 00:52:20 2005
-+++ lib/GL/glx/Imakefile Sat Dec 24 00:54:30 2005
-@@ -212,6 +212,7 @@
- -I$(MESASRCDIR)/src/mesa/drivers/x11 \
- -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
- -I$(XF86OSSRC) \
-+ -I$(LOCALBASE)/include \
- -I$(DRMSRCDIR)/shared-core \
- $(DRI_INCS)
-
diff --git a/x11/xorg-libraries/files/patch-X11-Imakefile b/x11/xorg-libraries/files/patch-X11-Imakefile
deleted file mode 100644
index f8bba66d39ed..000000000000
--- a/x11/xorg-libraries/files/patch-X11-Imakefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/X11/Imakefile.orig Wed Dec 29 13:44:54 2004
-+++ lib/X11/Imakefile Wed Dec 29 13:46:19 2004
-@@ -126,8 +126,7 @@
- K5INCL = Krb5Includes
- K5DEFS = Krb5Defines
- #endif
--#if (defined(FreeBSDArchitecture) && OSRelVersion < 500016) || \
-- defined(OpenBSDArchitecture)
-+#if (defined(OpenBSDArchitecture))
- THRSTUBSRCS = UIThrStubs.c
- THRSTUBOBJS = UIThrStubs.o
- #endif
diff --git a/x11/xorg-libraries/files/patch-Xau-Imakefile b/x11/xorg-libraries/files/patch-Xau-Imakefile
deleted file mode 100644
index 70119d9dadd9..000000000000
--- a/x11/xorg-libraries/files/patch-Xau-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xau/Imakefile.orig Wed Apr 14 19:40:56 2004
-+++ lib/Xau/Imakefile Wed Apr 14 19:42:08 2004
-@@ -11,6 +11,8 @@
- #define DoDebugLib DebugLibXau
- #define DoProfileLib ProfileLibXau
- #define LibName Xau
-+#define DoSharedLib YES
-+SOXAUTHREV = 0.0
- #define SoRev SOXAUTHREV
- #define IncSubdir X11
-
diff --git a/x11/xorg-libraries/files/patch-Xcomposite-Imakefile b/x11/xorg-libraries/files/patch-Xcomposite-Imakefile
deleted file mode 100644
index 5aab74346231..000000000000
--- a/x11/xorg-libraries/files/patch-Xcomposite-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xcomposite/Imakefile.orig Fri Oct 1 17:42:38 2004
-+++ lib/Xcomposite/Imakefile Fri Oct 1 17:43:22 2004
-@@ -61,7 +61,7 @@
- RemoveFile($@)
- sh ../Xcursor/config-subst $(SUBSTVARS) < xcomposite.pc.in > $@
-
--InstallNonExecFile(xcomposite.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xcomposite.pc,$(PROJECTROOT)/libdata/pkgconfig)
-
- clean::
- RemoveFile(xcomposite.pc)
diff --git a/x11/xorg-libraries/files/patch-Xcursor-Imakefile b/x11/xorg-libraries/files/patch-Xcursor-Imakefile
deleted file mode 100644
index 2d12831b0b09..000000000000
--- a/x11/xorg-libraries/files/patch-Xcursor-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xcursor/Imakefile.orig Fri May 28 11:20:24 2004
-+++ lib/Xcursor/Imakefile Fri May 28 11:20:43 2004
-@@ -87,7 +87,7 @@
- RemoveFile($@)
- sh config-subst $(SUBSTVARS) < xcursor.pc.in > $@
-
--InstallNonExecFile(xcursor.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xcursor.pc,$(PROJECTROOT)/libdata/pkgconfig)
-
- clean::
- RemoveFile(xcursor.pc)
diff --git a/x11/xorg-libraries/files/patch-Xdamage-Imakefile b/x11/xorg-libraries/files/patch-Xdamage-Imakefile
deleted file mode 100644
index 316b3ba332fe..000000000000
--- a/x11/xorg-libraries/files/patch-Xdamage-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xdamage/Imakefile.orig Fri Oct 1 17:42:44 2004
-+++ lib/Xdamage/Imakefile Fri Oct 1 17:44:54 2004
-@@ -61,7 +61,7 @@
- RemoveFile($@)
- sh ../Xcursor/config-subst $(SUBSTVARS) < xdamage.pc.in > $@
-
--InstallNonExecFile(xdamage.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xdamage.pc,$(PROJECTROOT)/libdata/pkgconfig)
-
- clean::
- RemoveFile(xdamage.pc)
diff --git a/x11/xorg-libraries/files/patch-Xdmcp-Imakefile b/x11/xorg-libraries/files/patch-Xdmcp-Imakefile
deleted file mode 100644
index 02d5c2928f99..000000000000
--- a/x11/xorg-libraries/files/patch-Xdmcp-Imakefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- lib/Xdmcp/Imakefile.orig Thu May 27 23:35:23 2004
-+++ lib/Xdmcp/Imakefile Thu May 27 23:36:09 2004
-@@ -6,12 +6,13 @@
- XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v 3.4 1999/04/17 09:08:12 dawes Exp $
-
- #define DoNormalLib NormalLibXdmcp
--#define DoSharedLib SharedLibXdmcp
-+#define DoSharedLib YES
- #define DoExtraLib SharedLibXdmcp
- #define DoDebugLib DebugLibXdmcp
- #define DoProfileLib ProfileLibXdmcp
- #define LibName Xdmcp
- #define SoRev SOXDMCPREV
-+SOXDMCPREV = 0.0
- #define IncSubdir X11
-
- #if HasXdmAuth
diff --git a/x11/xorg-libraries/files/patch-Xevie-Imakefile b/x11/xorg-libraries/files/patch-Xevie-Imakefile
deleted file mode 100644
index 5c5dcc066606..000000000000
--- a/x11/xorg-libraries/files/patch-Xevie-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xevie/Imakefile.orig Fri Oct 1 17:42:49 2004
-+++ lib/Xevie/Imakefile Fri Oct 1 17:44:51 2004
-@@ -66,7 +66,7 @@
- RemoveFile($@)
- sh ../Xcursor/config-subst $(SUBSTVARS) < xevie.pc.in > $@
-
--InstallNonExecFile(xevie.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xevie.pc,$(PROJECTROOT)/libdata/pkgconfig)
-
- clean::
- RemoveFile(xevie.pc)
diff --git a/x11/xorg-libraries/files/patch-Xfixes-Imakefile b/x11/xorg-libraries/files/patch-Xfixes-Imakefile
deleted file mode 100644
index eba3ba644ed9..000000000000
--- a/x11/xorg-libraries/files/patch-Xfixes-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xfixes/Imakefile.orig Fri Oct 1 17:42:54 2004
-+++ lib/Xfixes/Imakefile Fri Oct 1 17:44:58 2004
-@@ -68,7 +68,7 @@
- RemoveFile($@)
- sh ../Xcursor/config-subst $(SUBSTVARS) < xfixes.pc.in > $@
-
--InstallNonExecFile(xfixes.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xfixes.pc,$(PROJECTROOT)/libdata/pkgconfig)
-
- clean::
- RemoveFile(xfixes.pc)
diff --git a/x11/xorg-libraries/files/patch-XlcDL.c b/x11/xorg-libraries/files/patch-XlcDL.c
deleted file mode 100644
index e58113dd791d..000000000000
--- a/x11/xorg-libraries/files/patch-XlcDL.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- lib/X11/XlcDL.c.orig Mon Aug 15 21:55:16 2005
-+++ lib/X11/XlcDL.c Mon Aug 15 21:56:02 2005
-@@ -56,11 +56,13 @@
- #include "XlcPublic.h"
- #include "XlcPubI.h"
-
-+#if !defined(__FreeBSD__)
- #if defined(_LP64) && defined(__sparcv9)
- # define _MACH64_NAME "sparcv9"
- #else
- # undef _MACH64_NAME
- #endif /* defined(_LP64) && defined(__sparcv9) */
-+#endif
-
- #ifdef _MACH64_NAME
- # define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1)
diff --git a/x11/xorg-libraries/files/patch-Xrender-Imakefile b/x11/xorg-libraries/files/patch-Xrender-Imakefile
deleted file mode 100644
index 804b06c709ea..000000000000
--- a/x11/xorg-libraries/files/patch-Xrender-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xrender/Imakefile.orig Sat Oct 16 15:41:02 2004
-+++ lib/Xrender/Imakefile Sat Oct 16 15:42:35 2004
-@@ -161,7 +161,7 @@
- RemoveFile($@)
- sh ../Xcursor/config-subst $(SUBSTVARS) < xrender.pc.in > $@
-
--InstallNonExecFile(xrender.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xrender.pc,$(PROJECTROOT)/libdata/pkgconfig)
-
- clean::
- RemoveFile(xrender.pc)
diff --git a/x11/xorg-libraries/files/patch-dps-Imakefile b/x11/xorg-libraries/files/patch-dps-Imakefile
deleted file mode 100644
index f85503bf79c0..000000000000
--- a/x11/xorg-libraries/files/patch-dps-Imakefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- lib/dps/Imakefile.orig Mon May 24 12:06:58 2004
-+++ lib/dps/Imakefile Fri Sep 10 22:12:26 2004
-@@ -201,8 +201,6 @@
-
- includes:: $(DPSOPSCFILES) $(PSOPSCFILES) $(HEADERS)
-
--$(DPSOPSCFILES) $(PSOPSCFILES): HostProgramTargetName($(PSWRAP))
--
- SRCS = \
- ${COMMONSOURCEFILES} \
- ${XSOURCEFILES} \
-@@ -224,16 +222,11 @@
-
- .SUFFIXES: .psw .h
-
--.psw.c : HostProgramTargetName($(PSWRAP))
-+.psw.c :
- RunProgram(PSWRAP,-a -o $*.c -h $*.h $<)
-
--.psw.h : HostProgramTargetName($(PSWRAP))
-+.psw.h :
- RunProgram(PSWRAP,-a -h $*.h $< > /dev/null)
--
--HostProgramTargetName($(PSWRAP)):
-- @echo "checking $@ over in $(PSWRAPSRC) first..."; \
-- test -d $(PSWRAPSRC) && cd $(PSWRAPSRC) && $(MAKE) pswraponly; \
-- echo "okay, continuing in $(CURRENT_DIR)"
-
- includes :: $(HEADERS)
- depend :: $(DPSOPSCFILES) $(PSOPSCFILES)
diff --git a/x11/xorg-libraries/files/patch-lib-Imakefile b/x11/xorg-libraries/files/patch-lib-Imakefile
deleted file mode 100644
index 9db3ac355f73..000000000000
--- a/x11/xorg-libraries/files/patch-lib-Imakefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/Imakefile.orig Wed Sep 1 18:10:28 2004
-+++ lib/Imakefile Wed Dec 29 13:43:31 2004
-@@ -36,6 +36,10 @@
- XKBUILIBDIR = xkbui
- #endif
-
-+#if BuildThreadStubLibrary && BuildLibraries
-+THRSTUBLIBDIR = XThrStub
-+#endif
-+
- #if BuildXInputLib
- XINPUTLIBDIR = Xi
- #endif
-@@ -223,7 +227,7 @@
- #endif
-
-
--LINTSUBDIRS = $(XAULIBDIR) $(XDMCPLIBDIR) $(X11LIBDIR) \
-+LINTSUBDIRS = $(XAULIBDIR) $(XDMCPLIBDIR) $(THRSTUBLIBDIR) $(X11LIBDIR) \
- $(OLDXLIBDIR) $(ICELIBDIR) $(SMLIBDIR) $(XEXTLIBDIR) $(XTLIBDIR) \
- $(SSLIBDIR) $(XF86MISCLIBDIR) $(XF86VMLIBDIR) $(XF86DGALIBDIR) \
- $(XF86RUSHLIBDIR) $(XMULIBDIR) $(XMUULIBDIR) $(XPMLIBDIR) \
diff --git a/x11/xorg-libraries/pkg-plist b/x11/xorg-libraries/pkg-plist
index 367766260eff..80a1d8f053b2 100644
--- a/x11/xorg-libraries/pkg-plist
+++ b/x11/xorg-libraries/pkg-plist
@@ -1,783 +1,2 @@
-bin/xcursor-config
-include/DPS/ColorSB.h
-include/DPS/ColorSBP.h
-include/DPS/DPSScrollW.h
-include/DPS/DPSScrollWP.h
-include/DPS/FontCreatP.h
-include/DPS/FontCreato.h
-include/DPS/FontSB.h
-include/DPS/FontSBP.h
-include/DPS/FontSamplP.h
-include/DPS/FontSample.h
-include/DPS/PSres.h
-include/DPS/XDPS.h
-include/DPS/XDPSlib.h
-include/DPS/XDPSproto.h
-include/DPS/dpsNXargs.h
-include/DPS/dpsXclient.h
-include/DPS/dpsXcommon.h
-include/DPS/dpsXpreview.h
-include/DPS/dpsXshare.h
-include/DPS/dpsXuserpath.h
-include/DPS/dpsclient.h
-include/DPS/dpsconfig.h
-include/DPS/dpsexcept.h
-include/DPS/dpsfriends.h
-include/DPS/dpsops.h
-include/DPS/psops.h
-include/GL/GLwDrawA.h
-include/GL/GLwDrawAP.h
-include/GL/GLwMDrawA.h
-include/GL/GLwMDrawAP.h
-include/GL/gl.h
-include/GL/glext.h
-include/GL/glu.h
-include/GL/glx.h
-include/GL/glxext.h
-include/GL/glxint.h
-include/GL/glxmd.h
-include/GL/glxproto.h
-include/GL/glxtokens.h
-include/GL/osmesa.h
-include/X11/CallbackI.h
-include/X11/Composite.h
-include/X11/CompositeP.h
-include/X11/ConstrainP.h
-include/X11/Constraint.h
-include/X11/ConvertI.h
-include/X11/Core.h
-include/X11/CoreP.h
-include/X11/CreateI.h
-include/X11/DECkeysym.h
-include/X11/EventI.h
-include/X11/HPkeysym.h
-include/X11/HookObjI.h
-include/X11/ICE/ICE.h
-include/X11/ICE/ICEconn.h
-include/X11/ICE/ICElib.h
-include/X11/ICE/ICEmsg.h
-include/X11/ICE/ICEproto.h
-include/X11/ICE/ICEutil.h
-include/X11/ImUtil.h
-include/X11/InitialI.h
-include/X11/IntrinsicI.h
-include/X11/Intrinsic.h
-include/X11/IntrinsicP.h
-include/X11/Object.h
-include/X11/ObjectP.h
-include/X11/PassivGraI.h
-include/X11/RectObj.h
-include/X11/RectObjP.h
-include/X11/ResourceI.h
-include/X11/SM/SM.h
-include/X11/SM/SMlib.h
-include/X11/SM/SMproto.h
-include/X11/SelectionI.h
-include/X11/Shell.h
-include/X11/ShellI.h
-include/X11/ShellP.h
-include/X11/StringDefs.h
-include/X11/Sunkeysym.h
-include/X11/ThreadsI.h
-include/X11/TranslateI.h
-include/X11/VarargsI.h
-include/X11/Vendor.h
-include/X11/VendorP.h
-include/X11/X.h
-include/X11/X10.h
-include/X11/XF86keysym.h
-include/X11/XKBlib.h
-include/X11/XWDFile.h
-include/X11/Xalloca.h
-include/X11/Xarch.h
-include/X11/Xatom.h
-include/X11/Xauth.h
-include/X11/Xaw/AllWidgets.h
-include/X11/Xaw/AsciiSink.h
-include/X11/Xaw/AsciiSinkP.h
-include/X11/Xaw/AsciiSrc.h
-include/X11/Xaw/AsciiSrcP.h
-include/X11/Xaw/AsciiText.h
-include/X11/Xaw/AsciiTextP.h
-include/X11/Xaw/Box.h
-include/X11/Xaw/BoxP.h
-include/X11/Xaw/Cardinals.h
-include/X11/Xaw/Command.h
-include/X11/Xaw/CommandP.h
-include/X11/Xaw/Dialog.h
-include/X11/Xaw/DialogP.h
-include/X11/Xaw/Form.h
-include/X11/Xaw/FormP.h
-include/X11/Xaw/Grip.h
-include/X11/Xaw/GripP.h
-include/X11/Xaw/Label.h
-include/X11/Xaw/LabelP.h
-include/X11/Xaw/List.h
-include/X11/Xaw/ListP.h
-include/X11/Xaw/MenuButtoP.h
-include/X11/Xaw/MenuButton.h
-include/X11/Xaw/MultiSink.h
-include/X11/Xaw/MultiSinkP.h
-include/X11/Xaw/MultiSrc.h
-include/X11/Xaw/MultiSrcP.h
-include/X11/Xaw/Paned.h
-include/X11/Xaw/PanedP.h
-include/X11/Xaw/Panner.h
-include/X11/Xaw/PannerP.h
-include/X11/Xaw/Porthole.h
-include/X11/Xaw/PortholeP.h
-include/X11/Xaw/Print.h
-include/X11/Xaw/PrintSP.h
-include/X11/Xaw/Repeater.h
-include/X11/Xaw/RepeaterP.h
-include/X11/Xaw/Reports.h
-include/X11/Xaw/Scrollbar.h
-include/X11/Xaw/ScrollbarP.h
-include/X11/Xaw/Simple.h
-include/X11/Xaw/SimpleMenP.h
-include/X11/Xaw/SimpleMenu.h
-include/X11/Xaw/SimpleP.h
-include/X11/Xaw/Sme.h
-include/X11/Xaw/SmeBSB.h
-include/X11/Xaw/SmeBSBP.h
-include/X11/Xaw/SmeLine.h
-include/X11/Xaw/SmeLineP.h
-include/X11/Xaw/SmeP.h
-include/X11/Xaw/StripCharP.h
-include/X11/Xaw/StripChart.h
-include/X11/Xaw/Template.c
-include/X11/Xaw/Template.h
-include/X11/Xaw/TemplateP.h
-include/X11/Xaw/Text.h
-include/X11/Xaw/TextP.h
-include/X11/Xaw/TextSink.h
-include/X11/Xaw/TextSinkP.h
-include/X11/Xaw/TextSrc.h
-include/X11/Xaw/TextSrcP.h
-include/X11/Xaw/Tip.h
-include/X11/Xaw/TipP.h
-include/X11/Xaw/Toggle.h
-include/X11/Xaw/ToggleP.h
-include/X11/Xaw/Tree.h
-include/X11/Xaw/TreeP.h
-include/X11/Xaw/VendorEP.h
-include/X11/Xaw/Viewport.h
-include/X11/Xaw/ViewportP.h
-include/X11/Xaw/XawImP.h
-include/X11/Xaw/XawInit.h
-include/X11/Xcms.h
-include/X11/Xcursor/Xcursor.h
-include/X11/Xdefs.h
-include/X11/Xdmcp.h
-include/X11/Xfuncproto.h
-include/X11/Xfuncs.h
-include/X11/Xlib.h
-include/X11/XlibConf.h
-include/X11/Xlibint.h
-include/X11/Xlocale.h
-include/X11/Xmd.h
-include/X11/Xmu/Atoms.h
-include/X11/Xmu/CharSet.h
-include/X11/Xmu/CloseHook.h
-include/X11/Xmu/Converters.h
-include/X11/Xmu/CurUtil.h
-include/X11/Xmu/CvtCache.h
-include/X11/Xmu/DisplayQue.h
-include/X11/Xmu/Drawing.h
-include/X11/Xmu/Editres.h
-include/X11/Xmu/EditresP.h
-include/X11/Xmu/Error.h
-include/X11/Xmu/ExtAgent.h
-include/X11/Xmu/Initer.h
-include/X11/Xmu/Lookup.h
-include/X11/Xmu/Misc.h
-include/X11/Xmu/StdCmap.h
-include/X11/Xmu/StdSel.h
-include/X11/Xmu/SysUtil.h
-include/X11/Xmu/WidgetNode.h
-include/X11/Xmu/WinUtil.h
-include/X11/Xmu/Xct.h
-include/X11/Xmu/Xmu.h
-include/X11/Xos.h
-include/X11/Xos_r.h
-include/X11/Xosdefs.h
-include/X11/Xpoll.h
-include/X11/XprintAppUtil/xpapputil.h
-include/X11/XprintUtil/xprintutil.h
-include/X11/Xproto.h
-include/X11/Xprotostr.h
-include/X11/Xregion.h
-include/X11/Xresource.h
-include/X11/Xthreads.h
-include/X11/Xutil.h
-include/X11/ap_keysym.h
-include/X11/bitmaps/1x1
-include/X11/bitmaps/2x2
-include/X11/bitmaps/black
-include/X11/bitmaps/boxes
-include/X11/bitmaps/calculator
-include/X11/bitmaps/cntr_ptr
-include/X11/bitmaps/cntr_ptrmsk
-include/X11/bitmaps/cross_weave
-include/X11/bitmaps/dimple1
-include/X11/bitmaps/dimple3
-include/X11/bitmaps/dot
-include/X11/bitmaps/dropbar7
-include/X11/bitmaps/dropbar8
-include/X11/bitmaps/escherknot
-include/X11/bitmaps/flagdown
-include/X11/bitmaps/flagup
-include/X11/bitmaps/flipped_gray
-include/X11/bitmaps/gray
-include/X11/bitmaps/gray1
-include/X11/bitmaps/gray3
-include/X11/bitmaps/grid16
-include/X11/bitmaps/grid2
-include/X11/bitmaps/grid4
-include/X11/bitmaps/grid8
-include/X11/bitmaps/hlines2
-include/X11/bitmaps/hlines3
-include/X11/bitmaps/icon
-include/X11/bitmaps/keyboard16
-include/X11/bitmaps/left_ptr
-include/X11/bitmaps/left_ptrmsk
-include/X11/bitmaps/letters
-include/X11/bitmaps/light_gray
-include/X11/bitmaps/mailempty
-include/X11/bitmaps/mailemptymsk
-include/X11/bitmaps/mailfull
-include/X11/bitmaps/mailfullmsk
-include/X11/bitmaps/mensetmanus
-include/X11/bitmaps/menu10
-include/X11/bitmaps/menu12
-include/X11/bitmaps/menu16
-include/X11/bitmaps/menu6
-include/X11/bitmaps/menu8
-include/X11/bitmaps/noletters
-include/X11/bitmaps/opendot
-include/X11/bitmaps/opendotMask
-include/X11/bitmaps/plaid
-include/X11/bitmaps/right_ptr
-include/X11/bitmaps/right_ptrmsk
-include/X11/bitmaps/root_weave
-include/X11/bitmaps/scales
-include/X11/bitmaps/sipb
-include/X11/bitmaps/star
-include/X11/bitmaps/starMask
-include/X11/bitmaps/stipple
-include/X11/bitmaps/target
-include/X11/bitmaps/terminal
-include/X11/bitmaps/tie_fighter
-include/X11/bitmaps/vlines2
-include/X11/bitmaps/vlines3
-include/X11/bitmaps/weird_size
-include/X11/bitmaps/wide_weave
-include/X11/bitmaps/wingdogs
-include/X11/bitmaps/woman
-include/X11/bitmaps/xfd_icon
-include/X11/bitmaps/xlogo11
-include/X11/bitmaps/xlogo16
-include/X11/bitmaps/xlogo32
-include/X11/bitmaps/xlogo64
-include/X11/bitmaps/xsnow
-include/X11/cursorfont.h
-include/X11/extensions/MITMisc.h
-include/X11/extensions/Print.h
-include/X11/extensions/Printstr.h
-include/X11/extensions/XEVI.h
-include/X11/extensions/XEVIstr.h
-include/X11/extensions/XI.h
-include/X11/extensions/XInput.h
-include/X11/extensions/XIproto.h
-include/X11/extensions/XKB.h
-include/X11/extensions/XKBbells.h
-include/X11/extensions/XKBconfig.h
-include/X11/extensions/XKBfile.h
-include/X11/extensions/XKBgeom.h
-include/X11/extensions/XKBproto.h
-include/X11/extensions/XKBrules.h
-include/X11/extensions/XKBsrv.h
-include/X11/extensions/XKBstr.h
-include/X11/extensions/XKBui.h
-include/X11/extensions/XKM.h
-include/X11/extensions/XKMformat.h
-include/X11/extensions/XLbx.h
-include/X11/extensions/XRes.h
-include/X11/extensions/XResproto.h
-include/X11/extensions/XShm.h
-include/X11/extensions/XTest.h
-include/X11/extensions/Xag.h
-include/X11/extensions/Xagsrv.h
-include/X11/extensions/Xagstr.h
-include/X11/extensions/Xcomposite.h
-include/X11/extensions/Xcup.h
-include/X11/extensions/Xcupstr.h
-include/X11/extensions/Xdamage.h
-include/X11/extensions/Xdbe.h
-include/X11/extensions/Xdbeproto.h
-include/X11/extensions/Xevie.h
-include/X11/extensions/Xeviestr.h
-include/X11/extensions/Xext.h
-include/X11/extensions/Xfixes.h
-include/X11/extensions/Xinerama.h
-include/X11/extensions/Xrandr.h
-include/X11/extensions/Xrender.h
-include/X11/extensions/Xv.h
-include/X11/extensions/XvMC.h
-include/X11/extensions/XvMClib.h
-include/X11/extensions/XvMCproto.h
-include/X11/extensions/Xvlib.h
-include/X11/extensions/Xvproto.h
-include/X11/extensions/bigreqstr.h
-include/X11/extensions/composite.h
-include/X11/extensions/compositeproto.h
-include/X11/extensions/damageproto.h
-include/X11/extensions/damagewire.h
-include/X11/extensions/dpms.h
-include/X11/extensions/dpmsstr.h
-include/X11/extensions/extutil.h
-include/X11/extensions/lbxbuf.h
-include/X11/extensions/lbxbufstr.h
-include/X11/extensions/lbxdeltastr.h
-include/X11/extensions/lbximage.h
-include/X11/extensions/lbxopts.h
-include/X11/extensions/lbxstr.h
-include/X11/extensions/lbxzlib.h
-include/X11/extensions/mitmiscstr.h
-include/X11/extensions/multibuf.h
-include/X11/extensions/multibufst.h
-include/X11/extensions/panoramiXext.h
-include/X11/extensions/panoramiXproto.h
-include/X11/extensions/randr.h
-include/X11/extensions/randrproto.h
-include/X11/extensions/record.h
-include/X11/extensions/recordstr.h
-include/X11/extensions/render.h
-include/X11/extensions/renderproto.h
-include/X11/extensions/saver.h
-include/X11/extensions/saverproto.h
-include/X11/extensions/scrnsaver.h
-include/X11/extensions/security.h
-include/X11/extensions/securstr.h
-include/X11/extensions/shape.h
-include/X11/extensions/shapestr.h
-include/X11/extensions/shmstr.h
-include/X11/extensions/sync.h
-include/X11/extensions/syncstr.h
-include/X11/extensions/xcmiscstr.h
-include/X11/extensions/xevieplaceholder.h
-include/X11/extensions/xf86bigfont.h
-include/X11/extensions/xf86bigfstr.h
-include/X11/extensions/xf86dga.h
-include/X11/extensions/xf86dga1.h
-include/X11/extensions/xf86dga1str.h
-include/X11/extensions/xf86dgastr.h
-include/X11/extensions/xf86misc.h
-include/X11/extensions/xf86mscstr.h
-include/X11/extensions/xf86vmode.h
-include/X11/extensions/xf86vmstr.h
-include/X11/extensions/xfixesproto.h
-include/X11/extensions/xfixeswire.h
-include/X11/extensions/xtestext1.h
-include/X11/extensions/xteststr.h
-include/X11/extensions/xtrapbits.h
-include/X11/extensions/xtrapddmi.h
-include/X11/extensions/xtrapdi.h
-include/X11/extensions/xtrapemacros.h
-include/X11/extensions/xtraplib.h
-include/X11/extensions/xtraplibp.h
-include/X11/extensions/xtrapproto.h
-include/X11/extensions/vldXvMC.h
-include/X11/fonts/FS.h
-include/X11/fonts/FSlib.h
-include/X11/fonts/FSproto.h
-include/X11/fonts/bdfint.h
-include/X11/fonts/bitmap.h
-include/X11/fonts/bufio.h
-include/X11/fonts/fntfil.h
-include/X11/fonts/fntfilio.h
-include/X11/fonts/fntfilst.h
-include/X11/fonts/font.h
-include/X11/fonts/fontenc.h
-include/X11/fonts/fontencc.h
-include/X11/fonts/fontmisc.h
-include/X11/fonts/fontmod.h
-include/X11/fonts/fontshow.h
-include/X11/fonts/fontstruct.h
-include/X11/fonts/fontutil.h
-include/X11/fonts/fontxlfd.h
-include/X11/fonts/fsmasks.h
-include/X11/fonts/pcf.h
-include/X11/keysym.h
-include/X11/keysymdef.h
-include/X11/misc.h
-include/X11/os.h
-include/X11/xpm.h
-include/xf86Optrec.h
-include/xf86Parser.h
-lib/X11/XErrorDB
-lib/X11/XKeysymDB
-lib/X11/Xcms.txt
-lib/X11/locale/C/XI18N_OBJS
-lib/X11/locale/C/XLC_LOCALE
-lib/X11/locale/armscii-8/Compose
-lib/X11/locale/armscii-8/XI18N_OBJS
-lib/X11/locale/armscii-8/XLC_LOCALE
-lib/X11/locale/compose.dir
-lib/X11/locale/el_GR.UTF-8/Compose
-lib/X11/locale/en_US.UTF-8/Compose
-lib/X11/locale/en_US.UTF-8/XI18N_OBJS
-lib/X11/locale/en_US.UTF-8/XLC_LOCALE
-lib/X11/locale/georgian-academy/Compose
-lib/X11/locale/georgian-academy/XI18N_OBJS
-lib/X11/locale/georgian-academy/XLC_LOCALE
-lib/X11/locale/georgian-ps/Compose
-lib/X11/locale/georgian-ps/XI18N_OBJS
-lib/X11/locale/georgian-ps/XLC_LOCALE
-lib/X11/locale/ibm-cp1133/Compose
-lib/X11/locale/ibm-cp1133/XI18N_OBJS
-lib/X11/locale/ibm-cp1133/XLC_LOCALE
-lib/X11/locale/iscii-dev/XI18N_OBJS
-lib/X11/locale/iscii-dev/XLC_LOCALE
-lib/X11/locale/isiri-3342/XI18N_OBJS
-lib/X11/locale/isiri-3342/XLC_LOCALE
-lib/X11/locale/iso8859-1/Compose
-lib/X11/locale/iso8859-1/XI18N_OBJS
-lib/X11/locale/iso8859-1/XLC_LOCALE
-lib/X11/locale/iso8859-10/Compose
-lib/X11/locale/iso8859-10/XI18N_OBJS
-lib/X11/locale/iso8859-10/XLC_LOCALE
-lib/X11/locale/iso8859-11/XI18N_OBJS
-lib/X11/locale/iso8859-11/XLC_LOCALE
-lib/X11/locale/iso8859-13/Compose
-lib/X11/locale/iso8859-13/XI18N_OBJS
-lib/X11/locale/iso8859-13/XLC_LOCALE
-lib/X11/locale/iso8859-14/Compose
-lib/X11/locale/iso8859-14/XI18N_OBJS
-lib/X11/locale/iso8859-14/XLC_LOCALE
-lib/X11/locale/iso8859-15/Compose
-lib/X11/locale/iso8859-15/XI18N_OBJS
-lib/X11/locale/iso8859-15/XLC_LOCALE
-lib/X11/locale/iso8859-2/Compose
-lib/X11/locale/iso8859-2/XI18N_OBJS
-lib/X11/locale/iso8859-2/XLC_LOCALE
-lib/X11/locale/iso8859-3/Compose
-lib/X11/locale/iso8859-3/XI18N_OBJS
-lib/X11/locale/iso8859-3/XLC_LOCALE
-lib/X11/locale/iso8859-4/Compose
-lib/X11/locale/iso8859-4/XI18N_OBJS
-lib/X11/locale/iso8859-4/XLC_LOCALE
-lib/X11/locale/iso8859-5/Compose
-lib/X11/locale/iso8859-5/XI18N_OBJS
-lib/X11/locale/iso8859-5/XLC_LOCALE
-lib/X11/locale/iso8859-6/Compose
-lib/X11/locale/iso8859-6/XI18N_OBJS
-lib/X11/locale/iso8859-6/XLC_LOCALE
-lib/X11/locale/iso8859-7/Compose
-lib/X11/locale/iso8859-7/XI18N_OBJS
-lib/X11/locale/iso8859-7/XLC_LOCALE
-lib/X11/locale/iso8859-8/Compose
-lib/X11/locale/iso8859-8/XI18N_OBJS
-lib/X11/locale/iso8859-8/XLC_LOCALE
-lib/X11/locale/iso8859-9/Compose
-lib/X11/locale/iso8859-9/XI18N_OBJS
-lib/X11/locale/iso8859-9/XLC_LOCALE
-lib/X11/locale/iso8859-9e/Compose
-lib/X11/locale/iso8859-9e/XI18N_OBJS
-lib/X11/locale/iso8859-9e/XLC_LOCALE
-lib/X11/locale/ja.JIS/Compose
-lib/X11/locale/ja.JIS/XI18N_OBJS
-lib/X11/locale/ja.JIS/XLC_LOCALE
-lib/X11/locale/ja.SJIS/Compose
-lib/X11/locale/ja.SJIS/XI18N_OBJS
-lib/X11/locale/ja.SJIS/XLC_LOCALE
-lib/X11/locale/ja/Compose
-lib/X11/locale/ja/XI18N_OBJS
-lib/X11/locale/ja/XLC_LOCALE
-lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS
-lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE
-lib/X11/locale/ko/Compose
-lib/X11/locale/ko/XI18N_OBJS
-lib/X11/locale/ko/XLC_LOCALE
-lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS
-lib/X11/locale/ko_KR.UTF-8/XLC_LOCALE
-lib/X11/locale/koi8-c/Compose
-lib/X11/locale/koi8-c/XI18N_OBJS
-lib/X11/locale/koi8-c/XLC_LOCALE
-lib/X11/locale/koi8-r/Compose
-lib/X11/locale/koi8-r/XI18N_OBJS
-lib/X11/locale/koi8-r/XLC_LOCALE
-lib/X11/locale/koi8-u/Compose
-lib/X11/locale/koi8-u/XI18N_OBJS
-lib/X11/locale/koi8-u/XLC_LOCALE
-lib/X11/locale/lib/common/ximcp.so.2
-lib/X11/locale/lib/common/xlcDef.so.2
-lib/X11/locale/lib/common/xlcUTF8Load.so.2
-lib/X11/locale/lib/common/xlibi18n.so.2
-lib/X11/locale/lib/common/xlocale.so.2
-lib/X11/locale/lib/common/xomGeneric.so.2
-lib/X11/locale/locale.alias
-lib/X11/locale/locale.dir
-lib/X11/locale/microsoft-cp1251/Compose
-lib/X11/locale/microsoft-cp1251/XI18N_OBJS
-lib/X11/locale/microsoft-cp1251/XLC_LOCALE
-lib/X11/locale/microsoft-cp1255/XI18N_OBJS
-lib/X11/locale/microsoft-cp1255/XLC_LOCALE
-lib/X11/locale/microsoft-cp1256/XI18N_OBJS
-lib/X11/locale/microsoft-cp1256/XLC_LOCALE
-lib/X11/locale/mulelao-1/Compose
-lib/X11/locale/mulelao-1/XI18N_OBJS
-lib/X11/locale/mulelao-1/XLC_LOCALE
-lib/X11/locale/nokhchi-1/XI18N_OBJS
-lib/X11/locale/nokhchi-1/XLC_LOCALE
-lib/X11/locale/pt_BR.UTF-8/Compose
-lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
-lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
-lib/X11/locale/tatar-cyr/XI18N_OBJS
-lib/X11/locale/tatar-cyr/XLC_LOCALE
-lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
-lib/X11/locale/th_TH.UTF-8/XLC_LOCALE
-lib/X11/locale/th_TH/XI18N_OBJS
-lib/X11/locale/th_TH/XLC_LOCALE
-lib/X11/locale/tscii-0/XI18N_OBJS
-lib/X11/locale/tscii-0/XLC_LOCALE
-lib/X11/locale/vi_VN.tcvn/Compose
-lib/X11/locale/vi_VN.tcvn/XI18N_OBJS
-lib/X11/locale/vi_VN.tcvn/XLC_LOCALE
-lib/X11/locale/vi_VN.viscii/Compose
-lib/X11/locale/vi_VN.viscii/XI18N_OBJS
-lib/X11/locale/vi_VN.viscii/XLC_LOCALE
-lib/X11/locale/zh_CN.UTF-8/XI18N_OBJS
-lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
-lib/X11/locale/zh_CN.gb18030/Compose
-lib/X11/locale/zh_CN.gb18030/XI18N_OBJS
-lib/X11/locale/zh_CN.gb18030/XLC_LOCALE
-lib/X11/locale/zh_CN.gbk/Compose
-lib/X11/locale/zh_CN.gbk/XI18N_OBJS
-lib/X11/locale/zh_CN.gbk/XLC_LOCALE
-lib/X11/locale/zh_CN/Compose
-lib/X11/locale/zh_CN/XI18N_OBJS
-lib/X11/locale/zh_CN/XLC_LOCALE
-lib/X11/locale/zh_HK.big5/Compose
-lib/X11/locale/zh_HK.big5/XI18N_OBJS
-lib/X11/locale/zh_HK.big5/XLC_LOCALE
-lib/X11/locale/zh_HK.big5hkscs/Compose
-lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
-lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
-lib/X11/locale/zh_HK.UTF-8/XI18N_OBJS
-lib/X11/locale/zh_HK.UTF-8/XLC_LOCALE
-lib/X11/locale/zh_TW.UTF-8/XI18N_OBJS
-lib/X11/locale/zh_TW.UTF-8/XLC_LOCALE
-lib/X11/locale/zh_TW.big5/Compose
-lib/X11/locale/zh_TW.big5/XI18N_OBJS
-lib/X11/locale/zh_TW.big5/XLC_LOCALE
-lib/X11/locale/zh_TW/Compose
-lib/X11/locale/zh_TW/XI18N_OBJS
-lib/X11/locale/zh_TW/XLC_LOCALE
-lib/libFS.a
-lib/libFS.so
-lib/libFS.so.6
-lib/libGL.a
-lib/libGL.so
-lib/libGL.so.1
-lib/libGLU.a
-lib/libGLU.so
-lib/libGLU.so.1
-lib/libGLw.a
-lib/libGLw.so
-lib/libGLw.so.1
-lib/libICE.a
-lib/libICE.so
-lib/libICE.so.6
-%%OSMESA:%%lib/libOSMesa.a
-%%OSMESA:%%lib/libOSMesa.so
-%%OSMESA:%%lib/libOSMesa.so.4
-lib/libSM.a
-lib/libSM.so
-lib/libSM.so.6
-lib/libX11.a
-lib/libX11.so
-lib/libX11.so.6
-lib/libXRes.a
-lib/libXRes.so
-lib/libXRes.so.1
-lib/libXTrap.a
-lib/libXTrap.so
-lib/libXTrap.so.6
-%%XTHRSTUB:%%lib/libXThrStub.so
-%%XTHRSTUB:%%lib/libXThrStub.so.6
-lib/libXau.a
-lib/libXau.so
-lib/libXau.so.0
-lib/libXaw.a
-lib/libXaw.so
-lib/libXaw.so.6
-lib/libXaw.so.7
-lib/libXaw.so.8
-lib/libXcomposite.a
-lib/libXcomposite.so
-lib/libXcomposite.so.1
-lib/libXcursor.a
-lib/libXcursor.so
-lib/libXcursor.so.1
-lib/libXdamage.a
-lib/libXdamage.so
-lib/libXdamage.so.1
-lib/libXdmcp.a
-lib/libXdmcp.so
-lib/libXdmcp.so.0
-lib/libXevie.a
-lib/libXevie.so
-lib/libXevie.so.1
-lib/libXext.a
-lib/libXext.so
-lib/libXext.so.6
-lib/libXfixes.a
-lib/libXfixes.so
-lib/libXfixes.so.3
-lib/libXfont.a
-lib/libXfont.so
-lib/libXfont.so.1
-lib/libXi.a
-lib/libXi.so
-lib/libXi.so.6
-lib/libXinerama.a
-lib/libXinerama.so
-lib/libXinerama.so.1
-lib/libXmu.a
-lib/libXmu.so
-lib/libXmu.so.6
-lib/libXmuu.a
-lib/libXmuu.so
-lib/libXmuu.so.1
-lib/libXp.a
-lib/libXp.so
-lib/libXp.so.6
-lib/libXpm.a
-lib/libXpm.so
-lib/libXpm.so.4
-lib/libXprintAppUtil.a
-lib/libXprintUtil.a
-lib/libXrandr.a
-lib/libXrandr.so
-lib/libXrandr.so.2
-lib/libXrender.a
-lib/libXrender.so
-lib/libXrender.so.1
-lib/libXss.a
-lib/libXss.so
-lib/libXss.so.1
-lib/libXt.a
-lib/libXt.so
-lib/libXt.so.6
-lib/libXtst.a
-lib/libXtst.so
-lib/libXtst.so.6
-lib/libXv.a
-lib/libXv.so
-lib/libXv.so.1
-lib/libXvMC.a
-lib/libXvMC.so
-lib/libXvMC.so.1
-lib/libXxf86dga.a
-lib/libXxf86dga.so
-lib/libXxf86dga.so.1
-lib/libXxf86misc.a
-lib/libXxf86misc.so
-lib/libXxf86misc.so.1
-lib/libXxf86vm.a
-lib/libXxf86vm.so
-lib/libXxf86vm.so.1
-lib/libdps.a
-lib/libdps.so
-lib/libdps.so.1
-lib/libfntstubs.a
-lib/libfontenc.a
-lib/libfontenc.so
-lib/libfontenc.so.1
-lib/liboldX.a
-lib/liboldX.so
-lib/liboldX.so.6
-lib/libxf86config.a
-lib/libxkbfile.a
-lib/libxkbfile.so
-lib/libxkbfile.so.1
-lib/libxkbui.a
-lib/libxkbui.so
-lib/libxkbui.so.1
-libdata/pkgconfig/xcomposite.pc
-libdata/pkgconfig/xcursor.pc
-libdata/pkgconfig/xdamage.pc
-libdata/pkgconfig/xevie.pc
-libdata/pkgconfig/xfixes.pc
-libdata/pkgconfig/xrender.pc
-@dirrm include/X11/extensions
-@dirrm include/X11/ICE
-@dirrm include/X11/SM
-@dirrm include/X11/Xmu
-@dirrm include/X11/XprintUtil
-@dirrm include/X11/XprintAppUtil
-@dirrm include/X11/Xaw
-@dirrm include/X11/Xcursor
-@dirrm include/GL
-@dirrm include/DPS
-@dirrm lib/X11/locale/lib/common
-@dirrm lib/X11/locale/lib
-@dirrm lib/X11/locale/C
-@dirrm lib/X11/locale/armscii-8
-@dirrm lib/X11/locale/en_US.UTF-8
-@dirrm lib/X11/locale/georgian-academy
-@dirrm lib/X11/locale/georgian-ps
-@dirrm lib/X11/locale/ibm-cp1133
-@dirrm lib/X11/locale/iscii-dev
-@dirrm lib/X11/locale/isiri-3342
-@dirrm lib/X11/locale/iso8859-1
-@dirrm lib/X11/locale/iso8859-2
-@dirrm lib/X11/locale/iso8859-3
-@dirrm lib/X11/locale/iso8859-4
-@dirrm lib/X11/locale/iso8859-5
-@dirrm lib/X11/locale/iso8859-6
-@dirrm lib/X11/locale/iso8859-7
-@dirrm lib/X11/locale/iso8859-8
-@dirrm lib/X11/locale/iso8859-9
-@dirrm lib/X11/locale/iso8859-10
-@dirrm lib/X11/locale/iso8859-11
-@dirrm lib/X11/locale/iso8859-13
-@dirrm lib/X11/locale/ja
-@dirrm lib/X11/locale/iso8859-14
-@dirrm lib/X11/locale/iso8859-15
-@dirrm lib/X11/locale/iso8859-9e
-@dirrm lib/X11/locale/ja.JIS
-@dirrm lib/X11/locale/ja.SJIS
-@dirrm lib/X11/locale/ja_JP.UTF-8
-@dirrm lib/X11/locale/ko
-@dirrm lib/X11/locale/ko_KR.UTF-8
-@dirrm lib/X11/locale/koi8-r
-@dirrm lib/X11/locale/koi8-u
-@dirrm lib/X11/locale/koi8-c
-@dirrm lib/X11/locale/microsoft-cp1251
-@dirrm lib/X11/locale/microsoft-cp1255
-@dirrm lib/X11/locale/microsoft-cp1256
-@dirrm lib/X11/locale/mulelao-1
-@dirrm lib/X11/locale/nokhchi-1
-@dirrm lib/X11/locale/pt_BR.UTF-8
-@dirrm lib/X11/locale/tatar-cyr
-@dirrm lib/X11/locale/th_TH
-@dirrm lib/X11/locale/th_TH.UTF-8
-@dirrm lib/X11/locale/tscii-0
-@dirrm lib/X11/locale/vi_VN.tcvn
-@dirrm lib/X11/locale/vi_VN.viscii
-@dirrm lib/X11/locale/zh_CN
-@dirrm lib/X11/locale/zh_CN.gb18030
-@dirrm lib/X11/locale/zh_CN.gbk
-@dirrm lib/X11/locale/zh_CN.UTF-8
-@dirrm lib/X11/locale/zh_HK.big5
-@dirrm lib/X11/locale/zh_HK.big5hkscs
-@dirrm lib/X11/locale/zh_HK.UTF-8
-@dirrm lib/X11/locale/zh_TW
-@dirrm lib/X11/locale/zh_TW.big5
-@dirrm lib/X11/locale/zh_TW.UTF-8
-@dirrm lib/X11/locale/el_GR.UTF-8
-@dirrmtry include/X11/bitmaps
-@dirrmtry include/X11/fonts
-@dirrmtry lib/X11/locale
+libdata/xorg/libraries
+@dirrmtry libdata/xorg
diff --git a/x11/xorg-libraries/scripts/configure b/x11/xorg-libraries/scripts/configure
deleted file mode 100644
index b7f6be7fa513..000000000000
--- a/x11/xorg-libraries/scripts/configure
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define BuildServer NO" >> $LOCALDEF
-echo "#define BuildXft1Library NO" >> $LOCALDEF
-echo "#define BuildXftLibrary NO" >> $LOCALDEF
-echo "#define UseInstalledPrograms YES" >> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11/xorg-protos/Makefile b/x11/xorg-protos/Makefile
new file mode 100644
index 000000000000..2cfa35154d01
--- /dev/null
+++ b/x11/xorg-protos/Makefile
@@ -0,0 +1,56 @@
+# New ports collection makefile for: xorg-protos
+# Date created: Sep 29 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xorg-protos
+PORTVERSION= 7.2
+CATEGORIES= x11
+MASTER_SITES= # none
+DISTFILES= # none
+EXTRACT_ONLY= # none
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.org protos meta-port
+
+USE_X_PREFIX= yes
+
+BUILD_DEPENDS= ${PREFIX}/include/X11/extensions/bigreqstr.h:${PORTSDIR}/x11/bigreqsproto \
+ ${PREFIX}/include/X11/extensions/composite.h:${PORTSDIR}/x11/compositeproto \
+ ${PREFIX}/include/X11/extensions/damageproto.h:${PORTSDIR}/x11/damageproto \
+ ${PREFIX}/include/X11/extensions/dmxproto.h:${PORTSDIR}/x11/dmxproto \
+ ${PREFIX}/include/X11/extensions/xfixesproto.h:${PORTSDIR}/x11/fixesproto \
+ ${PREFIX}/include/X11/extensions/fontcache.h:${PORTSDIR}/x11-fonts/fontcacheproto \
+ ${PREFIX}/include/X11/fonts/FS.h:${PORTSDIR}/x11-fonts/fontsproto \
+ ${PREFIX}/include/GL/glxproto.h:${PORTSDIR}/x11/glproto \
+ ${PREFIX}/include/X11/extensions/XIproto.h:${PORTSDIR}/x11/inputproto \
+ ${PREFIX}/include/X11/extensions/XKB.h:${PORTSDIR}/x11/kbproto \
+ ${PREFIX}/include/X11/extensions/Print.h:${PORTSDIR}/x11/printproto \
+ ${PREFIX}/include/X11/extensions/randr.h:${PORTSDIR}/x11/randrproto \
+ ${PREFIX}/include/X11/extensions/recordstr.h:${PORTSDIR}/x11/recordproto \
+ ${PREFIX}/include/X11/extensions/render.h:${PORTSDIR}/x11/renderproto \
+ ${PREFIX}/include/X11/extensions/XResproto.h:${PORTSDIR}/x11/resourceproto \
+ ${PREFIX}/include/X11/extensions/saver.h:${PORTSDIR}/x11/scrnsaverproto \
+ ${PREFIX}/include/X11/extensions/xtrapproto.h:${PORTSDIR}/x11/trapproto \
+ ${PREFIX}/include/X11/extensions/Xv.h:${PORTSDIR}/x11/videoproto \
+ ${PREFIX}/include/X11/extensions/xcmiscstr.h:${PORTSDIR}/x11/xcmiscproto \
+ ${PREFIX}/include/X11/extensions/MITMisc.h:${PORTSDIR}/x11/xextproto \
+ ${PREFIX}/include/X11/extensions/xf86bigfont.h:${PORTSDIR}/x11-fonts/xf86bigfontproto \
+ ${PREFIX}/include/X11/extensions/xf86dga.h:${PORTSDIR}/x11/xf86dgaproto \
+ ${PREFIX}/include/GL/internal/dri_interface.h:${PORTSDIR}/x11/xf86driproto \
+ ${PREFIX}/include/X11/extensions/xf86misc.h:${PORTSDIR}/x11/xf86miscproto \
+ ${PREFIX}/include/X11/extensions/xf86rush.h:${PORTSDIR}/x11/xf86rushproto \
+ ${PREFIX}/include/X11/extensions/xf86vmode.h:${PORTSDIR}/x11/xf86vidmodeproto \
+ ${PREFIX}/include/X11/extensions/panoramiXproto.h:${PORTSDIR}/x11/xineramaproto \
+ ${PREFIX}/include/X11/DECkeysym.h:${PORTSDIR}/x11/xproto \
+ ${PREFIX}/include/X11/PM/PM.h:${PORTSDIR}/x11/xproxymanagementprotocol
+
+NO_BUILD= yes
+
+do-install:
+ ${MKDIR} ${PREFIX}/libdata/xorg
+ ${TOUCH} ${PREFIX}/libdata/xorg/protos
+
+.include <bsd.port.mk>
diff --git a/x11/xorg-protos/pkg-descr b/x11/xorg-protos/pkg-descr
new file mode 100644
index 000000000000..4c499da5f573
--- /dev/null
+++ b/x11/xorg-protos/pkg-descr
@@ -0,0 +1,6 @@
+This meta-package installs all X.Org protocol headers.
+
+WWW: http://www.x.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11/xorg-protos/pkg-plist b/x11/xorg-protos/pkg-plist
new file mode 100644
index 000000000000..9bd1d3f01034
--- /dev/null
+++ b/x11/xorg-protos/pkg-plist
@@ -0,0 +1,2 @@
+libdata/xorg/protos
+@dirrmtry libdata/xorg
diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile
index e84d9f6895f8..95893fb3ca47 100644
--- a/x11/xorg/Makefile
+++ b/x11/xorg/Makefile
@@ -6,48 +6,43 @@
#
PORTNAME= xorg
-PORTVERSION= 6.9.0
+PORTVERSION= 7.2
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
EXTRACT_ONLY= # none
MAINTAINER= x11@FreeBSD.org
-COMMENT= X.Org distribution metaport
+COMMENT= X.Org complete distribution metaport
-LIB_DEPENDS= X11.6:${PORTSDIR}/x11/xorg-libraries
-RUN_DEPENDS= xvinfo:${PORTSDIR}/x11/xorg-clients \
- ${X11BASE}/share/doc/X11/ddx.txt:${PORTSDIR}/x11/xorg-documents \
- ${X11BASE}/man/man1/Xserver.1.gz:${PORTSDIR}/x11/xorg-manpages \
- ${FONT100DPI}:${PORTSDIR}/x11-fonts/xorg-fonts-100dpi \
- ${FONT75DPI}:${PORTSDIR}/x11-fonts/xorg-fonts-75dpi \
- ${FONTCYR}:${PORTSDIR}/x11-fonts/xorg-fonts-cyrillic \
- ${FONTDEFAULT}:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
- ${FONTTT}:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
- ${FONTT1}:${PORTSDIR}/x11-fonts/xorg-fonts-type1 \
- ${X11BASE}/bin/xfs:${PORTSDIR}/x11-servers/xorg-fontserver \
- ${X11BASE}/bin/Xnest:${PORTSDIR}/x11-servers/xorg-nestserver \
- ${X11BASE}/bin/Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \
- ${X11BASE}/bin/Xprt:${PORTSDIR}/x11-servers/xorg-printserver
+NO_BUILD= yes
+PREFIX?= ${X11BASE}
-.include <bsd.port.pre.mk>
+RUN_DEPENDS+= ${X11BASE}/lib/dri/r128_dri.so:${PORTSDIR}/graphics/dri
-.if ${ARCH} != ia64
-RUN_DEPENDS+= ${X11BASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
-.endif
+# data
+RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
+ ${X11BASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
-.if ${ARCH} == i386 || ${ARCH} == alpha || ${ARCH} == amd64
-RUN_DEPENDS+= ${X11BASE}/lib/modules/dri/r200_dri.so:${PORTSDIR}/graphics/dri
-.endif
+# doc
+RUN_DEPENDS+= ${X11BASE}/share/X11/doc/hardcopy/BDF/bdf.PS.gz:${PORTSDIR}/x11/xorg-docs
-FONT100DPI= ${X11BASE}/lib/X11/fonts/100dpi/UTBI__10-ISO8859-1.pcf.gz
-FONT75DPI= ${X11BASE}/lib/X11/fonts/75dpi/UTBI__10-ISO8859-1.pcf.gz
-FONTCYR= ${X11BASE}/lib/X11/fonts/cyrillic/crox1c.pcf.gz
-FONTDEFAULT= ${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz
-FONTTT= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
-FONTT1= ${X11BASE}/lib/X11/fonts/Type1/UTBI____.afm
+# app, lib, font, driver, proto
+RUN_DEPENDS+= ${X11BASE}/libdata/xorg/apps:${PORTSDIR}/x11/xorg-apps \
+ ${X11BASE}/libdata/xorg/libraries:${PORTSDIR}/x11/xorg-libraries \
+ ${X11BASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts \
+ ${X11BASE}/libdata/xorg/drivers:${PORTSDIR}/x11-drivers/xorg-drivers \
+ ${X11BASE}/libdata/xorg/protos:${PORTSDIR}/x11/xorg-protos \
+ ${X11BASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
-NO_BUILD= yes
+.if defined(COMPLETE_BUILD) || defined(PACKAGE_BUILDING)
+RUN_DEPEND+= Xnest:${PORTSDIR}/x11-servers/xorg-nestserver \
+ Xdmx:${PORTSDIR}/x11-servers/xorg-dmx \
+ Xprt:${PORTSDIR}/x11-servers/xorg-printserver \
+ Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver
+.endif
+
+do-install: # empty
pre-everything::
@${ECHO_MSG} "This is a meta-port, meaning that it just depends on its subparts of the port."
@@ -56,17 +51,18 @@ pre-everything::
@${ECHO_MSG} "upgrade X.Org. If you simply type 'make install' it may use over 2GB to build"
@${ECHO_MSG} "all of the subports. You can install the ports singly if you are low on space."
+.include <bsd.port.pre.mk>
+
.if make(package)
.if !defined(DEPENDS_TARGET:Mpackage) || empty(DEPENDS_TARGET:Mpackage)
DEPENDS_TARGET="package"
.endif
.endif
-do-install: # empty
-
.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE= is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
+IGNORE= is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
distribution. See The X Window System and Virtual Consoles chapter\
of FAQ for more information
.endif
+
.include <bsd.port.post.mk>
diff --git a/x11/xphelloworld/Makefile b/x11/xphelloworld/Makefile
new file mode 100644
index 000000000000..42b37579e71b
--- /dev/null
+++ b/x11/xphelloworld/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for: xphelloworld
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xphelloworld
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Sends a test page to an Xprint printer
+
+XORG_CAT= app
+USE_XORG= x11 xaw8 xprintutil xp xprintapputil xt
+
+PLIST_FILES= bin/xphelloworld \
+ bin/xpsimplehelloworld \
+ bin/xpxthelloworld
+
+MAN1= xphelloworld.1 \
+ xpsimplehelloworld.1 \
+ xpxthelloworld.1
+
+.include <bsd.port.mk>
diff --git a/x11/xphelloworld/distinfo b/x11/xphelloworld/distinfo
new file mode 100644
index 000000000000..86bca85f8672
--- /dev/null
+++ b/x11/xphelloworld/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xphelloworld-1.0.1.tar.bz2) = 5c7fd1e35dd63089229e357c46e4f407
+SHA256 (xorg/app/xphelloworld-1.0.1.tar.bz2) = b1ca08e3ba4e5b135ee9d8675e717a6f88eafa53b031b2b821d2760897e35426
+SIZE (xorg/app/xphelloworld-1.0.1.tar.bz2) = 73111
diff --git a/x11/xphelloworld/pkg-descr b/x11/xphelloworld/pkg-descr
new file mode 100644
index 000000000000..4a69cd4b1984
--- /dev/null
+++ b/x11/xphelloworld/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xphelloworld, an utility that sends a test page to
+an Xprint printer.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xplsprinters/Makefile b/x11/xplsprinters/Makefile
new file mode 100644
index 000000000000..004d78f26dea
--- /dev/null
+++ b/x11/xplsprinters/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xplsprinters
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xplsprinters
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Shows a list of Xprint printers
+
+XORG_CAT= app
+USE_XORG= xp xprintutil x11
+
+PLIST_FILES= bin/xplsprinters
+
+MAN1= xplsprinters.1
+
+.include <bsd.port.mk>
diff --git a/x11/xplsprinters/distinfo b/x11/xplsprinters/distinfo
new file mode 100644
index 000000000000..2415797714dc
--- /dev/null
+++ b/x11/xplsprinters/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xplsprinters-1.0.1.tar.bz2) = c1558277f4a010473ff0744845c49537
+SHA256 (xorg/app/xplsprinters-1.0.1.tar.bz2) = adc60a1808e0974b75a0e7f95022f23411a0e2e9f83e84c441cba5f28f8db072
+SIZE (xorg/app/xplsprinters-1.0.1.tar.bz2) = 77212
diff --git a/x11/xplsprinters/pkg-descr b/x11/xplsprinters/pkg-descr
new file mode 100644
index 000000000000..f12de05c9af6
--- /dev/null
+++ b/x11/xplsprinters/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xplsprinters, a program for showing a list of Xprint
+printers and it's attributes.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xpr/Makefile b/x11/xpr/Makefile
new file mode 100644
index 000000000000..2ffa20de640e
--- /dev/null
+++ b/x11/xpr/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xpr
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xpr
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Utility for printing an X window dump
+
+XORG_CAT= app
+USE_XORG= xmuu x11
+
+PLIST_FILES= bin/xdpr bin/xpr
+
+MAN1= xdpr.1 xpr.1
+
+.include <bsd.port.mk>
diff --git a/x11/xpr/distinfo b/x11/xpr/distinfo
new file mode 100644
index 000000000000..f058ba16c643
--- /dev/null
+++ b/x11/xpr/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xpr-1.0.2.tar.bz2) = 6b3a6896081f628bf5a2c9129417c86f
+SHA256 (xorg/app/xpr-1.0.2.tar.bz2) = c325a9896d1cda43a681f1c2a6a2bbb1c580ade57a882b0a8f84ffa359238adf
+SIZE (xorg/app/xpr-1.0.2.tar.bz2) = 117849
diff --git a/x11/xpr/pkg-descr b/x11/xpr/pkg-descr
new file mode 100644
index 000000000000..759cb9d1eb9f
--- /dev/null
+++ b/x11/xpr/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xpr, an utility for printing an X window dump.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xprehashprinterlist/Makefile b/x11/xprehashprinterlist/Makefile
new file mode 100644
index 000000000000..bc93bd596eb8
--- /dev/null
+++ b/x11/xprehashprinterlist/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xprehashprinterlist
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xprehashprinterlist
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Recomputes the list of available printers.
+
+XORG_CAT= app
+USE_XORG= xp x11
+
+PLIST_FILES= bin/xprehashprinterlist
+
+MAN1= xprehashprinterlist.1
+
+.include <bsd.port.mk>
diff --git a/x11/xprehashprinterlist/distinfo b/x11/xprehashprinterlist/distinfo
new file mode 100644
index 000000000000..c0dbbdc5077c
--- /dev/null
+++ b/x11/xprehashprinterlist/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xprehashprinterlist-1.0.1.tar.bz2) = 99ee20a9af25375895f5d7ebc1004163
+SHA256 (xorg/app/xprehashprinterlist-1.0.1.tar.bz2) = ba67e9256f703d614ab891b1d676fc26e7479094b957370cbb363c78b2f20259
+SIZE (xorg/app/xprehashprinterlist-1.0.1.tar.bz2) = 75613
diff --git a/x11/xprehashprinterlist/pkg-descr b/x11/xprehashprinterlist/pkg-descr
new file mode 100644
index 000000000000..02941e073eaf
--- /dev/null
+++ b/x11/xprehashprinterlist/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xprehashprinterlist, a program that recomputes the
+list of available printers.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xprompt/Makefile b/x11/xprompt/Makefile
index 896a854c4381..48761548c8c7 100644
--- a/x11/xprompt/Makefile
+++ b/x11/xprompt/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xprompt
PORTVERSION= 1.4
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= mph
diff --git a/x11/xprop/Makefile b/x11/xprop/Makefile
new file mode 100644
index 000000000000..cef614ec73b1
--- /dev/null
+++ b/x11/xprop/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xprop
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xprop
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Property displayer for X
+
+XORG_CAT= app
+USE_XORG= xmuu x11
+
+PLIST_FILES= bin/xprop
+
+MAN1= xprop.1
+
+.include <bsd.port.mk>
diff --git a/x11/xprop/distinfo b/x11/xprop/distinfo
new file mode 100644
index 000000000000..590dca6cee33
--- /dev/null
+++ b/x11/xprop/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xprop-1.0.2.tar.bz2) = 5b6f02a3b1cda0cadc35f84814fe53d4
+SHA256 (xorg/app/xprop-1.0.2.tar.bz2) = 88b1e65703c68f14ac6cb735737d1a0e52751a18fdc8a39d2d1e5eaa07875ca0
+SIZE (xorg/app/xprop-1.0.2.tar.bz2) = 99762
diff --git a/x11/xprop/pkg-descr b/x11/xprop/pkg-descr
new file mode 100644
index 000000000000..a8f57ccded0d
--- /dev/null
+++ b/x11/xprop/pkg-descr
@@ -0,0 +1,5 @@
+This package contains the xprop utility, which is for displaying window
+and font properties in an X server.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index 153091c2e726..3a303dd58cb8 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -6,21 +6,12 @@
#
PORTNAME= xproto
-PORTVERSION= 6.6.2
+PORTVERSION= 7.0.10
CATEGORIES= x11
-MASTER_SITES= http://xlibs.freedesktop.org/release/
MAINTAINER= x11@FreeBSD.org
COMMENT= X11 protocol headers
-CONFLICTS= XFree86-libraries-* xorg-libraries-*
-
-USE_BZIP2= yes
-PREFIX?= ${X11BASE}
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_GMAKE= yes
-NO_BUILD= yes
-USE_GNOME= gnomehack
+XORG_CAT= proto
.include <bsd.port.mk>
diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo
index c5e1732f9a7b..02bf99a09908 100644
--- a/x11/xproto/distinfo
+++ b/x11/xproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xproto-6.6.2.tar.bz2) = fc419f3028cc2959b979a7e7464105f9
-SHA256 (xproto-6.6.2.tar.bz2) = 9c2bcfad5cd25c7fafcc86adccd14e0b859c444f351b449354c6524963a75e69
-SIZE (xproto-6.6.2.tar.bz2) = 86759
+MD5 (xorg/proto/xproto-7.0.10.tar.bz2) = 2ed80e90992e7455eaac4c3e977ebd01
+SHA256 (xorg/proto/xproto-7.0.10.tar.bz2) = 6d659920262d41e48714184f94ff9cd2608515e0f3d2f074892fe0c048784df4
+SIZE (xorg/proto/xproto-7.0.10.tar.bz2) = 142954
diff --git a/x11/xproto/pkg-plist b/x11/xproto/pkg-plist
index c86647e1e120..77c7571fa2ab 100644
--- a/x11/xproto/pkg-plist
+++ b/x11/xproto/pkg-plist
@@ -1,5 +1,9 @@
+include/X11/DECkeysym.h
+include/X11/HPkeysym.h
+include/X11/Sunkeysym.h
include/X11/X.h
include/X11/XF86keysym.h
+include/X11/XWDFile.h
include/X11/Xalloca.h
include/X11/Xarch.h
include/X11/Xatom.h
@@ -14,6 +18,10 @@ include/X11/Xpoll.h
include/X11/Xproto.h
include/X11/Xprotostr.h
include/X11/Xthreads.h
+include/X11/Xw32defs.h
+include/X11/Xwindows.h
+include/X11/Xwinsock.h
+include/X11/ap_keysym.h
include/X11/keysym.h
include/X11/keysymdef.h
libdata/pkgconfig/xproto.pc
diff --git a/x11/xproxymanagementprotocol/Makefile b/x11/xproxymanagementprotocol/Makefile
new file mode 100644
index 000000000000..06c625b5eeb6
--- /dev/null
+++ b/x11/xproxymanagementprotocol/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: xproxymanagementprotocol
+# Date Created: Jun 21 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xproxymanagementprotocol
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X Proxy Management Protocol headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/xproxymanagementprotocol/distinfo b/x11/xproxymanagementprotocol/distinfo
new file mode 100644
index 000000000000..f7807bd4334d
--- /dev/null
+++ b/x11/xproxymanagementprotocol/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/xproxymanagementprotocol-1.0.2.tar.bz2) = d28007a50976204960fc1fc07b4ca093
+SHA256 (xorg/proto/xproxymanagementprotocol-1.0.2.tar.bz2) = c45176d002c85c142ac52774680f5325d330c5ecc32d4d6a056d85ee039a0cbc
+SIZE (xorg/proto/xproxymanagementprotocol-1.0.2.tar.bz2) = 37007
diff --git a/x11/xproxymanagementprotocol/pkg-descr b/x11/xproxymanagementprotocol/pkg-descr
new file mode 100644
index 000000000000..4a2f4dd1c837
--- /dev/null
+++ b/x11/xproxymanagementprotocol/pkg-descr
@@ -0,0 +1,6 @@
+This package contains X Proxy Management Protocol headers.
+
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11/xproxymanagementprotocol/pkg-plist b/x11/xproxymanagementprotocol/pkg-plist
new file mode 100644
index 000000000000..19895969c0e2
--- /dev/null
+++ b/x11/xproxymanagementprotocol/pkg-plist
@@ -0,0 +1,4 @@
+include/X11/PM/PM.h
+include/X11/PM/PMproto.h
+libdata/pkgconfig/xproxymngproto.pc
+@dirrm include/X11/PM
diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile
new file mode 100644
index 000000000000..d1b9a6beaa31
--- /dev/null
+++ b/x11/xrandr/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xrandr
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xrandr
+PORTVERSION= 1.2.0
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Primitive command line interface to the RandR extension
+
+XORG_CAT= app
+USE_XORG= xrandr xrender x11
+
+PLIST_FILES= bin/xrandr
+
+MAN1= xrandr.1
+
+.include <bsd.port.mk>
diff --git a/x11/xrandr/distinfo b/x11/xrandr/distinfo
new file mode 100644
index 000000000000..bf9c8ce2ab4b
--- /dev/null
+++ b/x11/xrandr/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xrandr-1.2.0.tar.bz2) = 9e74e6919cf731ec10ce26fd6a4483fa
+SHA256 (xorg/app/xrandr-1.2.0.tar.bz2) = 7bf3bd3cf46a6a29e35b9dd1c8d3d14494be76da0d24c6ef5dab36974445004d
+SIZE (xorg/app/xrandr-1.2.0.tar.bz2) = 92498
diff --git a/x11/xrandr/pkg-descr b/x11/xrandr/pkg-descr
new file mode 100644
index 000000000000..ef0f6e48a64e
--- /dev/null
+++ b/x11/xrandr/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xrandr, a primitive command line interface to
+the RandR extension.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xrdb/Makefile b/x11/xrdb/Makefile
new file mode 100644
index 000000000000..7927276ea3b2
--- /dev/null
+++ b/x11/xrdb/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xrdb
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xrdb
+PORTVERSION= 1.0.3
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X server resource database utility
+
+XORG_CAT= app
+USE_XORG= xmuu x11
+
+PLIST_FILES= bin/xrdb
+
+MAN1= xrdb.1
+
+.include <bsd.port.mk>
diff --git a/x11/xrdb/distinfo b/x11/xrdb/distinfo
new file mode 100644
index 000000000000..91eb1b10a9d4
--- /dev/null
+++ b/x11/xrdb/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xrdb-1.0.3.tar.bz2) = 380b2ef545306354cc150834de567be7
+SHA256 (xorg/app/xrdb-1.0.3.tar.bz2) = a4a3b8cd821adc201a072f8c0214d73ee6a7e7b898de90e18f7d89a4453fb12c
+SIZE (xorg/app/xrdb-1.0.3.tar.bz2) = 99840
diff --git a/x11/xrdb/pkg-descr b/x11/xrdb/pkg-descr
new file mode 100644
index 000000000000..fadb6f4194a0
--- /dev/null
+++ b/x11/xrdb/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xrdb, a X server resource database utility.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xrefresh/Makefile b/x11/xrefresh/Makefile
new file mode 100644
index 000000000000..2214a510b18c
--- /dev/null
+++ b/x11/xrefresh/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xrefresh
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xrefresh
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Refresh all or part of an X screen
+
+XORG_CAT= app
+USE_XORG= x11
+
+PLIST_FILES= bin/xrefresh
+
+MAN1= xrefresh.1
+
+.include <bsd.port.mk>
diff --git a/x11/xrefresh/distinfo b/x11/xrefresh/distinfo
new file mode 100644
index 000000000000..c17a1d26377c
--- /dev/null
+++ b/x11/xrefresh/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xrefresh-1.0.2.tar.bz2) = 1228f890f86148e4e6ae22aa73118cbb
+SHA256 (xorg/app/xrefresh-1.0.2.tar.bz2) = 522831fd29c0b250f29735a01b02e96e311f200a675e45c8b3d187b6f86b32f5
+SIZE (xorg/app/xrefresh-1.0.2.tar.bz2) = 80590
diff --git a/x11/xrefresh/pkg-descr b/x11/xrefresh/pkg-descr
new file mode 100644
index 000000000000..da1d4e7969ed
--- /dev/null
+++ b/x11/xrefresh/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xrefresh, which is a simple X program that causes
+all or part of your screen to be repainted.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xrestop/Makefile b/x11/xrestop/Makefile
index 375132de1f3d..1c9738659931 100644
--- a/x11/xrestop/Makefile
+++ b/x11/xrestop/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xrestop
PORTVERSION= 0.4
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://projects.o-hand.com/sources/${PORTNAME}/
diff --git a/x11/xrootconsole/Makefile b/x11/xrootconsole/Makefile
index 618c6c6802a7..5dd59e9fb05b 100644
--- a/x11/xrootconsole/Makefile
+++ b/x11/xrootconsole/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xrootconsole
PORTVERSION= 0.6
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/x11/xrsh/Makefile b/x11/xrsh/Makefile
index a2733851aeda..767f028a4699 100644
--- a/x11/xrsh/Makefile
+++ b/x11/xrsh/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xrsh
PORTVERSION= 5.92
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://jjd.com/
DISTNAME= ${PORTNAME}
diff --git a/x11/xrsi/Makefile b/x11/xrsi/Makefile
index 755228db80c5..53a6f4307515 100644
--- a/x11/xrsi/Makefile
+++ b/x11/xrsi/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xrsi
PORTVERSION= 0.9
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xrsi
diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile
new file mode 100644
index 000000000000..a1278ea72541
--- /dev/null
+++ b/x11/xrx/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for: xrx
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xrx
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= RX helper program
+
+XORG_CAT= app
+USE_XORG= x11 xt xext xtrans xproxymngproto xau xaw
+USE_LDCONFIG= yes
+USE_AUTOTOOLS= libtool:15
+
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+
+MAN1= xrx.1 libxrx.1
+
+.include <bsd.port.mk>
diff --git a/x11/xrx/distinfo b/x11/xrx/distinfo
new file mode 100644
index 000000000000..86280543a985
--- /dev/null
+++ b/x11/xrx/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xrx-1.0.1.tar.bz2) = 5f65e24f8a225e255beb2059e33d6b37
+SHA256 (xorg/app/xrx-1.0.1.tar.bz2) = a51ac7c607f2f79de771807f590ccfe8b1819dae6f30dd615dd2afbe6007c4e4
+SIZE (xorg/app/xrx-1.0.1.tar.bz2) = 265332
diff --git a/x11/xrx/pkg-descr b/x11/xrx/pkg-descr
new file mode 100644
index 000000000000..d1065916a218
--- /dev/null
+++ b/x11/xrx/pkg-descr
@@ -0,0 +1,6 @@
+This package contains xrx, an RX helper program which can be used with
+any web browser to interpret documents in the RX MIME type format and
+start remote applications.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xrx/pkg-plist b/x11/xrx/pkg-plist
new file mode 100644
index 000000000000..7fa9e3aa3093
--- /dev/null
+++ b/x11/xrx/pkg-plist
@@ -0,0 +1,9 @@
+bin/xrx
+lib/libxrx.so.0
+lib/libxrx.so
+lib/libxrx.la
+lib/libxrx.a
+lib/libxrxnest.so.0
+lib/libxrxnest.so
+lib/libxrxnest.la
+lib/libxrxnest.a
diff --git a/x11/xscreensaver-gnome-hacks/Makefile b/x11/xscreensaver-gnome-hacks/Makefile
index f5ce6d1aff66..da281e49fcd7 100644
--- a/x11/xscreensaver-gnome-hacks/Makefile
+++ b/x11/xscreensaver-gnome-hacks/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xscreensaver-gnome-hacks
-PORTREVISION= 1
+PORTREVISION= 2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Screensaver modules for use with xscreensaver and gnome-screensaver
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index fbaa4031c7a8..ea4ee9766cc9 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= xscreensaver-gnome
PORTVERSION= 4.24
-PORTREVISION?= 4
+PORTREVISION?= 5
CATEGORIES= x11 gnome
MASTER_SITES= http://www.jwz.org/xscreensaver/
DISTNAME= xscreensaver-${PORTVERSION}
diff --git a/x11/xscreensaver-gnome/pkg-plist b/x11/xscreensaver-gnome/pkg-plist
index 316072c63e5c..58871d231409 100644
--- a/x11/xscreensaver-gnome/pkg-plist
+++ b/x11/xscreensaver-gnome/pkg-plist
@@ -452,23 +452,5 @@ share/xscreensaver/config/zoom.xml
@dirrm share/gnome/xscreensaver/glade
@dirrm share/gnome/xscreensaver
@dirrm bin/xscreensaver-hacks
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
@cwd %%X11BASE%%
lib/X11/app-defaults/XScreenSaver
diff --git a/x11/xscreensaver-kde/Makefile b/x11/xscreensaver-kde/Makefile
index b659e92bda4b..6b2e2d956d4d 100644
--- a/x11/xscreensaver-kde/Makefile
+++ b/x11/xscreensaver-kde/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xscreensaver-kde
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/xscreensaver.app/Makefile b/x11/xscreensaver.app/Makefile
index c04d2302fa47..2ec699a05b14 100644
--- a/x11/xscreensaver.app/Makefile
+++ b/x11/xscreensaver.app/Makefile
@@ -7,7 +7,7 @@
PORTNAME= XScreenSaver.App
PORTVERSION= 2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 windowmaker
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xscreensaverapp
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 5502d35e0e88..1fe1099e1b16 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xscreensaver
PORTVERSION= 5.01
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES?= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/ \
http://dougbarton.us/Downloads/
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index 1490260c8f67..baa352122080 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -434,7 +434,6 @@ share/pixmaps/xscreensaver.xpm
%%DATADIR%%/glade/screensaver-snap.png
%%DATADIR%%/glade/xscreensaver-demo.glade2
@dirrmtry bin/xscreensaver-hacks
-@dirrmtry share/pixmaps
@dirrm %%DATADIR%%/config
@dirrm %%DATADIR%%/glade
@dirrm %%DATADIR%%
diff --git a/x11/xsel/Makefile b/x11/xsel/Makefile
index 5bbb58eea185..8a09c153b93b 100644
--- a/x11/xsel/Makefile
+++ b/x11/xsel/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xsel
PORTVERSION= 0.04.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://www.niksula.cs.hut.fi/~vherva/xsel/
DISTFILES= xsel.c xsel.man
diff --git a/x11/xset/Makefile b/x11/xset/Makefile
new file mode 100644
index 000000000000..f26644fda9eb
--- /dev/null
+++ b/x11/xset/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xset
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xset
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= User preference utility for X
+
+XORG_CAT= app
+USE_XORG= xmuu
+
+PLIST_FILES= bin/xset
+
+MAN1= xset.1
+
+.include <bsd.port.mk>
diff --git a/x11/xset/distinfo b/x11/xset/distinfo
new file mode 100644
index 000000000000..bf8a79c6e067
--- /dev/null
+++ b/x11/xset/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xset-1.0.2.tar.bz2) = 1b781a0802c7b8fb9619a6665607b3f0
+SHA256 (xorg/app/xset-1.0.2.tar.bz2) = ce1e17c513a4499526e648a59c39ba01777c99c86093433cf392f27654b795c9
+SIZE (xorg/app/xset-1.0.2.tar.bz2) = 92940
diff --git a/x11/xset/pkg-descr b/x11/xset/pkg-descr
new file mode 100644
index 000000000000..bdbb142c16df
--- /dev/null
+++ b/x11/xset/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xset, an application used to set various user preference
+options related to the display in the X Window System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xsetmode/Makefile b/x11/xsetmode/Makefile
new file mode 100644
index 000000000000..58297f54fd72
--- /dev/null
+++ b/x11/xsetmode/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xsetmode
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xsetmode
+PORTVERSION= 1.0.0
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Set the mode for an X Input Device
+
+XORG_CAT= app
+USE_XORG= xi x11
+
+PLIST_FILES= bin/xsetmode
+
+MAN1= xsetmode.1
+
+.include <bsd.port.mk>
diff --git a/x11/xsetmode/distinfo b/x11/xsetmode/distinfo
new file mode 100644
index 000000000000..b7aeefe65495
--- /dev/null
+++ b/x11/xsetmode/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xsetmode-1.0.0.tar.bz2) = d074e79d380b031d2f60e4cd56538c93
+SHA256 (xorg/app/xsetmode-1.0.0.tar.bz2) = 988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa
+SIZE (xorg/app/xsetmode-1.0.0.tar.bz2) = 73757
diff --git a/x11/xsetmode/pkg-descr b/x11/xsetmode/pkg-descr
new file mode 100644
index 000000000000..83bdd9a4f63f
--- /dev/null
+++ b/x11/xsetmode/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xsetmode, which is a program for setting the mode
+of an X Input device to either absolute och relative.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xsetpointer/Makefile b/x11/xsetpointer/Makefile
new file mode 100644
index 000000000000..0f73574a928b
--- /dev/null
+++ b/x11/xsetpointer/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xsetpointer
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xsetpointer
+PORTVERSION= 1.0.0
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Set an X Input device as the main pointer
+
+XORG_CAT= app
+USE_XORG= xi x11
+
+PLIST_FILES= bin/xsetpointer
+
+MAN1= xsetpointer.1
+
+.include <bsd.port.mk>
diff --git a/x11/xsetpointer/distinfo b/x11/xsetpointer/distinfo
new file mode 100644
index 000000000000..cef7fe3428f3
--- /dev/null
+++ b/x11/xsetpointer/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xsetpointer-1.0.0.tar.bz2) = c94ea103e27e370e4e5030e50c5d5d69
+SHA256 (xorg/app/xsetpointer-1.0.0.tar.bz2) = 7d65f450420b4f764dcf38e4ccee9d608b5a5874706e716cb861bfe2586b7d4a
+SIZE (xorg/app/xsetpointer-1.0.0.tar.bz2) = 73861
diff --git a/x11/xsetpointer/pkg-descr b/x11/xsetpointer/pkg-descr
new file mode 100644
index 000000000000..e755bb22bf9c
--- /dev/null
+++ b/x11/xsetpointer/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xsetpointer, which sets an X Input device
+as the main pointer.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xsetroot/Makefile b/x11/xsetroot/Makefile
new file mode 100644
index 000000000000..bfc0700ee62e
--- /dev/null
+++ b/x11/xsetroot/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xsetroot
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xsetroot
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= root window parameter setting utility for X
+
+XORG_CAT= app
+USE_XORG= xmuu x11 xbitmaps
+MAN1= xsetroot.1
+PLIST_FILES= bin/xsetroot
+
+.include <bsd.port.mk>
diff --git a/x11/xsetroot/distinfo b/x11/xsetroot/distinfo
new file mode 100644
index 000000000000..b682db4c3cbf
--- /dev/null
+++ b/x11/xsetroot/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xsetroot-1.0.1.tar.bz2) = fc7eeb7130bb54345671a9dbaab567ac
+SHA256 (xorg/app/xsetroot-1.0.1.tar.bz2) = 897d77acd3f4a366472386139827eaac24cc423c811ef0e65e0d5eca099a3155
+SIZE (xorg/app/xsetroot-1.0.1.tar.bz2) = 77709
diff --git a/x11/xsetroot/pkg-descr b/x11/xsetroot/pkg-descr
new file mode 100644
index 000000000000..d09e4b06de32
--- /dev/null
+++ b/x11/xsetroot/pkg-descr
@@ -0,0 +1,6 @@
+This package contains xsetroot, a root window paramteter setting utility
+for the X Window System, which allows you to change the appearance of the
+background ("root") window in X.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xskyroot/Makefile b/x11/xskyroot/Makefile
index 895877943f20..a345fab1f7b3 100644
--- a/x11/xskyroot/Makefile
+++ b/x11/xskyroot/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xskyroot
PORTVERSION= 920428
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.sra.co.jp/pub/news/fj.sources/V10/
DISTFILES= 1079.gz
diff --git a/x11/xsm/Makefile b/x11/xsm/Makefile
new file mode 100644
index 000000000000..ef4ac255f415
--- /dev/null
+++ b/x11/xsm/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xsm
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xsm
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X Session Manager
+
+XORG_CAT= app
+USE_XORG= xt xaw
+
+MAN1= xsm.1
+
+.include <bsd.port.mk>
diff --git a/x11/xsm/distinfo b/x11/xsm/distinfo
new file mode 100644
index 000000000000..91adfc3d9533
--- /dev/null
+++ b/x11/xsm/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xsm-1.0.1.tar.bz2) = cce867ff7d0df9c0b9e682591779952c
+SHA256 (xorg/app/xsm-1.0.1.tar.bz2) = 2f2535b5394d59be0a4bb15c12ea1b19b873a0096446ecc4c71aa81f0d99b29a
+SIZE (xorg/app/xsm-1.0.1.tar.bz2) = 116875
diff --git a/x11/xsm/pkg-descr b/x11/xsm/pkg-descr
new file mode 100644
index 000000000000..9b70d0df901c
--- /dev/null
+++ b/x11/xsm/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org X Session Manager (xsm).
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xsm/pkg-plist b/x11/xsm/pkg-plist
new file mode 100644
index 000000000000..321ab1b91c47
--- /dev/null
+++ b/x11/xsm/pkg-plist
@@ -0,0 +1,5 @@
+bin/xsm
+lib/X11/xsm/system.xsm
+share/X11/app-defaults/XSm
+@dirrmtry share/X11/app-defaults
+@dirrm lib/X11/xsm
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index 200cea61d3dc..201fedf2b7b3 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xsnow
PORTVERSION= 1.42
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.euronet.nl/~rja/Xsnow/
diff --git a/x11/xstarroll/Makefile b/x11/xstarroll/Makefile
index 8821b395853b..945d9393247b 100644
--- a/x11/xstarroll/Makefile
+++ b/x11/xstarroll/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xstarroll
PORTVERSION= 1.1b
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= http://www.saturn.dti.ne.jp/~hsakai/myfreesoft/
diff --git a/x11/xstdcmap/Makefile b/x11/xstdcmap/Makefile
new file mode 100644
index 000000000000..329840c28e7e
--- /dev/null
+++ b/x11/xstdcmap/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xstdcmap
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xstdcmap
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X standard colormap utility
+
+XORG_CAT= app
+USE_XORG= xmu x11
+
+PLIST_FILES= bin/xstdcmap
+
+MAN1= xstdcmap.1
+
+.include <bsd.port.mk>
diff --git a/x11/xstdcmap/distinfo b/x11/xstdcmap/distinfo
new file mode 100644
index 000000000000..56af4c388351
--- /dev/null
+++ b/x11/xstdcmap/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xstdcmap-1.0.1.tar.bz2) = 86ab558441edfb86f853639e4290a754
+SHA256 (xorg/app/xstdcmap-1.0.1.tar.bz2) = 0d920660137dee514599f63b5a8c8ce14d2474607e28e32c973cafb360f7e738
+SIZE (xorg/app/xstdcmap-1.0.1.tar.bz2) = 76310
diff --git a/x11/xstdcmap/pkg-descr b/x11/xstdcmap/pkg-descr
new file mode 100644
index 000000000000..9383874205a6
--- /dev/null
+++ b/x11/xstdcmap/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xstdcmap, an X standard colormap utility.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xstroke/Makefile b/x11/xstroke/Makefile
index b005f706cbbf..b4106d7d8376 100644
--- a/x11/xstroke/Makefile
+++ b/x11/xstroke/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xstroke
PORTVERSION= 0.5.12
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= ftp://ftp.handhelds.org/projects/xstroke/release-0.5/ \
http://www.handhelds.org/download/projects/xstroke/release-0.5/
diff --git a/x11/xtacy/Makefile b/x11/xtacy/Makefile
index b41a83046935..e985a66f1e11 100644
--- a/x11/xtacy/Makefile
+++ b/x11/xtacy/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xtacy
PORTVERSION= 1.14
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.ultranet.com/~jjohnson/ \
${MASTER_SITE_SUNSITE}
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index eb5e7ec9e95e..c9588001b41f 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xterm
PORTVERSION= 225
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://invisible-island.net/xterm/ \
http://voodoo.bawue.com/download/
diff --git a/x11/xtermcontrol/Makefile b/x11/xtermcontrol/Makefile
index d6708b2161c5..71e376087ff7 100644
--- a/x11/xtermcontrol/Makefile
+++ b/x11/xtermcontrol/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xtermcontrol
PORTVERSION= 2.8
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.thrysoee.dk/xtermcontrol/
diff --git a/x11/xtermset/Makefile b/x11/xtermset/Makefile
index f7011428fcff..ff1c3e134114 100644
--- a/x11/xtermset/Makefile
+++ b/x11/xtermset/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xtermset
PORTVERSION= 0.5.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= clts
diff --git a/x11/xtestpicture/Makefile b/x11/xtestpicture/Makefile
index 747ae7c3bb26..f79f74dfcf51 100644
--- a/x11/xtestpicture/Makefile
+++ b/x11/xtestpicture/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xtestpicture
PORTVERSION= 1.2
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.interface-business.de/pub/outgoing/
diff --git a/x11/xtoolwait/Makefile b/x11/xtoolwait/Makefile
index 3328b7d29efa..b3c41c993a29 100644
--- a/x11/xtoolwait/Makefile
+++ b/x11/xtoolwait/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xtoolwait
PORTVERSION= 1.3
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
new file mode 100644
index 000000000000..509a9a060033
--- /dev/null
+++ b/x11/xtrans/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: xtrans
+# Date Created: 08 Aug 2005
+# Whom: Dejan Lesjak <lesi@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xtrans
+PORTVERSION= 1.0.3
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Abstract network code for X
+
+XORG_CAT= lib
+
+.include <bsd.port.mk>
diff --git a/x11/xtrans/distinfo b/x11/xtrans/distinfo
new file mode 100644
index 000000000000..be976168456e
--- /dev/null
+++ b/x11/xtrans/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/lib/xtrans-1.0.3.tar.bz2) = bb196907ea1e182dcb396eb22f7d2c1a
+SHA256 (xorg/lib/xtrans-1.0.3.tar.bz2) = e1a3c4986f16a5fbca611d0547cc7499a1fa47ca2096593644037e2609363085
+SIZE (xorg/lib/xtrans-1.0.3.tar.bz2) = 102657
diff --git a/x11/xtrans/pkg-descr b/x11/xtrans/pkg-descr
new file mode 100644
index 000000000000..90b6ad875d03
--- /dev/null
+++ b/x11/xtrans/pkg-descr
@@ -0,0 +1,6 @@
+This package contains xtrans, a library of code that is shared among X
+packages to handle network protocol transport in a modular fashion,
+allowing a single place to add new transport types.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xtrans/pkg-plist b/x11/xtrans/pkg-plist
new file mode 100644
index 000000000000..55608d359f26
--- /dev/null
+++ b/x11/xtrans/pkg-plist
@@ -0,0 +1,13 @@
+include/X11/Xtrans/Xtrans.c
+include/X11/Xtrans/Xtrans.h
+include/X11/Xtrans/Xtransdnet.c
+include/X11/Xtrans/Xtransint.h
+include/X11/Xtrans/Xtranslcl.c
+include/X11/Xtrans/Xtransos2.c
+include/X11/Xtrans/Xtranssock.c
+include/X11/Xtrans/Xtranstli.c
+include/X11/Xtrans/Xtransutil.c
+include/X11/Xtrans/transport.c
+libdata/pkgconfig/xtrans.pc
+share/aclocal/xtrans.m4
+@dirrm include/X11/Xtrans
diff --git a/x11/xtrap/Makefile b/x11/xtrap/Makefile
new file mode 100644
index 000000000000..c222d0301ec3
--- /dev/null
+++ b/x11/xtrap/Makefile
@@ -0,0 +1,27 @@
+# New ports collection makefile for: xtrap
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xtrap
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= XTrap sample clients for X
+
+XORG_CAT= app
+USE_XORG= xtrap
+
+MAN1= xtrap.1 \
+ xtrapchar.1 \
+ xtrapin.1 \
+ xtrapinfo.1 \
+ xtrapout.1 \
+ xtrapproto.1 \
+ xtrapreset.1 \
+ xtrapstats.1
+
+.include <bsd.port.mk>
diff --git a/x11/xtrap/distinfo b/x11/xtrap/distinfo
new file mode 100644
index 000000000000..6b3d08ed63b0
--- /dev/null
+++ b/x11/xtrap/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xtrap-1.0.2.tar.bz2) = 97a62a011a11f03b46d72851aa298fa8
+SHA256 (xorg/app/xtrap-1.0.2.tar.bz2) = 8f513da45b0c65dff4a3d477e5600a98d677571d7ed283f52c905987dcae0fbc
+SIZE (xorg/app/xtrap-1.0.2.tar.bz2) = 95471
diff --git a/x11/xtrap/pkg-descr b/x11/xtrap/pkg-descr
new file mode 100644
index 000000000000..fae5d2a9e846
--- /dev/null
+++ b/x11/xtrap/pkg-descr
@@ -0,0 +1,6 @@
+This package contains a set of XTrap sample clients. XTrap is an X Server
+extension which facilitates the capturing of server protocol and
+synthesizing core input events.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xtrap/pkg-plist b/x11/xtrap/pkg-plist
new file mode 100644
index 000000000000..e07601e621c1
--- /dev/null
+++ b/x11/xtrap/pkg-plist
@@ -0,0 +1,7 @@
+bin/xtrapchar
+bin/xtrapproto
+bin/xtrapin
+bin/xtrapout
+bin/xtrapstats
+bin/xtrapreset
+bin/xtrapinfo
diff --git a/x11/xtrlock/Makefile b/x11/xtrlock/Makefile
index bba5f4bdefe9..2d88e468350c 100644
--- a/x11/xtrlock/Makefile
+++ b/x11/xtrlock/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xtrlock
PORTVERSION= 2.0.12
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR= pool/main/x/xtrlock/
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index 2012ae63b5c4..acd5960c41db 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xvattr
PORTVERSION= 1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/
diff --git a/x11/xvidtune/Makefile b/x11/xvidtune/Makefile
new file mode 100644
index 000000000000..6dee29c6e96f
--- /dev/null
+++ b/x11/xvidtune/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xvidtune
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xvidtune
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Video mode tuner for X
+
+XORG_CAT= app
+USE_XORG= xxf86vm xt xaw
+
+MAN1= xvidtune.1
+
+.include <bsd.port.mk>
diff --git a/x11/xvidtune/distinfo b/x11/xvidtune/distinfo
new file mode 100644
index 000000000000..b04774c7a092
--- /dev/null
+++ b/x11/xvidtune/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xvidtune-1.0.1.tar.bz2) = e0744594f4e5969b20df28d897781318
+SHA256 (xorg/app/xvidtune-1.0.1.tar.bz2) = 6d0feb42c2f1d6011d97c776b9d580fd589cdf3cfe246cd99437c406a2740d36
+SIZE (xorg/app/xvidtune-1.0.1.tar.bz2) = 87986
diff --git a/x11/xvidtune/pkg-descr b/x11/xvidtune/pkg-descr
new file mode 100644
index 000000000000..a3a12fbb41d8
--- /dev/null
+++ b/x11/xvidtune/pkg-descr
@@ -0,0 +1 @@
+This package contains xvidtune, a video mode tuner for the X Window System.
diff --git a/x11/xvidtune/pkg-plist b/x11/xvidtune/pkg-plist
new file mode 100644
index 000000000000..6ec758b41e0c
--- /dev/null
+++ b/x11/xvidtune/pkg-plist
@@ -0,0 +1,3 @@
+bin/xvidtune
+share/X11/app-defaults/Xvidtune
+@dirrmtry share/X11/app-defaults
diff --git a/x11/xvinfo/Makefile b/x11/xvinfo/Makefile
new file mode 100644
index 000000000000..2ce5daba6c65
--- /dev/null
+++ b/x11/xvinfo/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xvinfo
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xvinfo
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Print out X-Video extension adaptor information
+
+XORG_CAT= app
+USE_XORG= xv x11
+
+PLIST_FILES= bin/xvinfo
+
+MAN1= xvinfo.1
+
+.include <bsd.port.mk>
diff --git a/x11/xvinfo/distinfo b/x11/xvinfo/distinfo
new file mode 100644
index 000000000000..5fa630b6b907
--- /dev/null
+++ b/x11/xvinfo/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xvinfo-1.0.1.tar.bz2) = 0a5bd8e43de6eb8ff5b5bc673204401d
+SHA256 (xorg/app/xvinfo-1.0.1.tar.bz2) = 439b3c7ad96fc7b1ef9156c716e10b607883a9a58b777f8dc02f03284eb33fb3
+SIZE (xorg/app/xvinfo-1.0.1.tar.bz2) = 74829
diff --git a/x11/xvinfo/pkg-descr b/x11/xvinfo/pkg-descr
new file mode 100644
index 000000000000..cf1f2dd785d1
--- /dev/null
+++ b/x11/xvinfo/pkg-descr
@@ -0,0 +1,6 @@
+This package contains xvinfo, an application for printing out the
+capabilities of any video adaptors associated with the display that
+are accessible through the X-Video extension.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile
index 7a584820712e..3757ddbdfa40 100644
--- a/x11/xvkbd/Makefile
+++ b/x11/xvkbd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xvkbd
PORTVERSION= 2.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://homepage3.nifty.com/tsato/xvkbd/
diff --git a/x11/xwatchwin/Makefile b/x11/xwatchwin/Makefile
index abdb96fc8823..d79e1e1e8791 100644
--- a/x11/xwatchwin/Makefile
+++ b/x11/xwatchwin/Makefile
@@ -6,7 +6,7 @@
PORTNAME= xwatchwin
PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
diff --git a/x11/xwd/Makefile b/x11/xwd/Makefile
new file mode 100644
index 000000000000..f210903a732b
--- /dev/null
+++ b/x11/xwd/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xwd
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xwd
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Dump an image of an X window
+
+XORG_CAT= app
+USE_XORG= xmuu x11
+
+PLIST_FILES= bin/xwd
+
+MAN1= xwd.1
+
+.include <bsd.port.mk>
diff --git a/x11/xwd/distinfo b/x11/xwd/distinfo
new file mode 100644
index 000000000000..450cba2ddf56
--- /dev/null
+++ b/x11/xwd/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xwd-1.0.1.tar.bz2) = 911addfb7fa402217ddac63e5c1d97c7
+SHA256 (xorg/app/xwd-1.0.1.tar.bz2) = c8bd9bcd64df439c2cd09eaa3e83a1297fbfed5c7d3dd8117342b3a25eeae131
+SIZE (xorg/app/xwd-1.0.1.tar.bz2) = 97079
diff --git a/x11/xwd/pkg-descr b/x11/xwd/pkg-descr
new file mode 100644
index 000000000000..235d83ffbc47
--- /dev/null
+++ b/x11/xwd/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xwd, which is an X Window System window dumping utility.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile
new file mode 100644
index 000000000000..ef0e33221cdb
--- /dev/null
+++ b/x11/xwininfo/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xwininfo
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xwininfo
+PORTVERSION= 1.0.2
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Window information utility for X
+
+XORG_CAT= app
+USE_XORG= xmuu xext x11
+
+PLIST_FILES= bin/xwininfo
+
+MAN1= xwininfo.1
+
+.include <bsd.port.mk>
diff --git a/x11/xwininfo/distinfo b/x11/xwininfo/distinfo
new file mode 100644
index 000000000000..56c05096d87f
--- /dev/null
+++ b/x11/xwininfo/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xwininfo-1.0.2.tar.bz2) = e5dbc8866a55958297f5f38205b6be1e
+SHA256 (xorg/app/xwininfo-1.0.2.tar.bz2) = 9fdfd3259b335531cdba831872ec0e32c5f6df01e14b87c3187b494be75b7b66
+SIZE (xorg/app/xwininfo-1.0.2.tar.bz2) = 91625
diff --git a/x11/xwininfo/pkg-descr b/x11/xwininfo/pkg-descr
new file mode 100644
index 000000000000..ec1faf4f16d4
--- /dev/null
+++ b/x11/xwininfo/pkg-descr
@@ -0,0 +1,5 @@
+This package contains xwininfo, which is a utility for displaying
+information about windows in X.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xwit/Makefile b/x11/xwit/Makefile
index 648a409f4fd6..8d48dc9d6cb3 100644
--- a/x11/xwit/Makefile
+++ b/x11/xwit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xwit
PORTVERSION= 3.4
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://downloads.planetmirror.com/pub/x11/contrib/utilities/ \
http://www.netsw.org/x11/tools/internal/
diff --git a/x11/xwud/Makefile b/x11/xwud/Makefile
new file mode 100644
index 000000000000..34e7c66542dc
--- /dev/null
+++ b/x11/xwud/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for: xwud
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xwud
+PORTVERSION= 1.0.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Image displayer for X
+
+XORG_CAT= app
+USE_XORG= x11
+
+PLIST_FILES= bin/xwud
+
+MAN1= xwud.1
+
+.include <bsd.port.mk>
diff --git a/x11/xwud/distinfo b/x11/xwud/distinfo
new file mode 100644
index 000000000000..540f453341e1
--- /dev/null
+++ b/x11/xwud/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/app/xwud-1.0.1.tar.bz2) = 6e3c5d0297d88e890b6f5df31f73dd60
+SHA256 (xorg/app/xwud-1.0.1.tar.bz2) = d2de2d39b4479e23adc92d131f66e87db41441aae11b72991bb01d5f6c93336c
+SIZE (xorg/app/xwud-1.0.1.tar.bz2) = 83104
diff --git a/x11/xwud/pkg-descr b/x11/xwud/pkg-descr
new file mode 100644
index 000000000000..61d21c52571c
--- /dev/null
+++ b/x11/xwud/pkg-descr
@@ -0,0 +1,4 @@
+This package contains xwud, an image displayer for the X Window System.
+
+- Joel Dahl
+joel@FreeBSD.org
diff --git a/x11/xxkb/Makefile b/x11/xxkb/Makefile
index cebc63b051e4..09e74a7e7fbf 100644
--- a/x11/xxkb/Makefile
+++ b/x11/xxkb/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xxkb
PORTVERSION= 1.10
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xxkb
diff --git a/x11/xzoom/Makefile b/x11/xzoom/Makefile
index ee14e2e46d70..0eabd5434b15 100644
--- a/x11/xzoom/Makefile
+++ b/x11/xzoom/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xzoom
PORTVERSION= 0.3
+PORTREVISION= 1
CATEGORIES= x11 accessibility
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= libs/X
diff --git a/x11/yakuake-kde4/Makefile b/x11/yakuake-kde4/Makefile
index ad036ba5574f..bee2571037de 100644
--- a/x11/yakuake-kde4/Makefile
+++ b/x11/yakuake-kde4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= yakuake
PORTVERSION= 2.7.5
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= http://www.kde-look.org/CONTENT/content-files/
DISTNAME= 29153-${PORTNAME}-${PORTVERSION}
diff --git a/x11/yakuake/Makefile b/x11/yakuake/Makefile
index ad036ba5574f..bee2571037de 100644
--- a/x11/yakuake/Makefile
+++ b/x11/yakuake/Makefile
@@ -7,6 +7,7 @@
PORTNAME= yakuake
PORTVERSION= 2.7.5
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= http://www.kde-look.org/CONTENT/content-files/
DISTNAME= 29153-${PORTNAME}-${PORTVERSION}
diff --git a/x11/yalias/Makefile b/x11/yalias/Makefile
index f270dcacec50..e7af4017482e 100644
--- a/x11/yalias/Makefile
+++ b/x11/yalias/Makefile
@@ -7,7 +7,7 @@
PORTNAME= yalias
PORTVERSION= 0.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= http://offog.org/files/ \
ftp://ftp.i-scream.org/pub/offog.org/files/ \
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 3fd2aed9c7df..b014892f06f4 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -8,6 +8,7 @@
PORTNAME= yelp
PORTVERSION= 2.18.1
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index 1a13b80ea5a8..c2846177fdc2 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -119,67 +119,27 @@ share/locale/zu/LC_MESSAGES/yelp.mo
@dirrm share/gnome/yelp
@dirrmtry share/locale/zu/LC_MESSAGES
@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
-@dirrmtry share/locale/tg/LC_MESSAGES
-@dirrmtry share/locale/tg
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
@dirrmtry share/locale/nso/LC_MESSAGES
@dirrmtry share/locale/nso
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
@dirrmtry share/locale/nds@NFE/LC_MESSAGES
@dirrmtry share/locale/nds@NFE
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
-@dirrmtry share/locale/li/LC_MESSAGES
-@dirrmtry share/locale/li
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index c7d353d07bb9..52154a0a7da8 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -8,6 +8,7 @@
PORTNAME= zenity
PORTVERSION= 2.18.1
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index 336291cbe3d9..2a2cab637a6f 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -184,57 +184,21 @@ share/locale/zh_TW/LC_MESSAGES/zenity.mo
@dirrm share/gnome/help/zenity/C/figures
@dirrm share/gnome/help/zenity/C
@dirrm share/gnome/help/zenity
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
@dirrmtry share/locale/mi/LC_MESSAGES
@dirrmtry share/locale/mi
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be