Attached patch updates FreeBSD xorg ports to the latest version, including new libX11, libxcb, MESA and xorg-server. This patch also includes changes to bsd.port.mk and bsd.xorg.mk to support these changes, as well as changes to USES=pathfix and USE_PKGCONFIG=build, and fixes to make imake work with clang. Since this patch touches a great deal of the ports tree it is in need of exp-runs. Preferably two exp-runs, once in a normal environment to build the old xorg, and once, with WITH_NEW_XORG= defined in /etc/make.conf or similar, to build the new xorg. It is ok if the version of FreeBSD used for these runs differ slightly. To sum: exp-run 1: normal exp-run 2: WITH_NEW_XORG= in /etc/make.conf The patch applies fine with svn patch, but our regular patch might have trouble with the extra metadata (such as property changes) that svn adds to the patch. If applied with normal patch, don't forget -E to remove empty files. If the patch is too big for gnats, it can also be downloaded from http://people.freebsd.org/~zeising/xorg-7.7.diff
Responsible Changed From-To: freebsd-ports-bugs->portmgr Assign to portmgr pending exp-run
Attached is an updated patch for this exp-run. It is also available at the URL in the original submission. Regards! -- Niclas Zeising
Responsible Changed From-To: portmgr->miwi I'll take it.
Hi! Here is another updated patch which takes into account USES=gettext and USES=pkgconfig. Regards! -- Niclas Zeising
Hi! Attached is an updated patch which includes some updates and switches USE_ICONV to USES=iconv. It is also available at http://people.freebsd.org/~zeising/xorg-7.7.diff Regards! -- Niclas Zeising
Hi! Attached is an updated patch, no big changes, just to catch up with the latest stuff in the regular ports tree. Also available at http://people.freebsd.org/~zeising/xorg-7.7.diff Regards! -- Niclas Zeising
Here is an updated patch to sync with the latest ports tree. Also available at http://people.freebsd.org/~zeising/xorg-7.7.diff Regards! -- Niclas Zeising
Hi! Here is yet another updated patch, with a bunch of minor fixes. Regards! -- Niclas Zeising
Hi! Here is an updated patch based on findings during the first exp-run. It also includes some general updates. It would be great if this patch could get a second run! The patch is also available at http://people.freebsd.org/~zeising/xorg-7.7.diff Regards! -- Niclas Zeising
Hi! Another updated patch with some small changes. Also available at http://people.freebsd.org/~zeising/xorg-7.7.diff Regards! -- Niclas Zeising
Updated patch, again. Should apply on a clean ports tree. Also available from http://people.freebsd.org/~zeising/xorg-7.7.diff Regards! -- Niclas Zeising
Author: zeising Date: Sat May 25 14:37:02 2013 New Revision: 319055 URL: http://svnweb.freebsd.org/changeset/ports/319055 Log: The FreeBSD x11 team proudly presents an zeising, kwm, miwi, bapt, eadler production: Xorg 7.7 Starring: xserver 1.12.4 (new xorg only) Mesa 8.0.4, including libGL, libGLU and dri (new xorg only) libX11 1.5.0 libxcb 1.9 libdrm 2.4.42 (new xorg only) freeglut 2.8.1 Also starring: Updates to drivers and other libraries and utilities Additional notes: Change pkgconf to be a build dependency. Add a new USE_XORG, xcb, to depend on libxcb and update all ports to use this. Trim makefile headers. Take maintanership of x11/xcb-proto, ok'd by ashish. If you are running WITH_NEW_XORG=, you need to rebuild all installed drivers, see UPDATING for more information. Various fixes to make ports compile. PR: ports/177942 Exp-run by: miwi Approved by: portmgr (miwi) Thanks to all who helped testing! Added: head/graphics/freeglut/pkg-message (contents, props changed) head/graphics/libdrm/files/extra-configure (contents, props changed) head/graphics/libdrm/files/extra-tests_modetest_Makefile.in (contents, props changed) head/graphics/libdrm/files/extra-tests_modetest_modetest.c (contents, props changed) head/graphics/libdrm/files/extra-tests_modetest_strchrnul.c (contents, props changed) head/x11-drivers/xf86-input-fpit/ head/x11-drivers/xf86-input-fpit/Makefile (contents, props changed) head/x11-drivers/xf86-input-fpit/distinfo (contents, props changed) head/x11-drivers/xf86-input-fpit/pkg-descr (contents, props changed) head/x11-drivers/xf86-input-fpit/pkg-plist (contents, props changed) head/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in (contents, props changed) head/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h (contents, props changed) head/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h (contents, props changed) head/x11-drivers/xf86-input-synaptics/files/ head/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in (contents, props changed) head/x11-drivers/xf86-video-chips/files/ head/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am (contents, props changed) head/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in (contents, props changed) head/x11-drivers/xf86-video-chips/files/patch-util_iopl.h (contents, props changed) head/x11-drivers/xf86-video-intel/files/extra-clang (contents, props changed) head/x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c (contents, props changed) head/x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h (contents, props changed) head/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c (contents, props changed) head/x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c (contents, props changed) head/x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c (contents, props changed) head/x11-servers/xorg-server/files/extra-new-arch-i386 (contents, props changed) head/x11-servers/xorg-server/files/extra-old-arch-i386 (contents, props changed) head/x11-servers/xorg-server/files/extra-os-utils.c (contents, props changed) head/x11-servers/xorg-server/files/extra-servermd.h (contents, props changed) head/x11-wm/icewm/files/patch-src_base.h (contents, props changed) head/x11/libXfixes/files/ head/x11/libXi/files/ head/x11/libXxf86dga/files/ head/x11/libXxf86dga/files/patch-src_XF86DGA2.c (contents, props changed) head/x11/libxcb/manpages (contents, props changed) Deleted: head/devel/libpciaccess/files/patch-src-common_init.c head/devel/libpciaccess/files/patch-src-pciaccess_private.h head/graphics/dri/distinfo head/graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c head/graphics/libGL/files/extra-mach64_context.h head/graphics/libGL/files/extra-sis_context.h head/graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c head/graphics/libGLU/distinfo head/x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c head/x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c head/x11-fonts/libXfont/files/patch-src_fontfile_decompress.c head/x11-servers/xorg-server/files/extra-arch-i386 head/x11-servers/xorg-server/files/extra-dix_events.c head/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h head/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h head/x11-servers/xorg-server/files/extra-patch-os-utils.c head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c head/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c head/x11-servers/xorg-server/files/patch-servermd.h Modified: head/Mk/bsd.port.mk head/Mk/bsd.xorg.mk head/UPDATING head/astro/boinc-astropulse/Makefile head/astro/boinc-setiathome-enhanced/Makefile head/astro/viking/Makefile head/audio/arts/Makefile head/audio/py-karaoke/Makefile head/audio/xmms-curses/Makefile head/audio/xmms-flac/Makefile head/cad/brlcad/Makefile head/cad/openvsp/Makefile head/cad/pdnmesh/Makefile head/cad/repsnapper/Makefile head/comms/efax-gtk/Makefile head/deskutils/nagaina/Makefile head/devel/gccmakedep/Makefile head/devel/imake/Makefile head/devel/imake/distinfo head/devel/imake/files/patch-xmkmf.cpp head/devel/libpciaccess/Makefile head/devel/libpciaccess/distinfo head/devel/libpciaccess/files/patch-src-freebsd_pci.c head/devel/lndir/Makefile head/devel/makedepend/Makefile head/devel/makedepend/distinfo head/devel/xorg-macros/Makefile head/devel/xorg-macros/distinfo head/emulators/catapult/Makefile head/emulators/tme/Makefile head/finance/homebank/Makefile head/games/capitalism/Makefile head/games/gnome-games/Makefile head/games/klavaro/Makefile head/games/spellathon/Makefile head/graphics/clutter-box2d/Makefile head/graphics/converseen/Makefile head/graphics/dri/Makefile head/graphics/dri/pkg-plist head/graphics/eog-plugins/Makefile head/graphics/freeglut/Makefile head/graphics/freeglut/distinfo head/graphics/glfw/Makefile head/graphics/grx/Makefile head/graphics/libGL/Makefile head/graphics/libGL/bsd.mesalib.mk head/graphics/libGL/distinfo head/graphics/libGL/files/extra-configure head/graphics/libGL/pkg-plist head/graphics/libGLU/Makefile head/graphics/libGLw/Makefile head/graphics/libGLw/distinfo head/graphics/libGLw/pkg-plist head/graphics/libdrm/Makefile head/graphics/libdrm/distinfo head/graphics/libdrm/pkg-plist head/graphics/libreatlas/Makefile head/graphics/mesa-demos/Makefile head/graphics/pinpoint/Makefile head/graphics/zbar/Makefile head/japanese/mozc-server/Makefile head/math/xspread/Makefile head/misc/nut/Makefile head/multimedia/clutter-gst/Makefile head/multimedia/freetuxtv/Makefile head/multimedia/vdr-plugin-softhddevice/Makefile head/multimedia/vlc/Makefile head/net-im/empathy/Makefile head/net-p2p/retroshare/Makefile head/net/tigervnc/Makefile head/net/x11vnc/Makefile head/polish/kadu/Makefile head/polish/qnapi/Makefile head/print/photoprint/Makefile head/science/massxpert/Makefile head/sysutils/gsmartcontrol/Makefile head/sysutils/gtk-imonc/Makefile head/sysutils/nitrogen/Makefile head/x11-clocks/oclock/Makefile head/x11-clocks/xclock/Makefile head/x11-drivers/xf86-input-acecad/Makefile head/x11-drivers/xf86-input-egalax/Makefile head/x11-drivers/xf86-input-elographics/Makefile head/x11-drivers/xf86-input-hyperpen/Makefile head/x11-drivers/xf86-input-joystick/Makefile head/x11-drivers/xf86-input-joystick/distinfo head/x11-drivers/xf86-input-keyboard/Makefile head/x11-drivers/xf86-input-keyboard/distinfo head/x11-drivers/xf86-input-magictouch/Makefile head/x11-drivers/xf86-input-mouse/Makefile head/x11-drivers/xf86-input-mouse/distinfo head/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c head/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c head/x11-drivers/xf86-input-mouse/pkg-plist head/x11-drivers/xf86-input-mutouch/Makefile head/x11-drivers/xf86-input-penmount/Makefile head/x11-drivers/xf86-input-synaptics/Makefile head/x11-drivers/xf86-input-synaptics/distinfo head/x11-drivers/xf86-input-synaptics/pkg-plist head/x11-drivers/xf86-input-vmmouse/Makefile head/x11-drivers/xf86-input-vmmouse/distinfo head/x11-drivers/xf86-input-vmmouse/pkg-plist head/x11-drivers/xf86-input-void/Makefile head/x11-drivers/xf86-video-apm/Makefile head/x11-drivers/xf86-video-apm/distinfo head/x11-drivers/xf86-video-ark/Makefile head/x11-drivers/xf86-video-ark/distinfo head/x11-drivers/xf86-video-ati/Makefile head/x11-drivers/xf86-video-ati/distinfo head/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c head/x11-drivers/xf86-video-chips/Makefile head/x11-drivers/xf86-video-chips/distinfo head/x11-drivers/xf86-video-cirrus/Makefile head/x11-drivers/xf86-video-cirrus/distinfo head/x11-drivers/xf86-video-cyrix/Makefile head/x11-drivers/xf86-video-dummy/Makefile head/x11-drivers/xf86-video-dummy/distinfo head/x11-drivers/xf86-video-fbdev/Makefile head/x11-drivers/xf86-video-fbdev/distinfo head/x11-drivers/xf86-video-glint/Makefile head/x11-drivers/xf86-video-glint/distinfo head/x11-drivers/xf86-video-i128/Makefile head/x11-drivers/xf86-video-i128/distinfo head/x11-drivers/xf86-video-i740/Makefile head/x11-drivers/xf86-video-i740/distinfo head/x11-drivers/xf86-video-imstt/Makefile head/x11-drivers/xf86-video-intel/Makefile head/x11-drivers/xf86-video-intel/distinfo head/x11-drivers/xf86-video-intel/files/extra-i915kms head/x11-drivers/xf86-video-mach64/Makefile head/x11-drivers/xf86-video-mach64/distinfo head/x11-drivers/xf86-video-mga/Makefile head/x11-drivers/xf86-video-mga/distinfo head/x11-drivers/xf86-video-neomagic/Makefile head/x11-drivers/xf86-video-neomagic/distinfo head/x11-drivers/xf86-video-newport/Makefile head/x11-drivers/xf86-video-newport/distinfo head/x11-drivers/xf86-video-nouveau/Makefile head/x11-drivers/xf86-video-nv/Makefile head/x11-drivers/xf86-video-nv/distinfo head/x11-drivers/xf86-video-openchrome/Makefile head/x11-drivers/xf86-video-openchrome/distinfo head/x11-drivers/xf86-video-r128/Makefile head/x11-drivers/xf86-video-r128/distinfo head/x11-drivers/xf86-video-rdc/Makefile head/x11-drivers/xf86-video-rendition/Makefile head/x11-drivers/xf86-video-rendition/distinfo head/x11-drivers/xf86-video-s3/Makefile head/x11-drivers/xf86-video-s3/distinfo head/x11-drivers/xf86-video-s3virge/Makefile head/x11-drivers/xf86-video-s3virge/distinfo head/x11-drivers/xf86-video-savage/Makefile head/x11-drivers/xf86-video-savage/distinfo head/x11-drivers/xf86-video-siliconmotion/Makefile head/x11-drivers/xf86-video-siliconmotion/distinfo head/x11-drivers/xf86-video-sis/Makefile head/x11-drivers/xf86-video-sis/distinfo head/x11-drivers/xf86-video-sunffb/Makefile head/x11-drivers/xf86-video-tdfx/Makefile head/x11-drivers/xf86-video-tdfx/distinfo head/x11-drivers/xf86-video-tga/Makefile head/x11-drivers/xf86-video-tga/distinfo head/x11-drivers/xf86-video-trident/Makefile head/x11-drivers/xf86-video-trident/distinfo head/x11-drivers/xf86-video-tseng/Makefile head/x11-drivers/xf86-video-tseng/distinfo head/x11-drivers/xf86-video-vesa/Makefile head/x11-drivers/xf86-video-vesa/distinfo head/x11-drivers/xf86-video-via/Makefile head/x11-drivers/xf86-video-vmware/Makefile head/x11-drivers/xf86-video-vmware/distinfo head/x11-drivers/xf86-video-voodoo/Makefile head/x11-drivers/xf86-video-voodoo/distinfo head/x11-drivers/xorg-drivers/Makefile head/x11-fonts/bdftopcf/Makefile head/x11-fonts/encodings/Makefile head/x11-fonts/font-adobe-100dpi/Makefile head/x11-fonts/font-adobe-75dpi/Makefile head/x11-fonts/font-adobe-utopia-100dpi/Makefile head/x11-fonts/font-adobe-utopia-75dpi/Makefile head/x11-fonts/font-adobe-utopia-type1/Makefile head/x11-fonts/font-alias/Makefile head/x11-fonts/font-arabic-misc/Makefile head/x11-fonts/font-bh-100dpi/Makefile head/x11-fonts/font-bh-75dpi/Makefile head/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile head/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile head/x11-fonts/font-bh-ttf/Makefile head/x11-fonts/font-bh-type1/Makefile head/x11-fonts/font-bitstream-100dpi/Makefile head/x11-fonts/font-bitstream-75dpi/Makefile head/x11-fonts/font-bitstream-speedo/Makefile head/x11-fonts/font-bitstream-type1/Makefile head/x11-fonts/font-cronyx-cyrillic/Makefile head/x11-fonts/font-cursor-misc/Makefile head/x11-fonts/font-daewoo-misc/Makefile head/x11-fonts/font-dec-misc/Makefile head/x11-fonts/font-ibm-type1/Makefile head/x11-fonts/font-isas-misc/Makefile head/x11-fonts/font-jis-misc/Makefile head/x11-fonts/font-micro-misc/Makefile head/x11-fonts/font-misc-cyrillic/Makefile head/x11-fonts/font-misc-ethiopic/Makefile head/x11-fonts/font-misc-meltho/Makefile head/x11-fonts/font-misc-misc/Makefile head/x11-fonts/font-mutt-misc/Makefile head/x11-fonts/font-schumacher-misc/Makefile head/x11-fonts/font-screen-cyrillic/Makefile head/x11-fonts/font-sony-misc/Makefile head/x11-fonts/font-sun-misc/Makefile head/x11-fonts/font-util/Makefile head/x11-fonts/font-winitzki-cyrillic/Makefile head/x11-fonts/font-xfree86-type1/Makefile head/x11-fonts/fontcacheproto/Makefile head/x11-fonts/fontsproto/Makefile head/x11-fonts/fontsproto/distinfo head/x11-fonts/fonttosfnt/Makefile head/x11-fonts/fslsfonts/Makefile head/x11-fonts/libFS/Makefile head/x11-fonts/libFS/distinfo head/x11-fonts/libXfont/Makefile head/x11-fonts/libXfont/distinfo head/x11-fonts/libXfontcache/Makefile head/x11-fonts/libfontenc/Makefile head/x11-fonts/libfontenc/distinfo head/x11-fonts/mkfontdir/Makefile head/x11-fonts/mkfontscale/Makefile head/x11-fonts/showfont/Makefile head/x11-fonts/xf86bigfontproto/Makefile head/x11-fonts/xfontsel/Makefile head/x11-fonts/xfs/Makefile head/x11-fonts/xfs/distinfo head/x11-fonts/xfsinfo/Makefile head/x11-fonts/xlsfonts/Makefile head/x11-fonts/xorg-fonts-100dpi/Makefile head/x11-fonts/xorg-fonts-75dpi/Makefile head/x11-fonts/xorg-fonts-cyrillic/Makefile head/x11-fonts/xorg-fonts-miscbitmaps/Makefile head/x11-fonts/xorg-fonts-truetype/Makefile head/x11-fonts/xorg-fonts-type1/Makefile head/x11-fonts/xorg-fonts/Makefile head/x11-servers/mga_hal/Makefile head/x11-servers/xephyr/Makefile head/x11-servers/xorg-dmx/Makefile head/x11-servers/xorg-dmx/pkg-plist head/x11-servers/xorg-nestserver/Makefile head/x11-servers/xorg-server/Makefile head/x11-servers/xorg-server/distinfo head/x11-servers/xorg-server/files/extra-clang head/x11-servers/xorg-server/pkg-plist head/x11-servers/xorg-vfbserver/Makefile head/x11-themes/xcursor-themes/Makefile head/x11-toolkits/gtkglext/Makefile head/x11-toolkits/libXaw/Makefile head/x11-toolkits/libXaw/distinfo head/x11-toolkits/libXaw/pkg-plist head/x11-toolkits/libXmu/Makefile head/x11-toolkits/libXmu/distinfo head/x11-toolkits/libXt/Makefile head/x11-toolkits/libXt/distinfo head/x11-toolkits/termit/Makefile head/x11-wm/awesome/Makefile head/x11-wm/dwm/Makefile head/x11-wm/echinus/Makefile head/x11-wm/i3/Makefile head/x11-wm/spectrwm/Makefile head/x11-wm/transset/Makefile head/x11-wm/twm/Makefile head/x11-wm/xcompmgr/Makefile head/x11/appres/Makefile head/x11/beforelight/Makefile head/x11/bigreqsproto/Makefile head/x11/bigreqsproto/distinfo head/x11/bitmap/Makefile head/x11/compositeproto/Makefile head/x11/damageproto/Makefile head/x11/dmxproto/Makefile head/x11/dri2proto/Makefile head/x11/dri2proto/distinfo head/x11/editres/Makefile head/x11/evieext/Makefile head/x11/fixesproto/Makefile head/x11/fstobdf/Makefile head/x11/fstobdf/distinfo head/x11/glproto/Makefile head/x11/glproto/distinfo head/x11/i3lock/Makefile head/x11/iceauth/Makefile head/x11/ico/Makefile head/x11/inputproto/Makefile head/x11/inputproto/distinfo head/x11/inputproto/pkg-plist head/x11/kbproto/Makefile head/x11/kbproto/distinfo head/x11/kbproto/pkg-plist head/x11/libICE/Makefile head/x11/libICE/distinfo head/x11/libSM/Makefile head/x11/libSM/distinfo head/x11/libX11/Makefile head/x11/libX11/distinfo head/x11/libXScrnSaver/Makefile head/x11/libXScrnSaver/distinfo head/x11/libXTrap/Makefile head/x11/libXTrap/distinfo head/x11/libXau/Makefile head/x11/libXau/distinfo head/x11/libXcomposite/Makefile head/x11/libXcomposite/distinfo head/x11/libXcomposite/pkg-plist head/x11/libXcursor/Makefile head/x11/libXcursor/distinfo head/x11/libXdamage/Makefile head/x11/libXdamage/distinfo head/x11/libXdamage/pkg-plist head/x11/libXdmcp/Makefile head/x11/libXdmcp/distinfo head/x11/libXevie/Makefile head/x11/libXext/Makefile head/x11/libXext/distinfo head/x11/libXfixes/Makefile head/x11/libXi/Makefile head/x11/libXi/distinfo head/x11/libXinerama/Makefile head/x11/libXinerama/distinfo head/x11/libXp/Makefile head/x11/libXpm/Makefile head/x11/libXpm/distinfo head/x11/libXprintAppUtil/Makefile head/x11/libXprintUtil/Makefile head/x11/libXrandr/Makefile head/x11/libXrandr/distinfo head/x11/libXrender/Makefile head/x11/libXrender/distinfo head/x11/libXres/Makefile head/x11/libXres/distinfo head/x11/libXtrans/Makefile head/x11/libXtst/Makefile head/x11/libXtst/distinfo head/x11/libXv/Makefile head/x11/libXv/distinfo head/x11/libXvMC/Makefile head/x11/libXvMC/distinfo head/x11/libXxf86dga/Makefile head/x11/libXxf86dga/distinfo head/x11/libXxf86misc/Makefile head/x11/libXxf86vm/Makefile head/x11/libXxf86vm/distinfo head/x11/libdmx/Makefile head/x11/libdmx/distinfo head/x11/liboldX/Makefile head/x11/libxcb/Makefile head/x11/libxcb/distinfo head/x11/libxcb/pkg-plist head/x11/libxkbfile/Makefile head/x11/libxkbfile/distinfo head/x11/libxkbui/Makefile head/x11/listres/Makefile head/x11/luit/Makefile head/x11/mkcomposecache/Makefile head/x11/ooxcb/Makefile head/x11/pixman/Makefile head/x11/pixman/distinfo head/x11/printproto/Makefile head/x11/randrproto/Makefile head/x11/randrproto/distinfo head/x11/recordproto/Makefile head/x11/recordproto/distinfo head/x11/renderproto/Makefile head/x11/resourceproto/Makefile head/x11/rstart/Makefile head/x11/scripts/Makefile head/x11/scrnsaverproto/Makefile head/x11/scrnsaverproto/distinfo head/x11/sessreg/Makefile head/x11/slim/Makefile head/x11/smproxy/Makefile head/x11/trapproto/Makefile head/x11/videoproto/Makefile head/x11/viewres/Makefile head/x11/x11perf/Makefile head/x11/xbacklight/Makefile head/x11/xbiff/Makefile head/x11/xbitmaps/Makefile head/x11/xcb-proto/Makefile head/x11/xcb-proto/distinfo head/x11/xcb-util-image/Makefile head/x11/xcb-util-keysyms/Makefile head/x11/xcb-util-renderutil/Makefile head/x11/xcb-util-wm/Makefile head/x11/xcb-util/Makefile head/x11/xclipboard/Makefile head/x11/xcmiscproto/Makefile head/x11/xcmiscproto/distinfo head/x11/xdbedizzy/Makefile head/x11/xditview/Makefile head/x11/xdpyinfo/Makefile head/x11/xdriinfo/Makefile head/x11/xedit/Makefile head/x11/xextproto/Makefile head/x11/xextproto/distinfo head/x11/xeyes/Makefile head/x11/xf86dga/Makefile head/x11/xf86dgaproto/Makefile head/x11/xf86driproto/Makefile head/x11/xf86miscproto/Makefile head/x11/xf86rushproto/Makefile head/x11/xf86vidmodeproto/Makefile head/x11/xfd/Makefile head/x11/xfd/distinfo head/x11/xfindproxy/Makefile head/x11/xfwp/Makefile head/x11/xineramaproto/Makefile head/x11/xinit/Makefile head/x11/xinput/Makefile head/x11/xinput/distinfo head/x11/xkbcomp/Makefile head/x11/xkbprint/Makefile head/x11/xkbutils/Makefile head/x11/xkeyboard-config/Makefile head/x11/xkeyboard-config/distinfo head/x11/xkeyboard-config/pkg-plist head/x11/xkill/Makefile head/x11/xload/Makefile head/x11/xlogo/Makefile head/x11/xlsclients/Makefile head/x11/xmag/Makefile head/x11/xman/Makefile head/x11/xmh/Makefile head/x11/xmore/Makefile head/x11/xnee/Makefile head/x11/xorg-apps/Makefile head/x11/xorg-cf-files/Makefile head/x11/xorg-docs/Makefile head/x11/xorg-docs/distinfo head/x11/xorg-libraries/Makefile head/x11/xorg/Makefile head/x11/xplsprinters/Makefile head/x11/xprehashprinterlist/Makefile head/x11/xprop/Makefile head/x11/xproto/Makefile head/x11/xproto/distinfo head/x11/xproxymanagementprotocol/Makefile head/x11/xpyb/Makefile head/x11/xrandr/Makefile head/x11/xrandr/distinfo head/x11/xrdb/Makefile head/x11/xrefresh/Makefile head/x11/xrx/Makefile head/x11/xset/Makefile head/x11/xsetmode/Makefile head/x11/xsetpointer/Makefile head/x11/xsm/Makefile head/x11/xstdcmap/Makefile head/x11/xtrans/Makefile head/x11/xtrans/distinfo head/x11/xtrans/pkg-plist head/x11/xtrap/Makefile head/x11/xvidtune/Makefile head/x11/xvidtune/distinfo head/x11/xvinfo/Makefile head/x11/xvmcinfo/Makefile head/x11/xwininfo/Makefile head/x11/xwininfo/distinfo Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Sat May 25 14:00:33 2013 (r319054) +++ head/Mk/bsd.port.mk Sat May 25 14:37:02 2013 (r319055) @@ -1903,8 +1903,14 @@ X_FONTS_TYPE1_PORT= ${PORTSDIR}/x11-font X_FONTS_ALIAS_PORT= ${PORTSDIR}/x11-fonts/font-alias .if defined(USE_IMAKE) +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \ + ${OSVERSION} >= 1000010 +CONFIGURE_ENV+= IMAKECPP="gcpp" +MAKE_ENV+= IMAKECPP="gcpp" +.else CONFIGURE_ENV+= IMAKECPP="${CPP}" MAKE_ENV+= IMAKECPP="${CPP}" +.endif MAKE_FLAGS?= CC="${CC}" CXX="${CXX}" BUILD_DEPENDS+= imake:${X_IMAKE_PORT} .endif @@ -1924,8 +1930,10 @@ MAKE_ENV+= DISPLAY="localhost:1001" PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist' _GL_gl_LIB_DEPENDS= GL.1:${PORTSDIR}/graphics/libGL +_GL_gl_USE_XORG= glproto dri2proto _GL_glew_LIB_DEPENDS= GLEW.1:${PORTSDIR}/graphics/glew _GL_glu_LIB_DEPENDS= GLU.1:${PORTSDIR}/graphics/libGLU +_GL_glu_USE_XORG= glproto dri2proto _GL_glw_LIB_DEPENDS= GLw.1:${PORTSDIR}/graphics/libGLw _GL_glut_LIB_DEPENDS= glut.12:${PORTSDIR}/graphics/freeglut _GL_linux_RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri @@ -1939,6 +1947,8 @@ USE_GL= glu !defined(_GL_${_component}_RUN_DEPENDS) IGNORE= uses unknown GL component . else +USE_XORG+= ${_GL_${_component}_USE_XORG} +BUILD_DEPENDS+= ${_GL_${_component}_BUILD_DEPENDS} LIB_DEPENDS+= ${_GL_${_component}_LIB_DEPENDS} RUN_DEPENDS+= ${_GL_${_component}_RUN_DEPENDS} . endif Modified: head/Mk/bsd.xorg.mk ============================================================================== --- head/Mk/bsd.xorg.mk Sat May 25 14:00:33 2013 (r319054) +++ head/Mk/bsd.xorg.mk Sat May 25 14:37:02 2013 (r319055) @@ -17,14 +17,14 @@ Xorg_Pre_Include= bsd.xorg.mk # Some notes: # -# app - requires pkgconfig, don't install shared libraries (I guess) -# data - nothing I could factorize +# app - Installs applications, no shared libraries. +# data - Installs only data. # doc - no particular notes -# driver - input depends on inputproto/renderproto at least +# driver - input depends on inputproto/randrproto at least # video depends on randrproto/renderproto at least # font - don't install .pc file -# lib - various dependencies, install .pc file -# proto - install .pc file, no dependencies, needed only at build time for most of them +# lib - various dependencies, install .pc file, needs pathfix +# proto - install .pc file, needs pathfix, most only needed at build time. # xserver - there's only one atm, I guess everything can fit into the port itself .if defined(XORG_CAT) @@ -38,8 +38,17 @@ DIST_SUBDIR= xorg/${XORG_CAT} MASTER_SITES?= ${MASTER_SITE_XORG} MASTER_SITE_SUBDIR?= individual/${XORG_CAT} +# All xorg ports needs pkgconfig to build, but some ports look for pkgconfig and +# then continues the build. +USES+= pkgconfig + +# All xorg ports needs xorg-macros. +. if ${PORTNAME} != xorg-macros +USE_XORG+= xorg-macros +. endif + . if ${XORG_CAT} == "app" -USE_GNOME+= pkgconfig +# Nothing at the moment . endif . if ${XORG_CAT} == "data" @@ -47,7 +56,6 @@ USE_GNOME+= pkgconfig . endif . if ${XORG_CAT} == "driver" -USE_GNOME+= pkgconfig USE_XORG+= xorg-server xproto randrproto xi # work around a llvm bug on i386, llvm bug #15806 # reproduced with clang 3.2 (current release) and 3.1 @@ -56,11 +64,12 @@ CFLAGS+= -fno-optimize-sibling-calls . endif CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4' . if ${PORTNAME:M*input*}x != x -USE_XORG+= inputproto renderproto +USE_XORG+= inputproto videoproto fontsproto renderproto xextproto \ + dri2proto . elif ${PORTNAME:M*video*}x != x -USE_XORG+= fontsproto renderproto +USE_XORG+= videoproto fontsproto renderproto xextproto dri2proto . else -IGNORE= doesn't contain either "driver" or "input" +IGNORE= doesn't contain either "video" or "input" . endif . endif @@ -84,10 +93,9 @@ INSTALLS_TTF?= no . endif . if ${PORTNAME:M*font-util*}x != x -USE_GNOME+= gnomehack +USES+= pathfix NEED_MKFONTFOO= no . elif ${INSTALLS_TTF} == "yes" -USE_GNOME+= pkgconfig BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig . else @@ -123,23 +131,23 @@ post-install: . endif . if ${XORG_CAT} == "lib" -USE_GNOME+= gnomehack pkgconfig +USES+= pathfix USE_LDCONFIG= yes CONFIGURE_ARGS+=--enable-malloc0returnsnull . endif . if ${XORG_CAT} == "proto" -USE_GNOME+= gnomehack +USES+= pathfix . endif . if ${XORG_CAT} == "xserver" DISTFILES?= xorg-server-${PORTVERSION}.tar.bz2 WRKSRC= ${WRKDIR}/xorg-server-${PORTVERSION} -USE_GNOME+= gnomehack +USES+= pathfix CONFIGURE_ARGS+= --with-xkb-path=${LOCALBASE}/share/X11/xkb LIB_PC_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri -USE_XORG+= pciaccess +USE_XORG+= pciaccess xextproto videoproto fontsproto dri2proto . endif .endif @@ -192,6 +200,7 @@ XORG_MODULES= bigreqsproto \ xaw6 \ xaw7 \ xbitmaps \ + xcb \ xcmiscproto \ xcomposite \ xcursor \ @@ -274,6 +283,7 @@ xaw_LIB_PC_DEPENDS= ${xaw7_LIB_PC_DEPEN xaw6_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xaw6.pc:${PORTSDIR}/x11-toolkits/libXaw xaw7_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xaw7.pc:${PORTSDIR}/x11-toolkits/libXaw xbitmaps_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps +xcb_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb xcmiscproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcmiscproto.pc:${PORTSDIR}/x11/xcmiscproto xcomposite_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite xcursor_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor Modified: head/UPDATING ============================================================================== --- head/UPDATING Sat May 25 14:00:33 2013 (r319054) +++ head/UPDATING Sat May 25 14:37:02 2013 (r319055) @@ -5,6 +5,16 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20130525: + AFFECTS: users of x11/xorg and all xorg ports + AUTHOR zeising@FreeBSD.org + + xorg, including libraries and some drivers, was updated. + If you are running the default xorg distribution, no special upgrade procedure + should be neccessary. + If you are running with WITH_NEW_XORG= make sure to update and rebuild all + installed drivers since xorg-server has been updated. + 20130520: AFFECTS: users of textproc/elasticsearch AUTHOR: tj@FreeBSD.org Modified: head/astro/boinc-astropulse/Makefile ============================================================================== --- head/astro/boinc-astropulse/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/astro/boinc-astropulse/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -43,10 +43,9 @@ X11_DESC= Build screensaver (requires ne .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MX11} -LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \ - xcb:${PORTSDIR}/x11/libxcb +LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg USE_GL= gl glu glut -USE_XORG= ice sm x11 xau xext xi xdamage xdmcp xfixes xmu xt xxf86vm +USE_XORG= ice sm x11 xau xcb xext xi xdamage xdmcp xfixes xmu xt xxf86vm BUILD_DEPENDS+= ${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client PLIST_SUB+= X11="" .else Modified: head/astro/boinc-setiathome-enhanced/Makefile ============================================================================== --- head/astro/boinc-setiathome-enhanced/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/astro/boinc-setiathome-enhanced/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -43,10 +43,9 @@ X11_DESC= Build screensaver (requires ne .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MX11} -LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \ - xcb:${PORTSDIR}/x11/libxcb +LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg USE_GL= gl glu glut -USE_XORG= ice sm x11 xau xext xi xdamage xdmcp xfixes xmu xt xxf86vm +USE_XORG= ice sm x11 xau xcb xext xi xdamage xdmcp xfixes xmu xt xxf86vm BUILD_DEPENDS+= ${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client PLIST_SUB+= X11="" .else Modified: head/astro/viking/Makefile ============================================================================== --- head/astro/viking/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/astro/viking/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -19,14 +19,13 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/d png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ - fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - xcb:${PORTSDIR}/x11/libxcb + fontconfig:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= gpsbabel:${PORTSDIR}/astro/gpsbabel USES= iconv pkgconfig USE_GMAKE= yes GNU_CONFIGURE= yes -USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext \ +USE_XORG= pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xrandr xrender USE_GNOME= desktopfileutils gnomedocutils gtk20 USE_PERL5_RUN= yes Modified: head/audio/arts/Makefile ============================================================================== --- head/audio/arts/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/audio/arts/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -27,8 +27,7 @@ LIB_DEPENDS+= asound:${PORTSDIR}/audio/a png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ - fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - xcb:${PORTSDIR}/x11/libxcb + fontconfig:${PORTSDIR}/x11-fonts/fontconfig DEPRECATED= Depends on QT3; unmaintained EXPIRATION_DATE= 2013-07-01 @@ -40,7 +39,7 @@ USE_QT_VER= 3 USE_BZIP2= yes USE_AUTOTOOLS= libtool USE_GMAKE= yes -USE_XORG= ice sm x11 xau xcursor xdmcp xext xfixes xft xi \ +USE_XORG= ice sm x11 xau xcb xcursor xdmcp xext xfixes xft xi \ xinerama xrandr xrender xt USE_LDCONFIG= yes QTCPPFLAGS+= -L${LOCALBASE}/lib Modified: head/audio/py-karaoke/Makefile ============================================================================== --- head/audio/py-karaoke/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/audio/py-karaoke/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -15,8 +15,7 @@ LICENSE= LGPL21 # (or later) BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ - aa:${PORTSDIR}/graphics/aalib \ - xcb:${PORTSDIR}/x11/libxcb + aa:${PORTSDIR}/graphics/aalib RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \ dejavu>0:${PORTSDIR}/x11-fonts/dejavu \ ${PYNUMPY} @@ -27,7 +26,7 @@ MUTAGEN_DESC= Enable Mutagen support USES= iconv USE_ZIP= yes USE_SDL= sdl -USE_XORG= x11 xau xdmcp +USE_XORG= x11 xau xcb xdmcp USE_WX= 2.6+ WX_COMPS= python:lib Modified: head/audio/xmms-curses/Makefile ============================================================================== --- head/audio/xmms-curses/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/audio/xmms-curses/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -1,9 +1,5 @@ -# New ports collection makefile for: xmms-curses -# Date created: 2007-07-20 -# Whom: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org> -# +# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xmms-curses PORTVERSION= 0.2.2 @@ -16,12 +12,11 @@ COMMENT= A ncurses program for (remote) BUILD_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms -LIB_DEPENDS= pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \ - xcb.2:${PORTSDIR}/x11/libxcb +LIB_DEPENDS= pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs USES= gettext iconv USE_GNOME= gtk12 -USE_XORG= x11 xau xdmcp xext xi +USE_XORG= x11 xau xcb xdmcp xext xi MAN1= ${PORTNAME}.1 Modified: head/audio/xmms-flac/Makefile ============================================================================== --- head/audio/xmms-flac/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/audio/xmms-flac/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -13,13 +13,12 @@ COMMENT= XMMS input plugin for playing F LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \ FLAC.10:${PORTSDIR}/audio/flac \ pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \ - ogg:${PORTSDIR}/audio/libogg \ - xcb.2:${PORTSDIR}/x11/libxcb + ogg:${PORTSDIR}/audio/libogg USE_AUTOTOOLS= libtool USES= gettext iconv USE_GNOME= gtk12 -USE_XORG= x11 xau xdmcp xext xi +USE_XORG= x11 xau xcb xdmcp xext xi CONFIGURE_ARGS= --with-libiconv-prefix="${LOCALBASE}" \ --with-ogg="${LOCALBASE}" \ --with-xmms-prefix="${LOCALBASE}" Modified: head/cad/brlcad/Makefile ============================================================================== --- head/cad/brlcad/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/cad/brlcad/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -18,12 +18,11 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/d rle:${PORTSDIR}/graphics/urt \ freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ - fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - xcb:${PORTSDIR}/x11/libxcb + fontconfig:${PORTSDIR}/x11-fonts/fontconfig USE_BZIP2= yes USE_GL= gl glu -USE_XORG= ice inputproto sm x11 xau xdamage xdmcp xext xfixes xft xi \ +USE_XORG= ice inputproto sm x11 xau xcb xdamage xdmcp xext xfixes xft xi \ xproto xrender xscrnsaver xt xxf86vm USE_GMAKE= yes USES= bison pathfix cmake Modified: head/cad/openvsp/Makefile ============================================================================== --- head/cad/openvsp/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/cad/openvsp/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -16,8 +16,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/d freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - fltk:${PORTSDIR}/x11-toolkits/fltk \ - xcb:${PORTSDIR}/x11/libxcb + fltk:${PORTSDIR}/x11-toolkits/fltk USE_GITHUB= yes GH_PROJECT= OpenVSP @@ -28,7 +27,7 @@ GH_COMMIT= fb52aa2 CMAKE_SOURCE_PATH= ${WRKSRC}/src USES= cmake:outsource iconv USE_DOS2UNIX= yes -USE_XORG= ice sm x11 xau xdamage xdmcp xext xfixes xft \ +USE_XORG= ice sm x11 xau xcb xdamage xdmcp xext xfixes xft \ xinerama xrender xxf86vm USE_GL= glu USE_GNOME= libxml2 Modified: head/cad/pdnmesh/Makefile ============================================================================== --- head/cad/pdnmesh/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/cad/pdnmesh/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -20,8 +20,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/d freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \ - xcb:${PORTSDIR}/x11/libxcb + gtkglext:${PORTSDIR}/x11-toolkits/gtkglext OPTIONS_DEFINE= ATLAS DOCS EXAMPLES ATLAS_DESC= Enable ATLAS support @@ -30,8 +29,8 @@ USES= pkgconfig gettext iconv USE_FORTRAN= yes USE_GL= glu USE_GNOME= gdkpixbuf2 gtk20 -USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \ - xfixes xmu xi xinerama xrandr xrender xt xxf86vm +USE_XORG= ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \ + xext xfixes xmu xi xinerama xrandr xrender xt xxf86vm GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes Modified: head/cad/repsnapper/Makefile ============================================================================== --- head/cad/repsnapper/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/cad/repsnapper/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -32,8 +32,7 @@ LIB_DEPENDS= gtkglext:${PORTSDIR}/x11-to expat:${PORTSDIR}/textproc/expat2 \ xml++-2.6:${PORTSDIR}/textproc/libxml++26 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \ - xcb:${PORTSDIR}/x11/libxcb + pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm MAKE_JOBS_SAFE= yes USES= pkgconfig iconv @@ -41,8 +40,8 @@ USE_GNOME= gdkpixbuf2 gtk20 libxml2 USE_GL= glu glut USE_AUTOTOOLS= automake libtool USE_GMAKE= yes -USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \ - xfixes xi xinerama xmu xrandr xrender xt xxf86vm +USE_XORG= ice pixman sm x11 xau xcb composite xcursor xdamage xdmcp \ + xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm .include <bsd.port.options.mk> Modified: head/comms/efax-gtk/Makefile ============================================================================== --- head/comms/efax-gtk/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/comms/efax-gtk/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -23,8 +23,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/d freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - cxx-gtk-utils-2-2.0:${PORTSDIR}/x11-toolkits/c++-gtk-utils \ - xcb:${PORTSDIR}/x11/libxcb + cxx-gtk-utils-2-2.0:${PORTSDIR}/x11-toolkits/c++-gtk-utils RUN_DEPENDS= ggv:${PORTSDIR}/print/ggv USES= pkgconfig iconv @@ -32,7 +31,7 @@ USE_GHOSTSCRIPT_RUN=yes USE_GNOME= gdkpixbuf2 gtk20 GNU_CONFIGURE= yes USE_GCC= 4.4+ -USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \ +USE_XORG= pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \ xi xinerama xrandr xrender MAKE_JOBS_SAFE= yes Modified: head/deskutils/nagaina/Makefile ============================================================================== --- head/deskutils/nagaina/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/deskutils/nagaina/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -18,8 +18,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/d png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ - fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - xcb:${PORTSDIR}/x11/libxcb + fontconfig:${PORTSDIR}/x11-fonts/fontconfig OPTIONS_DEFINE= DOCS @@ -28,7 +27,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER USES= gettext iconv USE_GNOME= glib20 USE_QT4= corelib gui xml moc_build qmake_build rcc_build uic_build -USE_XORG= ice sm x11 xau xdmcp xext xrender +USE_XORG= ice sm x11 xau xcb xdmcp xext xrender MAKE_JOBS_SAFE= yes PORTDOCS= CHANGELOG TODO Modified: head/devel/gccmakedep/Makefile ============================================================================== --- head/devel/gccmakedep/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/devel/gccmakedep/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -16,16 +16,13 @@ PLIST_FILES= bin/gccmakedep .include <bsd.port.pre.mk> -.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024 -BUILD_DEPENDS+= ucpp:${PORTSDIR}/devel/ucpp -RUN_DEPENDS+= ucpp:${PORTSDIR}/devel/ucpp -CONFIGURE_ENV+= ac_cv_path_RAWCPP="ucpp -s" - -post-build: - ${REINPLACE_CMD} -e 's|^CC= *|CC=|' \ - -e 's|^RM= *|RM=|' \ - -e 's|^LN= *|LN=|' \ - -e 's|^MV= *|MV=|' ${WRKSRC}/gccmakedep +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp. +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \ + ${OSVERSION} >= 1000010 +CONFIGURE_ENV+= ac_cv_path_RAWCPP="gcpp" .endif +post-patch: + @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure + .include <bsd.port.post.mk> Modified: head/devel/imake/Makefile ============================================================================== --- head/devel/imake/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/devel/imake/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -1,8 +1,8 @@ -# Created by: Eric Anholt <ahnholt@FreeBSD.org> +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ PORTNAME= imake -PORTVERSION= 1.0.4 +PORTVERSION= 1.0.5 PORTEPOCH= 1 CATEGORIES= devel @@ -11,13 +11,17 @@ COMMENT= Imake and other utilities from RUN_DEPENDS= gccmakedep:${PORTSDIR}/devel/gccmakedep \ makedepend:${PORTSDIR}/devel/makedepend \ - ${PREFIX}/lib/X11/config/xorg.cf:${PORTSDIR}/x11/xorg-cf-files + ${LOCALBASE}/lib/X11/config/xorg.cf:${PORTSDIR}/x11/xorg-cf-files USE_PERL5= yes XORG_CAT= util USE_XORG= xproto +# clang's cpp destroys whitespace, particularly hard tabs in makefiles, +# which is fatal for imake. +CPPFLAGS+= -DDEFAULT_CC=\\\"gcc\\\" + .ifdef USE_IMAKE .error You have `USE_IMAKE' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif @@ -34,16 +38,14 @@ MAN1= ccmakedep.1 \ post-patch: @${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/mkhtmlindex.pl + @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure .include <bsd.port.pre.mk> -.if defined(CC) && ${CC:T:M*clang*} == "clang" || ${OSVERSION} >= 1000024 -BUILD_DEPENDS+= ucpp:${PORTSDIR}/devel/ucpp -RUN_DEPENDS+= ucpp:${PORTSDIR}/devel/ucpp -CONFIGURE_ENV+= ac_cv_path_RAWCPP="ucpp -s" - -post-build: - ${REINPLACE_CMD} -e 's|^configdirspec= *|configdirspec=|' ${WRKSRC}/xmkmf +# Attempt to force use of GNU cpp, if it is installed as /usr/bin/gcpp. +.if (${OSVERSION} >= 900506 && ${OSVERSION} < 1000000) || \ + ${OSVERSION} >= 1000010 +CONFIGURE_ENV+= ac_cv_path_RAWCPP="gcpp" .endif .include <bsd.port.post.mk> Modified: head/devel/imake/distinfo ============================================================================== --- head/devel/imake/distinfo Sat May 25 14:00:33 2013 (r319054) +++ head/devel/imake/distinfo Sat May 25 14:37:02 2013 (r319055) @@ -1,2 +1,2 @@ -SHA256 (xorg/util/imake-1.0.4.tar.bz2) = acb27ff09e3083000441a8d555fbedbf35ecb4ad52d2bd5b8680dce853f146fe -SIZE (xorg/util/imake-1.0.4.tar.bz2) = 140773 +SHA256 (xorg/util/imake-1.0.5.tar.bz2) = 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1 +SIZE (xorg/util/imake-1.0.5.tar.bz2) = 148503 Modified: head/devel/imake/files/patch-xmkmf.cpp ============================================================================== --- head/devel/imake/files/patch-xmkmf.cpp Sat May 25 14:00:33 2013 (r319054) +++ head/devel/imake/files/patch-xmkmf.cpp Sat May 25 14:37:02 2013 (r319055) @@ -1,17 +1,6 @@ ---- work/imake-1.0.2/xmkmf.cpp 2004-04-23 18:42:00.000000000 +0000 -+++ xmkmf.cpp 2009-12-14 20:51:01.695597560 +0000 -@@ -53,6 +53,10 @@ - args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir" - fi - -+if [ -n "$CPP" -a -z "$IMAKECPP" ];then -+ export IMAKECPP=$CPP -+fi -+ - echo imake $imake_defines $args - case "$do_all" in - yes) -@@ -68,3 +72,12 @@ +--- xmkmf.cpp.orig 2012-03-08 06:47:32.000000000 +0100 ++++ xmkmf.cpp 2013-03-17 22:53:14.000000000 +0100 +@@ -64,3 +64,12 @@ imake $imake_defines $args ;; esac Modified: head/devel/libpciaccess/Makefile ============================================================================== --- head/devel/libpciaccess/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/devel/libpciaccess/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -1,19 +1,14 @@ -# New ports collection makefile for: libpciaccess -# Date Created: May 11 2008 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= libpciaccess -PORTVERSION= 0.12.1 +PORTVERSION= 0.13.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= x11@FreeBSD.org COMMENT= Generic PCI access library BUILD_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids -# XXX - Is it a runtime dep too? RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids CONFIGURE_ARGS+= --with-pciids-path=${LOCALBASE}/share/pciids Modified: head/devel/libpciaccess/distinfo ============================================================================== --- head/devel/libpciaccess/distinfo Sat May 25 14:00:33 2013 (r319054) +++ head/devel/libpciaccess/distinfo Sat May 25 14:37:02 2013 (r319055) @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libpciaccess-0.12.1.tar.bz2) = cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344 -SIZE (xorg/lib/libpciaccess-0.12.1.tar.bz2) = 326217 +SHA256 (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084 +SIZE (xorg/lib/libpciaccess-0.13.1.tar.bz2) = 352351 Modified: head/devel/libpciaccess/files/patch-src-freebsd_pci.c ============================================================================== --- head/devel/libpciaccess/files/patch-src-freebsd_pci.c Sat May 25 14:00:33 2013 (r319054) +++ head/devel/libpciaccess/files/patch-src-freebsd_pci.c Sat May 25 14:37:02 2013 (r319055) @@ -1,113 +1,169 @@ ---- src/freebsd_pci.c.orig 2009-05-07 10:35:59.000000000 -0500 -+++ src/freebsd_pci.c 2009-05-07 10:36:10.000000000 -0500 -@@ -72,6 +72,10 @@ - #define PCIM_BAR_MEM_SPACE 0 - #define PCIM_BAR_IO_SPACE 1 +--- src/freebsd_pci.c.orig 2012-04-09 13:02:57.000000000 -0400 ++++ src/freebsd_pci.c 2013-04-16 02:19:10.000000000 -0400 +@@ -1,6 +1,8 @@ + /* + * (C) Copyright Eric Anholt 2006 + * (C) Copyright IBM Corporation 2006 ++ * (C) Copyright Mark Kettenis 2011 ++ * (C) Copyright Robert Millan 2012 + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a +@@ -561,6 +563,138 @@ + freebsd_pci_sys = NULL; + } -+#if defined(__sparc64__) -+static int screenfd; ++#if defined(__i386__) || defined(__amd64__) ++#include <machine/cpufunc.h> +#endif + - /** - * FreeBSD private pci_system structure that extends the base pci_system - * structure. -@@ -103,12 +107,18 @@ - { - const int prot = ((map->flags & PCI_DEV_MAP_FLAG_WRITABLE) != 0) - ? (PROT_READ | PROT_WRITE) : PROT_READ; -+#if !defined(__sparc64__) - struct mem_range_desc mrd; - struct mem_range_op mro; -+#endif - - int fd, err = 0; - -+#if defined(__sparc64__) -+ fd = screenfd; ++static struct pci_io_handle * ++pci_device_freebsd_open_legacy_io(struct pci_io_handle *ret, ++ struct pci_device *dev, pciaddr_t base, pciaddr_t size) ++{ ++#if defined(__i386__) || defined(__amd64__) ++ ret->fd = open("/dev/io", O_RDWR | O_CLOEXEC); ++ ++ if (ret->fd < 0) ++ return NULL; ++ ++ ret->base = base; ++ ret->size = size; ++ return ret; ++#elif defined(PCI_MAGIC_IO_RANGE) ++ ret->memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, ++ aperturefd, PCI_MAGIC_IO_RANGE + base); ++ if (ret->memory == MAP_FAILED) ++ return NULL; ++ ++ ret->base = base; ++ ret->size = size; ++ return ret; +#else - fd = open("/dev/mem", O_RDWR); ++ return NULL; +#endif - if (fd == -1) - return errno; - -@@ -118,6 +128,7 @@ - err = errno; - } - -+#if !defined(__sparc64__) - mrd.mr_base = map->base; - mrd.mr_len = map->size; - strncpy(mrd.mr_owner, "pciaccess", sizeof(mrd.mr_owner)); -@@ -138,6 +149,7 @@ - } - - close(fd); ++} ++ ++#if defined(__i386__) || defined(__amd64__) ++static void ++pci_device_freebsd_close_io(struct pci_device *dev, struct pci_io_handle *handle) ++{ ++ if (handle->fd > -1) ++ close(handle->fd); ++} +#endif - - return err; - } -@@ -146,6 +158,7 @@ - pci_device_freebsd_unmap_range( struct pci_device *dev, - struct pci_device_mapping *map ) - { -+#if !defined(__sparc64__) - struct mem_range_desc mrd; - struct mem_range_op mro; - int fd; -@@ -171,6 +184,7 @@ - fprintf(stderr, "Failed to open /dev/mem\n"); - } - } ++ ++static uint32_t ++pci_device_freebsd_read32(struct pci_io_handle *handle, uint32_t reg) ++{ ++#if defined(__i386__) || defined(__amd64__) ++ return inl(handle->base + reg); ++#else ++ return *(uint32_t *)((uintptr_t)handle->memory + reg); +#endif - - return pci_device_generic_unmap_range(dev, map); - } -@@ -293,20 +307,28 @@ - } - - printf("Using rom_base = 0x%lx\n", (long)rom_base); -+#if defined(__sparc64__) -+ memfd = screenfd; ++} ++ ++static uint16_t ++pci_device_freebsd_read16(struct pci_io_handle *handle, uint32_t reg) ++{ ++#if defined(__i386__) || defined(__amd64__) ++ return inw(handle->base + reg); +#else - memfd = open( "/dev/mem", O_RDONLY ); ++ return *(uint16_t *)((uintptr_t)handle->memory + reg); +#endif - if ( memfd == -1 ) - return errno; - - bios = mmap( NULL, dev->rom_size, PROT_READ, 0, memfd, rom_base ); - if ( bios == MAP_FAILED ) { -+#if !defined(__sparc64__) - close( memfd ); ++} ++ ++static uint8_t ++pci_device_freebsd_read8(struct pci_io_handle *handle, uint32_t reg) ++{ ++#if defined(__i386__) || defined(__amd64__) ++ return inb(handle->base + reg); ++#else ++ return *(uint8_t *)((uintptr_t)handle->memory + reg); +#endif - return errno; - } - - memcpy( buffer, bios, dev->rom_size ); - - munmap( bios, dev->rom_size ); -+#if !defined(__sparc64__) - close( memfd ); ++} ++ ++static void ++pci_device_freebsd_write32(struct pci_io_handle *handle, uint32_t reg, ++ uint32_t data) ++{ ++#if defined(__i386__) || defined(__amd64__) ++ outl(handle->base + reg, data); ++#else ++ *(uint16_t *)((uintptr_t)handle->memory + reg) = data; +#endif - - if (pci_rom) { - pci_device_cfg_write_u32( dev, PCIR_BIOS, rom ); -@@ -341,7 +363,6 @@ - static int - pci_device_freebsd_probe( struct pci_device * dev ) - { -- struct pci_device_private *priv = (struct pci_device_private *) dev; - struct pci_bar_io bar; - uint8_t irq; - int err, i; -@@ -644,3 +665,11 @@ - - return 0; - } ++} ++ ++static void ++pci_device_freebsd_write16(struct pci_io_handle *handle, uint32_t reg, ++ uint16_t data) ++{ ++#if defined(__i386__) || defined(__amd64__) ++ outw(handle->base + reg, data); ++#else ++ *(uint8_t *)((uintptr_t)handle->memory + reg) = data; ++#endif ++} + -+void -+pci_system_freebsd_init_dev_mem(int fd) ++static void ++pci_device_freebsd_write8(struct pci_io_handle *handle, uint32_t reg, ++ uint8_t data) +{ -+#if defined(__sparc64__) -+ screenfd = fd; ++#if defined(__i386__) || defined(__amd64__) ++ outb(handle->base + reg, data); ++#else ++ *(uint32_t *)((uintptr_t)handle->memory + reg) = data; +#endif +} ++ ++static int ++pci_device_freebsd_map_legacy(struct pci_device *dev, pciaddr_t base, ++ pciaddr_t size, unsigned map_flags, void **addr) ++{ ++ struct pci_device_mapping map; ++ int err; ++ ++ map.base = base; ++ map.size = size; ++ map.flags = map_flags; ++ map.memory = NULL; ++ err = pci_device_freebsd_map_range(dev, &map); ++ *addr = map.memory; ++ ++ return err; ++} ++ ++static int ++pci_device_freebsd_unmap_legacy(struct pci_device *dev, void *addr, ++ pciaddr_t size) ++{ ++ struct pci_device_mapping map; ++ ++ map.memory = addr; ++ map.size = size; ++ map.flags = 0; ++ return pci_device_freebsd_unmap_range(dev, &map); ++} ++ + static const struct pci_system_methods freebsd_pci_methods = { + .destroy = pci_system_freebsd_destroy, + .destroy_device = NULL, /* nothing to do for this */ +@@ -571,6 +705,18 @@ + .read = pci_device_freebsd_read, + .write = pci_device_freebsd_write, + .fill_capabilities = pci_fill_capabilities_generic, ++ .open_legacy_io = pci_device_freebsd_open_legacy_io, ++#if defined(__i386__) || defined(__amd64__) ++ .close_io = pci_device_freebsd_close_io, ++#endif ++ .read32 = pci_device_freebsd_read32, ++ .read16 = pci_device_freebsd_read16, ++ .read8 = pci_device_freebsd_read8, ++ .write32 = pci_device_freebsd_write32, ++ .write16 = pci_device_freebsd_write16, ++ .write8 = pci_device_freebsd_write8, ++ .map_legacy = pci_device_freebsd_map_legacy, ++ .unmap_legacy = pci_device_freebsd_unmap_legacy, + }; + + /** Modified: head/devel/lndir/Makefile ============================================================================== --- head/devel/lndir/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/devel/lndir/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -9,7 +9,7 @@ MAINTAINER= unixmania@gmail.com COMMENT= Create a shadow directory of symbolic links to another directory tree XORG_CAT= util -USE_XORG= xproto xorg-macros +USE_XORG= xproto PLIST_FILES= bin/lndir Modified: head/devel/makedepend/Makefile ============================================================================== --- head/devel/makedepend/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/devel/makedepend/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -1,20 +1,15 @@ -# New ports collection makefile for: makedepend -# Date created: August 15th 1997 -# Whom: Ian Vaudrey <i.vaudrey@bigfoot.com> -# +# Created by: Ian Vaudrey <i.vaudrey@bigfoot.com> # $FreeBSD$ -# PORTNAME= makedepend -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 PORTEPOCH= 1 CATEGORIES= devel MAINTAINER= x11@FreeBSD.org -COMMENT= A dependency generator for makefiles +COMMENT= Dependency generator for makefiles XORG_CAT= util -USE_GNOME= pkgconfig USE_XORG= xproto PLIST_FILES= bin/makedepend Modified: head/devel/makedepend/distinfo ============================================================================== --- head/devel/makedepend/distinfo Sat May 25 14:00:33 2013 (r319054) +++ head/devel/makedepend/distinfo Sat May 25 14:37:02 2013 (r319055) @@ -1,2 +1,2 @@ -SHA256 (xorg/util/makedepend-1.0.3.tar.bz2) = 3a251d30e567e4eab109be486918887635e08963195b80d193f0ee65cef8b737 -SIZE (xorg/util/makedepend-1.0.3.tar.bz2) = 123703 +SHA256 (xorg/util/makedepend-1.0.4.tar.bz2) = ab56b8aeee00ed78d93c57d102e33ef4e6828ef5edd7108574966ed7d212f7fe +SIZE (xorg/util/makedepend-1.0.4.tar.bz2) = 131683 Modified: head/devel/xorg-macros/Makefile ============================================================================== --- head/devel/xorg-macros/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/devel/xorg-macros/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -1,12 +1,8 @@ -# New ports collection makefile for: xorg-macros -# Date Created: 24 Mar 2007 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xorg-macros -PORTVERSION= 1.16.1 +PORTVERSION= 1.17 CATEGORIES= devel x11 DISTNAME= util-macros-$(PORTVERSION) Modified: head/devel/xorg-macros/distinfo ============================================================================== --- head/devel/xorg-macros/distinfo Sat May 25 14:00:33 2013 (r319054) +++ head/devel/xorg-macros/distinfo Sat May 25 14:37:02 2013 (r319055) @@ -1,2 +1,2 @@ -SHA256 (xorg/util/util-macros-1.16.1.tar.bz2) = cd21cb32592644065b70a7d2ceeedad49ab231651599c74b3fd2c7343f6be933 -SIZE (xorg/util/util-macros-1.16.1.tar.bz2) = 75404 +SHA256 (xorg/util/util-macros-1.17.tar.bz2) = 7d79edde72fc17dcdc56cfbe2f8ff384d1bffd1d8c58c0fd25970f5b2ccb75ed +SIZE (xorg/util/util-macros-1.17.tar.bz2) = 77029 Modified: head/emulators/catapult/Makefile ============================================================================== --- head/emulators/catapult/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/emulators/catapult/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -24,8 +24,7 @@ LIB_DEPENDS= mspack:${PORTSDIR}/archiver tiff:${PORTSDIR}/graphics/tiff \ freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ - fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - xcb:${PORTSDIR}/x11/libxcb + fontconfig:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= openmsx:${PORTSDIR}/emulators/openmsx OPTIONS_DEFINE= DEBUG DOCS @@ -35,7 +34,7 @@ USE_WX= 2.6+ USE_PYTHON_BUILD=yes USE_GMAKE= yes USES= gettext iconv -USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp \ +USE_XORG= ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \ xext xfixes xi xinerama xrandr xrender xxf86vm MAKEFILE= GNUmakefile MAKE_ARGS= INSTALL_BASE="${PREFIX}" \ Modified: head/emulators/tme/Makefile ============================================================================== --- head/emulators/tme/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/emulators/tme/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -19,8 +19,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/d png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ - fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - xcb:${PORTSDIR}/x11/libxcb + fontconfig:${PORTSDIR}/x11-fonts/fontconfig USES= pkgconfig gettext iconv USE_GNOME= gdkpixbuf2 gtk20 @@ -29,7 +28,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool libltdl CONFIGURE_ENV= ac_cv_have_isinff=no CONFIGURE_ARGS= --datadir=${WRKDIR}/tmproot --disable-warnings -USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \ +USE_XORG= pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \ xi xinerama xrandr xrender USE_LDCONFIG= yes MAKE_ENV= LANG=C Modified: head/finance/homebank/Makefile ============================================================================== --- head/finance/homebank/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/finance/homebank/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -17,14 +17,13 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/d freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ osp:${PORTSDIR}/textproc/opensp \ - xcb:${PORTSDIR}/x11/libxcb \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig GNU_CONFIGURE= yes USE_GMAKE= yes USES= gettext iconv -USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \ - xi xinerama xrandr xrender +USE_XORG= pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ + xfixes xi xinerama xrandr xrender USE_GNOME= desktopfileutils gnomehier gtk20 INSTALLS_ICONS= yes Modified: head/games/capitalism/Makefile ============================================================================== --- head/games/capitalism/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/games/capitalism/Makefile Sat May 25 14:37:02 2013 (r319055) @@ -18,13 +18,12 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/d png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ - fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - xcb:${PORTSDIR}/x11/libxcb + fontconfig:${PORTSDIR}/x11-fonts/fontconfig WRKSRC= ${WRKDIR}/Capitalism-${PORTVERSION} USES= iconv -USE_XORG= ice sm x11 xau xdmcp xext xrender +USE_XORG= ice sm x11 xau xcb xdmcp xext xrender USE_QT4= moc_build qmake_build rcc_build uic_build iconengines imageformats \ corelib gui network script xml MAKE_JOBS_SAFE= yes Modified: head/games/gnome-games/Makefile ============================================================================== --- head/games/gnome-games/Makefile Sat May 25 14:00:33 2013 (r319054) +++ head/games/gnome-games/Makefile Sat May 25 14:37:02 2013 (r319055) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed got already committed.