diff options
| author | zeising <zeising@FreeBSD.org> | 2013-05-25 14:37:02 +0000 |
|---|---|---|
| committer | zeising <zeising@FreeBSD.org> | 2013-05-25 14:37:02 +0000 |
| commit | 715298b528f23a6a763e28623a4c98f1365c81ce (patch) | |
| tree | cf13f962932aab3646f0af684b2923c4e0f0825b | |
| parent | 0f8e632e50d273ba38d9d13f7e446a4a10d95cd4 (diff) | |
| download | FreeBSD-ports-715298b528f23a6a763e28623a4c98f1365c81ce.zip FreeBSD-ports-715298b528f23a6a763e28623a4c98f1365c81ce.tar.gz | |
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!
507 files changed, 4196 insertions, 2853 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 7799087..ff47322 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1903,8 +1903,14 @@ X_FONTS_TYPE1_PORT= ${PORTSDIR}/x11-fonts/xorg-fonts-type1 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 diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk index de2736f..951f092a 100644 --- a/Mk/bsd.xorg.mk +++ b/Mk/bsd.xorg.mk @@ -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_DEPENDS} 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 @@ -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 diff --git a/astro/boinc-astropulse/Makefile b/astro/boinc-astropulse/Makefile index c511d63..7986454 100644 --- a/astro/boinc-astropulse/Makefile +++ b/astro/boinc-astropulse/Makefile @@ -43,10 +43,9 @@ X11_DESC= Build screensaver (requires net/boinc-client with X11) .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 diff --git a/astro/boinc-setiathome-enhanced/Makefile b/astro/boinc-setiathome-enhanced/Makefile index b58bd4a..d6c057a 100644 --- a/astro/boinc-setiathome-enhanced/Makefile +++ b/astro/boinc-setiathome-enhanced/Makefile @@ -43,10 +43,9 @@ X11_DESC= Build screensaver (requires net/boinc-client with X11) .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 diff --git a/astro/viking/Makefile b/astro/viking/Makefile index eae980a..de7622e 100644 --- a/astro/viking/Makefile +++ b/astro/viking/Makefile @@ -19,14 +19,13 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ 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 diff --git a/audio/arts/Makefile b/audio/arts/Makefile index c9c5862..a2735b5 100644 --- a/audio/arts/Makefile +++ b/audio/arts/Makefile @@ -27,8 +27,7 @@ LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib \ 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 diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile index b7580f0..4ab1805 100644 --- a/audio/py-karaoke/Makefile +++ b/audio/py-karaoke/Makefile @@ -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 diff --git a/audio/xmms-curses/Makefile b/audio/xmms-curses/Makefile index f94856bc..0cfd016 100644 --- a/audio/xmms-curses/Makefile +++ b/audio/xmms-curses/Makefile @@ -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) controlling multimedia/xmms 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 diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile index 4bcad5c..fb7b4a9 100644 --- a/audio/xmms-flac/Makefile +++ b/audio/xmms-flac/Makefile @@ -13,13 +13,12 @@ COMMENT= XMMS input plugin for playing FLAC files 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}" diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile index 6321ae5..3327c7c 100644 --- a/cad/brlcad/Makefile +++ b/cad/brlcad/Makefile @@ -18,12 +18,11 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ 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 diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile index 3cb4c3b..bfe6988 100644 --- a/cad/openvsp/Makefile +++ b/cad/openvsp/Makefile @@ -16,8 +16,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ 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 diff --git a/cad/pdnmesh/Makefile b/cad/pdnmesh/Makefile index 347f790..393d241 100644 --- a/cad/pdnmesh/Makefile +++ b/cad/pdnmesh/Makefile @@ -20,8 +20,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ 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 diff --git a/cad/repsnapper/Makefile b/cad/repsnapper/Makefile index 17b5341..db15d22 100644 --- a/cad/repsnapper/Makefile +++ b/cad/repsnapper/Makefile @@ -32,8 +32,7 @@ LIB_DEPENDS= gtkglext:${PORTSDIR}/x11-toolkits/gtkglext \ 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> diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile index 59e5479..f3e2d03 100644 --- a/comms/efax-gtk/Makefile +++ b/comms/efax-gtk/Makefile @@ -23,8 +23,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ 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 diff --git a/deskutils/nagaina/Makefile b/deskutils/nagaina/Makefile index 27dfaf2..d46d175 100644 --- a/deskutils/nagaina/Makefile +++ b/deskutils/nagaina/Makefile @@ -18,8 +18,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ 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}-${PORTVERSION} 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 diff --git a/devel/gccmakedep/Makefile b/devel/gccmakedep/Makefile index 577fd03..07c3ef3 100644 --- a/devel/gccmakedep/Makefile +++ b/devel/gccmakedep/Makefile @@ -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> diff --git a/devel/imake/Makefile b/devel/imake/Makefile index ba6d0eb..a91239b 100644 --- a/devel/imake/Makefile +++ b/devel/imake/Makefile @@ -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 X.Org 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> diff --git a/devel/imake/distinfo b/devel/imake/distinfo index 1e2fe2c..cfd49ab 100644 --- a/devel/imake/distinfo +++ b/devel/imake/distinfo @@ -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 diff --git a/devel/imake/files/patch-xmkmf.cpp b/devel/imake/files/patch-xmkmf.cpp index a08866e..94a2383 100644 --- a/devel/imake/files/patch-xmkmf.cpp +++ b/devel/imake/files/patch-xmkmf.cpp @@ -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 diff --git a/devel/libpciaccess/Makefile b/devel/libpciaccess/Makefile index 3954d51..77cd8ea 100644 --- a/devel/libpciaccess/Makefile +++ b/devel/libpciaccess/Makefile @@ -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 diff --git a/devel/libpciaccess/distinfo b/devel/libpciaccess/distinfo index dd572d7..b6ce660 100644 --- a/devel/libpciaccess/distinfo +++ b/devel/libpciaccess/distinfo @@ -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 diff --git a/devel/libpciaccess/files/patch-src-common_init.c b/devel/libpciaccess/files/patch-src-common_init.c deleted file mode 100644 index d8028b2..0000000 --- a/devel/libpciaccess/files/patch-src-common_init.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/common_init.c.orig 2008-10-11 18:31:00.000000000 +0000 -+++ src/common_init.c 2009-03-29 20:10:52.000000000 +0000 -@@ -70,7 +70,9 @@ - void - pci_system_init_dev_mem(int fd) - { --#ifdef __OpenBSD__ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -+ pci_system_freebsd_init_dev_mem(fd); -+#elif defined(__OpenBSD__) - pci_system_openbsd_init_dev_mem(fd); - #endif - } diff --git a/devel/libpciaccess/files/patch-src-freebsd_pci.c b/devel/libpciaccess/files/patch-src-freebsd_pci.c index 617c011..45eb6dc 100644 --- a/devel/libpciaccess/files/patch-src-freebsd_pci.c +++ b/devel/libpciaccess/files/patch-src-freebsd_pci.c @@ -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, + }; + + /** diff --git a/devel/libpciaccess/files/patch-src-pciaccess_private.h b/devel/libpciaccess/files/patch-src-pciaccess_private.h deleted file mode 100644 index 2d9cb99..0000000 --- a/devel/libpciaccess/files/patch-src-pciaccess_private.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/pciaccess_private.h.orig 2008-10-11 18:31:00.000000000 +0000 -+++ src/pciaccess_private.h 2009-03-29 20:07:50.000000000 +0000 -@@ -136,6 +136,7 @@ - - extern int pci_system_linux_sysfs_create( void ); - extern int pci_system_freebsd_create( void ); -+extern void pci_system_freebsd_init_dev_mem( int ); - extern int pci_system_netbsd_create( void ); - extern int pci_system_openbsd_create( void ); - extern void pci_system_openbsd_init_dev_mem( int ); diff --git a/devel/lndir/Makefile b/devel/lndir/Makefile index c915e5a..6e69b0d 100644 --- a/devel/lndir/Makefile +++ b/devel/lndir/Makefile @@ -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 diff --git a/devel/makedepend/Makefile b/devel/makedepend/Makefile index 4f6e0f8..0e57b8c 100644 --- a/devel/makedepend/Makefile +++ b/devel/makedepend/Makefile @@ -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 diff --git a/devel/makedepend/distinfo b/devel/makedepend/distinfo index 5fce726..40664c9 100644 --- a/devel/makedepend/distinfo +++ b/devel/makedepend/distinfo @@ -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 diff --git a/devel/xorg-macros/Makefile b/devel/xorg-macros/Makefile index 634a584..15c8dd9 100644 --- a/devel/xorg-macros/Makefile +++ b/devel/xorg-macros/Makefile @@ -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) diff --git a/devel/xorg-macros/distinfo b/devel/xorg-macros/distinfo index cca65f0..b97705c 100644 --- a/devel/xorg-macros/distinfo +++ b/devel/xorg-macros/distinfo @@ -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 diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile index bb942bc..47a048b 100644 --- a/emulators/catapult/Makefile +++ b/emulators/catapult/Makefile @@ -24,8 +24,7 @@ LIB_DEPENDS= mspack:${PORTSDIR}/archivers/libmspack \ 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}" \ diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile index 9a67841..16671e2 100644 --- a/emulators/tme/Makefile +++ b/emulators/tme/Makefile @@ -19,8 +19,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ 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 diff --git a/finance/homebank/Makefile b/finance/homebank/Makefile index a453673..f8d933a 100644 --- a/finance/homebank/Makefile +++ b/finance/homebank/Makefile @@ -17,14 +17,13 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ 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 diff --git a/games/capitalism/Makefile b/games/capitalism/Makefile index ab295af..32b6a2e 100644 --- a/games/capitalism/Makefile +++ b/games/capitalism/Makefile @@ -18,13 +18,12 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ 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 diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 472e1a3..d45af14 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -4,7 +4,7 @@ PORTNAME= gnome-games PORTVERSION= 2.32.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -25,6 +25,7 @@ USE_PYTHON= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_GMAKE= yes +USE_GL= gl USES= pathfix gettext USE_GNOME= gnomeprefix intlhack librsvg2 desktopfileutils \ pygnomedesktop gnomedocutils diff --git a/games/klavaro/Makefile b/games/klavaro/Makefile index 9fedf73..87bd222 100644 --- a/games/klavaro/Makefile +++ b/games/klavaro/Makefile @@ -19,13 +19,12 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox \ - xcb:${PORTSDIR}/x11/libxcb + gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox USES= pkgconfig gettext iconv USE_BZIP2= yes USE_GMAKE= 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= gtk20 USE_LDCONFIG= yes diff --git a/games/spellathon/Makefile b/games/spellathon/Makefile index 3b8c885..a84e1ef 100644 --- a/games/spellathon/Makefile +++ b/games/spellathon/Makefile @@ -17,14 +17,13 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ 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 CXXFLAGS+= -fPIC USES= gettext iconv USE_GNOME= glib20 USE_QT4= corelib gui 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 USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes diff --git a/graphics/clutter-box2d/Makefile b/graphics/clutter-box2d/Makefile index e324f21..2877264 100644 --- a/graphics/clutter-box2d/Makefile +++ b/graphics/clutter-box2d/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: clutter-box2d -# Date created: 2008-12-25 -# Whom: Martin Wilke <miwi@FreeBSD.org> -# +# Created by: Martin Wilke <miwi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= clutter-box2d PORTVERSION= 0.10.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://source.clutter-project.org/sources/${PORTNAME}/0.10/ @@ -18,12 +14,14 @@ LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter USE_GMAKE= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack ltverhack gnomeprefix +USES= pathfix +USE_GNOME= ltverhack gnomeprefix +USE_GL= gl USE_XORG= xp x11 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-introspection=no -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/graphics/converseen/Makefile b/graphics/converseen/Makefile index 772000b..81a74bf 100644 --- a/graphics/converseen/Makefile +++ b/graphics/converseen/Makefile @@ -18,13 +18,12 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ fftw3:${PORTSDIR}/math/fftw3 \ freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ - xcb:${PORTSDIR}/x11/libxcb \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig USE_BZIP2= yes USE_AUTOTOOLS= libltdl USES= cmake gettext iconv -USE_XORG= ice sm x11 xau xdmcp xext xrender xt +USE_XORG= ice sm x11 xau xcb xdmcp xext xrender xt USE_QT4= corelib gui linguist_build moc_build qmake_build \ rcc_build uic_build USE_GNOME= glib20 diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile index de1200f..9407bd1 100644 --- a/graphics/dri/Makefile +++ b/graphics/dri/Makefile @@ -1,4 +1,4 @@ -# Created by: anholt@FreeBSD.org +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ PORTNAME= dri @@ -10,27 +10,30 @@ CATEGORIES= graphics COMMENT= OpenGL hardware acceleration drivers for the DRI LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm \ - expat.6:${PORTSDIR}/textproc/expat2 + expat:${PORTSDIR}/textproc/expat2 USES= pkgconfig USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto -ALL_DRI_DRIVERS=I810 I915 I965 MACH64 MGA R128 R200 R300 R600 RADEON \ - SAVAGE SIS SWRAST TDFX UNICHROME +ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST + +.if ! defined(WITH_NEW_XORG) +ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME +.endif .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" -.if ${ARCH} == "ia64" -BROKEN= does not install on ia64 -.endif +OPTIONS_DEFINE_i386= ${ALL_DRI_DRIVERS} +OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386} -.if ${ARCH} == "amd64" || ${ARCH} == "i386" -OPTIONS_DEFINE= ${ALL_DRI_DRIVERS} -.elif ${ARCH} == "powerpc" -OPTIONS_DEFINE= MACH64 RADEON SWRAST TDFX -.elif ${ARCH} == "sparc64" -OPTIONS_DEFINE= MACH64 RADEON SWRAST +.if defined(WITH_NEW_XORG) +OPTIONS_DEFINE_powerpc= RADEON SWRAST +OPTIONS_DEFINE_sparc64= RADEON SWRAST +.else +OPTIONS_DEFINE_powerpc= MACH64 RADEON SWRAST TDFX +OPTIONS_DEFINE_sparc64= MACH64 RADEON SWRAST .endif + OPTIONS_DEFAULT=${OPTIONS_DEFINE} I810_DESC= Include DRI support for Intel i810 @@ -42,7 +45,7 @@ R128_DESC= Include DRI support for AMD/ATI R128 R200_DESC= Include DRI support for AMD/ATI R200 R300_DESC= Include DRI support for AMD/ATI R300 R600_DESC= Include DRI support for AMD/ATI R600 -RADEON_DESC= Include DRI support for AMD/ATI R100 +RADEON_DESC= Include DRI support for AMD/ATI RADEON SAVAGE_DESC= Include DRI support for S3/Via Savage SIS_DESC= Include DRI support for SiS 300 and 6326 SWRAST_DESC= Include generic software DRI support @@ -61,7 +64,9 @@ PLIST_SUB+= ${_d}_DRIVER="@comment " .endif .endfor -.include <bsd.port.pre.mk> +.if ${ARCH} == "ia64" +BROKEN= does not install on ia64 +.endif .if !(${ARCH} == "amd64" || ${ARCH} == "i386") CONFIGURE_ARGS+=--disable-gallium-intel @@ -71,4 +76,4 @@ CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:L}" do-install: cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo deleted file mode 100644 index 106ab0b..0000000 --- a/graphics/dri/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44 -SIZE (MesaLib-7.6.1.tar.bz2) = 4886995 -SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357 -SIZE (MesaLib-7.11.2.tar.bz2) = 6257280 diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist index 9442cdb..43e5ab1 100644 --- a/graphics/dri/pkg-plist +++ b/graphics/dri/pkg-plist @@ -1,19 +1,19 @@ include/GL/internal/dri_interface.h -%%I810_DRIVER%%lib/dri/i810_dri.so +%%OLD%%%%I810_DRIVER%%lib/dri/i810_dri.so %%I915_DRIVER%%lib/dri/i915_dri.so %%I965_DRIVER%%lib/dri/i965_dri.so -%%MACH64_DRIVER%%lib/dri/mach64_dri.so -%%MGA_DRIVER%%lib/dri/mga_dri.so -%%R128_DRIVER%%lib/dri/r128_dri.so +%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so +%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so +%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so %%R200_DRIVER%%lib/dri/r200_dri.so -%%R300_DRIVER%%lib/dri/r300_dri.so -%%R600_DRIVER%%lib/dri/r600_dri.so +%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so +%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so %%RADEON_DRIVER%%lib/dri/radeon_dri.so -%%SAVAGE_DRIVER%%lib/dri/savage_dri.so -%%SIS_DRIVER%%lib/dri/sis_dri.so +%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so +%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so %%SWRAST_DRIVER%%lib/dri/swrast_dri.so -%%TDFX_DRIVER%%lib/dri/tdfx_dri.so -%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so +%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so +%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so libdata/pkgconfig/dri.pc @dirrm lib/dri @dirrmtry include/GL/internal diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile index b7abc76..a5a54da 100644 --- a/graphics/eog-plugins/Makefile +++ b/graphics/eog-plugins/Makefile @@ -4,7 +4,7 @@ PORTNAME= eog-plugins PORTVERSION= 2.30.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,9 +18,10 @@ RUN_DEPENDS= eog:${PORTSDIR}/graphics/eog USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gtk20 +USE_GL= gl +USE_GNOME= gnomeprefix intlhack gtk20 WANT_GNOME= yes -USES= gettext +USES= gettext pathfix GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile index 9cf3c9f1..08ab4bf 100644 --- a/graphics/freeglut/Makefile +++ b/graphics/freeglut/Makefile @@ -1,7 +1,8 @@ +# Created by: thierry@pompo.net # $FreeBSD$ PORTNAME= freeglut -PORTVERSION= 2.8.0 +PORTVERSION= 2.8.1 CATEGORIES= graphics MASTER_SITES= SF @@ -27,6 +28,8 @@ DOCS= download.html freeglut.html freeglut_logo.png \ progress.html structure.html BINS= CallbackMaker Fractals Fractals_random Lorenz One shapes +.include <bsd.port.options.mk> + pre-configure: .for fract in Fractals/fractals.c Fractals_random/fractals_random.c @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" \ @@ -38,14 +41,14 @@ post-build: ${WRKSRC}/progs/demos/CallbackMaker/.libs/callbackmaker post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR} .endfor @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/progs/demos/Fractals/fractals.dat ${EXAMPLESDIR} .for prog in ${BINS} diff --git a/graphics/freeglut/distinfo b/graphics/freeglut/distinfo index 81ae29d..a0bf503 100644 --- a/graphics/freeglut/distinfo +++ b/graphics/freeglut/distinfo @@ -1,2 +1,2 @@ -SHA256 (freeglut-2.8.0.tar.gz) = 197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05 -SIZE (freeglut-2.8.0.tar.gz) = 979459 +SHA256 (freeglut-2.8.1.tar.gz) = dde46626a62a1cd9cf48a11951cdd592e7067c345cffe193a149dfd47aef999a +SIZE (freeglut-2.8.1.tar.gz) = 1005343 diff --git a/graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c b/graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c deleted file mode 100644 index 8f12afa..0000000 --- a/graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c +++ /dev/null @@ -1,18 +0,0 @@ ---- progs/demos/smooth_opengl3/smooth_opengl3.c.orig 2012-01-04 14:38:43.000000000 +0100 -+++ progs/demos/smooth_opengl3/smooth_opengl3.c 2012-01-04 14:39:10.000000000 +0100 -@@ -98,6 +98,7 @@ - #define APIENTRY - #endif - -+#ifndef GL_VERSION_1_5 - typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); - typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); - typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage); -@@ -117,6 +118,7 @@ - typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); - typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name); - typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -+#endif - - PFNGLGENBUFFERSPROC gl_GenBuffers; - PFNGLBINDBUFFERPROC gl_BindBuffer; diff --git a/graphics/freeglut/pkg-message b/graphics/freeglut/pkg-message new file mode 100644 index 0000000..f41059e --- /dev/null +++ b/graphics/freeglut/pkg-message @@ -0,0 +1,9 @@ +Since FreeBSD has new USB stack, freeglut normally doesn't build on FreeBSD 8 +(yet). To workaround this a small patch adds one include file and comments out +content of one function (only leaves return NULL). + +This might cause side effects. Joysticks do not work, and there might be ports +that do not compile or applications that crash because of this. + +Do not hesitate to contact x11@FreeBSD.org if there are any issues and side +effects because of this. diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile index f98201c..28575c1 100644 --- a/graphics/glfw/Makefile +++ b/graphics/glfw/Makefile @@ -12,15 +12,14 @@ COMMENT= Portable framework for OpenGL development LICENSE= ZLIB LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ - drm:${PORTSDIR}/graphics/libdrm \ - xcb:${PORTSDIR}/x11/libxcb + drm:${PORTSDIR}/graphics/libdrm USE_BZIP2= yes HAS_CONFIGURE= yes CONFIGURE_SCRIPT= compile.sh ALL_TARGET= x11 INSTALL_TARGET= x11-install -USE_XORG= x11 xau xdamage xdmcp xext xfixes xrandr xrender xxf86vm +USE_XORG= x11 xau xcb xdamage xdmcp xext xfixes xrandr xrender xxf86vm USE_GL= glu USE_LDCONFIG= yes MAKE_JOBS_UNSAFE=yes diff --git a/graphics/grx/Makefile b/graphics/grx/Makefile index c558708..f4da3e4 100644 --- a/graphics/grx/Makefile +++ b/graphics/grx/Makefile @@ -13,15 +13,14 @@ COMMENT= A 2D graphics library LICENSE= LGPL20 MIT LICENSE_COMB= multi -LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ - xcb:${PORTSDIR}/x11/libxcb +LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs OPTIONS_DEFINE= BGI BMP JPEG PNG PRINT TIFF ZLIB OPTIONS_DEFAULT= ZLIB BGI BMP PNG PRINT BGI_DESC= Enable BGI support BMP_DESC= Enable BMP support -USE_XORG= x11 xau xdmcp +USE_XORG= x11 xau xcb xdmcp USE_GMAKE= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --with-fontpath=${DATADIR}/fonts \ diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile index 1557e3e..012ac64 100644 --- a/graphics/libGL/Makefile +++ b/graphics/libGL/Makefile @@ -1,4 +1,4 @@ -# Created by: anholt@FreeBSD.org +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ PORTNAME= libGL diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk index d163e5a..6ccc937 100644 --- a/graphics/libGL/bsd.mesalib.mk +++ b/graphics/libGL/bsd.mesalib.mk @@ -11,11 +11,9 @@ # # - graphics/libGL # - graphics/libGLU -# - graphics/libGLw # - graphics/dri # # $FreeBSD$ -# .MAKE.FreeBSD_UL= yes @@ -23,7 +21,7 @@ MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} .if defined(WITH_NEW_XORG) -MESABASEVERSION= 7.11.2 +MESABASEVERSION= 8.0.5 # if there is a subversion, include the '-' between 7.11-rc2 for example. MESASUBVERSION= PLIST_SUB+= OLD="@comment " NEW="" @@ -33,8 +31,8 @@ MESASUBVERSION= PLIST_SUB+= OLD="" NEW="@comment " .endif -MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut -DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa +MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/ +DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX} MAINTAINER?= x11@FreeBSD.org BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend \ @@ -46,22 +44,19 @@ USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -MAKE_JOBS_UNSAFE= yes +MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \ - --disable-egl --disable-glut + --disable-egl .if defined(WITH_NEW_XORG) EXTRA_PATCHES+= ${PATCHDIR}/extra-configure \ - ${PATCHDIR}/extra-mach64_context.h \ - ${PATCHDIR}/extra-sis_context.h \ ${PATCHDIR}/extra-src-glsl_ir_constant_expression.cpp \ ${PATCHDIR}/extra-src__gallium__include__pipe__p_config.h \ ${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_array.c \ - ${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c \ - ${PATCHDIR}/extra-src__mesa__drivers__dri__radeon__radeon_span.c + ${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c .else EXTRA_PATCHES+= ${PATCHDIR}/extra-configure-old \ ${PATCHDIR}/extra-mach64_context.h-old \ @@ -69,12 +64,16 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-configure-old \ ${PATCHDIR}/extra-src__mesa__x86-64__xform4.S \ ${PATCHDIR}/extra-src__mesa__x86__glapi_x86.S \ ${PATCHDIR}/extra-src__mesa__x86__read_rgba_span_x86.S +CONFIGURE_ARGS+=--disable-glut --disable-glw .endif ALL_TARGET= default -PATCHDIR= ${.CURDIR}/../../graphics/libGL/files -WRKSRC= ${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION} +MASTERDIR= ${.CURDIR}/../../graphics/libGL +PATCHDIR= ${MASTERDIR}/files +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist +WRKSRC= ${WRKDIR}/Mesa-${MESADISTVERSION} .if !defined(ARCH) ARCH!= uname -p @@ -86,38 +85,25 @@ COMPONENT= ${PORTNAME:L:C/^lib//:C/mesa-//} CONFIGURE_ARGS+= --disable-glu .endif -.if ${COMPONENT:Mglw} == "" -CONFIGURE_ARGS+= --disable-glw -.else -CONFIGURE_ARGS+= --enable-motif -.endif - .if ${COMPONENT:Mdri} == "" CONFIGURE_ARGS+= --with-dri-drivers=no +.else +CONFIGURE_ARGS+= --with-dri-drivers="i915,i965,r200,radeon,swrast" .endif +.if !defined(WITH_NEW_XORG) .if defined(WITHOUT_XCB) CONFIGURE_ARGS+= --disable-xcb .else CONFIGURE_ARGS+= --enable-xcb .endif +.endif post-patch: @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \ - -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure + ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/src/glu/Makefile \ - ${WRKSRC}/src/glw/Makefile \ ${WRKSRC}/src/mesa/Makefile \ ${WRKSRC}/src/mesa/drivers/dri/Makefile -.if defined(WITH_NEW_XORG) -# replace hardlinks with patched radeon_span.c -.for i in r200 r300 r600 - @${CP} -fp ${WRKSRC}/src/mesa/drivers/dri/radeon/radeon_span.c \ - ${WRKSRC}/src/mesa/drivers/dri/${i}/ -.endfor -.endif -.if ${COMPONENT:Mglut} != "" - @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ - ${WRKSRC}/src/glut/glx/Makefile -.endif + diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo index 106ab0b..5ee9af2 100644 --- a/graphics/libGL/distinfo +++ b/graphics/libGL/distinfo @@ -1,4 +1,4 @@ SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44 SIZE (MesaLib-7.6.1.tar.bz2) = 4886995 -SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357 -SIZE (MesaLib-7.11.2.tar.bz2) = 6257280 +SHA256 (MesaLib-8.0.5.tar.bz2) = 511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e +SIZE (MesaLib-8.0.5.tar.bz2) = 5734571 diff --git a/graphics/libGL/files/extra-configure b/graphics/libGL/files/extra-configure index fc1a68f..d1ae3b7 100644 --- a/graphics/libGL/files/extra-configure +++ b/graphics/libGL/files/extra-configure @@ -1,42 +1,40 @@ ---- configure.orig 2011-11-17 19:46:34.000000000 +0000 -+++ configure 2012-06-28 12:53:09.000000000 +0000 -@@ -7817,10 +7817,35 @@ - DEFINES="$DEFINES -DGLX_DIRECT_RENDERING" - fi +--- configure.orig 2012-07-10 17:30:46.000000000 +0200 ++++ configure 2012-09-01 13:27:22.000000000 +0200 +@@ -9017,9 +9017,34 @@ + DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1" + DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS" - if test "x$DRI_DIRS" = "xyes"; then -- DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 r600 \ -- radeon tdfx unichrome savage sis swrast" +- DRI_DIRS="i915 i965 nouveau r200 radeon swrast" - fi + case "$host_cpu" in + x86_64) + # i810 is missing because there is no x86-64 system where it + # could *ever* be used. + if test "x$DRI_DIRS" = "xyes"; then -+ DRI_DIRS="i915 i965 mach64 mga nouveau r128 r200 r300 r600 \ -+ radeon savage tdfx unichrome sis swrast" ++ DRI_DIRS="i915 i965 nouveau r200 radeon swrast" + fi + ;; + i*86) + if test "x$DRI_DIRS" = "xyes"; then -+ DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 \ -+ r600 radeon savage tdfx unichrome sis swrast" ++ DRI_DIRS="i915 i965 nouveau r200 radeon swrast" + fi + ;; + powerpc*) + # Build only the drivers for cards that exist on PowerPC. + # At some point MGA will be added, but not yet. + if test "x$DRI_DIRS" = "xyes"; then -+ DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast" ++ DRI_DIRS="r200 radeon swrast" + fi + ;; + sparc*) + # Build only the drivers for cards that exist on SPARC. + if test "x$DRI_DIRS" = "xyes"; then -+ DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast" ++ DRI_DIRS="r200 radeon swrast" + fi + ;; + esac ++ ;; gnu*) DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER" diff --git a/graphics/libGL/files/extra-mach64_context.h b/graphics/libGL/files/extra-mach64_context.h deleted file mode 100644 index f844599..0000000 --- a/graphics/libGL/files/extra-mach64_context.h +++ /dev/null @@ -1,21 +0,0 @@ ---- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2011-05-13 01:47:18.000000000 +0200 -+++ src/mesa/drivers/dri/mach64/mach64_context.h 2011-07-27 09:59:53.000000000 +0200 -@@ -289,7 +289,7 @@ - /* ================================================================ - * Byte ordering - */ --#if MESA_LITTLE_ENDIAN == 1 -+#if defined(MESA_LITTLE_ENDIAN) && MESA_LITTLE_ENDIAN == 1 - #define LE32_IN( x ) ( *(GLuint *)(x) ) - #define LE32_IN_FLOAT( x ) ( *(GLfloat *)(x) ) - #define LE32_OUT( x, y ) do { *(GLuint *)(x) = (y); } while (0) -@@ -298,6 +298,9 @@ - #if defined(__OpenBSD__) || defined(__NetBSD__) - #include <machine/endian.h> - #define bswap_32 bswap32 -+#elif defined(__FreeBSD__) -+#include <sys/endian.h> -+#define bswap_32 bswap32 - #else - #include <byteswap.h> - #endif diff --git a/graphics/libGL/files/extra-sis_context.h b/graphics/libGL/files/extra-sis_context.h deleted file mode 100644 index 0e16f51..0000000 --- a/graphics/libGL/files/extra-sis_context.h +++ /dev/null @@ -1,22 +0,0 @@ ---- src/mesa/drivers/dri/sis/sis_context.h.orig 2010-12-14 22:43:15.000000000 +0100 -+++ src/mesa/drivers/dri/sis/sis_context.h 2011-07-27 09:58:22.000000000 +0200 -@@ -400,10 +400,18 @@ - #define MMIO_READ(reg) *(volatile GLint *)(smesa->IOBase + (reg)) - #define MMIO_READf(reg) *(volatile GLfloat *)(smesa->IOBase + (reg)) - --#if defined(__i386__) || defined(__x86_64__) -+#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__) - #define MMIO_WMB() __asm __volatile("" : : : "memory") - #elif defined(__ia64__) - #define MMIO_WMB() __asm __volatile("mf" : : : "memory") -+#elif defined(__powerpc__) -+#define MMIO_WMB() __asm __volatile("eieio" : : : "memory") -+#elif defined(__sparc64__) -+/* -+ * #StoreStore probably would be sufficient for this driver at the -+ * time of this writing but we use #Sync for safety. -+ */ -+#define MMIO_WMB() __asm __volatile("membar #Sync" : : : "memory") - #else - #error platform needs WMB - #endif diff --git a/graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c b/graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c deleted file mode 100644 index 3a186e9..0000000 --- a/graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/mesa/drivers/dri/radeon/radeon_span.c.orig 2011-07-09 03:37:10.000000000 +0200 -+++ src/mesa/drivers/dri/radeon/radeon_span.c 2012-06-28 21:44:07.000000000 +0200 -@@ -55,7 +55,11 @@ - #include <byteswap.h> - #define CPU_TO_LE16( x ) bswap_16( x ) - #define LE16_TO_CPU( x ) bswap_16( x ) --#endif /* __linux__ */ -+#elif defined(__FreeBSD__) -+#include <sys/endian.h> -+#define CPU_TO_LE16( x ) bswap16( x ) -+#define LE16_TO_CPU( x ) bswap16( x ) -+#endif - #else - #define CPU_TO_LE16( x ) ( x ) - #define LE16_TO_CPU( x ) ( x ) diff --git a/graphics/libGL/pkg-plist b/graphics/libGL/pkg-plist index 3204b09..e24cff6 100644 --- a/graphics/libGL/pkg-plist +++ b/graphics/libGL/pkg-plist @@ -3,11 +3,11 @@ include/GL/gl.h include/GL/gl_mangle.h include/GL/glext.h -include/GL/glfbdev.h +%%OLD%%include/GL/glfbdev.h include/GL/glx.h include/GL/glx_mangle.h include/GL/glxext.h -include/GL/mesa_wgl.h +%%OLD%%include/GL/mesa_wgl.h %%OLD%%include/GL/mglmesa.h include/GL/osmesa.h %%OLD%%include/GL/svgamesa.h diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile index fa90ee1..4ab08ba 100644 --- a/graphics/libGLU/Makefile +++ b/graphics/libGLU/Makefile @@ -1,8 +1,7 @@ -# Created by: anholt@FreeBSD.org +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ PORTNAME= libGLU -PORTREVISION= 2 PORTVERSION= ${MESAVERSION} CATEGORIES= graphics @@ -19,11 +18,4 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/ .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" - -.include <bsd.port.pre.mk> - -.if !(${ARCH} == "amd64" || ${ARCH} == "i386") -CONFIGURE_ARGS+=--disable-gallium-intel -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/libGLU/distinfo b/graphics/libGLU/distinfo deleted file mode 100644 index 106ab0b..0000000 --- a/graphics/libGLU/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44 -SIZE (MesaLib-7.6.1.tar.bz2) = 4886995 -SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357 -SIZE (MesaLib-7.11.2.tar.bz2) = 6257280 diff --git a/graphics/libGLw/Makefile b/graphics/libGLw/Makefile index 45ccde0..655986d 100644 --- a/graphics/libGLw/Makefile +++ b/graphics/libGLw/Makefile @@ -1,26 +1,25 @@ -# Created by: anholt@FreeBSD.org +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ PORTNAME= libGLw -PORTVERSION= ${MESAVERSION} -PORTREVISION= 2 +PORTVERSION= 8.0.0 CATEGORIES= graphics +MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/glw/ +DISTNAME= glw-${PORTVERSION} +DIST_SUBDIR= GL +MAINTAINER= x11@FreeBSD.org COMMENT= OpenGL widgets library +USE_BZIP2= yes +USES= pathfix pkgconfig +USE_LDCONFIG= yes USE_GL= gl USE_MOTIF= yes -USE_XORG= glproto xt x11 xext xxf86vm xdamage xfixes dri2proto +USE_XORG= x11 xt xext +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-static --enable-motif +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -INSTALL_WRKSRC= ${WRKSRC}/src/glw -BUILD_WRKSRC= ${WRKSRC}/src/glw - -.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" - -.include <bsd.port.pre.mk> - -.if !(${ARCH} == "amd64" || ${ARCH} == "i386") -CONFIGURE_ARGS+=--disable-gallium-intel -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/libGLw/distinfo b/graphics/libGLw/distinfo index 106ab0b..f2e4e38 100644 --- a/graphics/libGLw/distinfo +++ b/graphics/libGLw/distinfo @@ -1,4 +1,2 @@ -SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44 -SIZE (MesaLib-7.6.1.tar.bz2) = 4886995 -SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357 -SIZE (MesaLib-7.11.2.tar.bz2) = 6257280 +SHA256 (GL/glw-8.0.0.tar.bz2) = 2da1d06e825f073dcbad264aec7b45c649100e5bcde688ac3035b34c8dbc8597 +SIZE (GL/glw-8.0.0.tar.bz2) = 221136 diff --git a/graphics/libGLw/pkg-plist b/graphics/libGLw/pkg-plist index 211b586..87418e6 100644 --- a/graphics/libGLw/pkg-plist +++ b/graphics/libGLw/pkg-plist @@ -2,7 +2,7 @@ include/GL/GLwDrawA.h include/GL/GLwDrawAP.h include/GL/GLwMDrawA.h include/GL/GLwMDrawAP.h +lib/libGLw.la lib/libGLw.so lib/libGLw.so.1 libdata/pkgconfig/glw.pc -@dirrmtry include/GL diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile index 1ff688d..3c3cf5b 100644 --- a/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -10,23 +10,26 @@ MASTER_SITES= http://dri.freedesktop.org/libdrm/ MAINTAINER= x11@FreeBSD.org COMMENT= Userspace interface to kernel Direct Rendering Module services -BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs LIB_DEPENDS= pciaccess:${PORTSDIR}/devel/libpciaccess \ pthread-stubs:${PORTSDIR}/devel/libpthread-stubs -RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --enable-nouveau-experimental-api - MAKE_JOBS_SAFE= yes .if defined(WITH_NEW_XORG) -OPTIONS_DEFINE= KMS -KMS_DESC= Enable experimental KMS support +USE_GMAKE= yes + +OPTIONS_DEFINE= KMS MANPAGES +OPTIONS_DEFAULT=KMS +KMS_DESC= Enable KMS support + +.if defined(PACKAGE_BUILDING) +OPTIONS_DEFAULT+= MANPAGES +.endif .include <bsd.port.options.mk> @@ -38,12 +41,34 @@ PLIST_SUB+= KMS="" PLIST_SUB+= KMS="@comment " .endif -LIBDRM_VERSION= 2.4.31 -LIBDRM_REVISION=1 +.if ${PORT_OPTIONS:MMANPAGES} +BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ + xsltproc:${PORTSDIR}/textproc/libxslt +MAN3= drmAvailable.3 \ + drmHandleEvent.3 \ + drmModeGetResources.3 +MAN7= drm-gem.7 \ + drm-kms.7 \ + drm-memory.7 \ + drm-mm.7 \ + drm-ttm.7 \ + drm.7 +.else +CONFIGURE_ARGS+=--disable-manpages +.endif + +LIBDRM_VERSION= 2.4.44 +LIBDRM_REVISION=0 PLIST_SUB+= OLD="@comment " NEW="" +EXTRA_PATCHES+= ${FILESDIR}/extra-configure \ + ${FILESDIR}/extra-tests_modetest_Makefile.in \ + ${FILESDIR}/extra-tests_modetest_modetest.c \ + ${FILESDIR}/extra-tests_modetest_strchrnul.c +CONFIGURE_ARGS+=--disable-vmwgfx .else +CONFIGURE_ARGS= --enable-nouveau-experimental-api LIBDRM_VERSION= 2.4.17 -LIBDRM_REVISION=1 +LIBDRM_REVISION=0 PLIST_SUB+= OLD="" NEW="@comment " .endif @@ -59,7 +84,7 @@ PLIST_SUB+= RADEON_DRIVERS="@comment " pre-patch: @${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g; \ - 12661s/x86_/amd/g' \ + s,i?86|x86_64),i?86|amd64|x86_64),g' \ ${WRKSRC}/configure .include <bsd.port.post.mk> diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo index df36a53..1c2e827 100644 --- a/graphics/libdrm/distinfo +++ b/graphics/libdrm/distinfo @@ -1,4 +1,4 @@ SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a SIZE (libdrm-2.4.17.tar.bz2) = 408882 -SHA256 (libdrm-2.4.31.tar.bz2) = 8fc7e0e5b2f9bf493447a4ef7adc49174a700824457774cb53c1b8f2da866af4 -SIZE (libdrm-2.4.31.tar.bz2) = 475677 +SHA256 (libdrm-2.4.44.tar.bz2) = 42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2 +SIZE (libdrm-2.4.44.tar.bz2) = 538416 diff --git a/graphics/libdrm/files/extra-configure b/graphics/libdrm/files/extra-configure new file mode 100644 index 0000000..3d9d571 --- /dev/null +++ b/graphics/libdrm/files/extra-configure @@ -0,0 +1,39 @@ +--- configure.orig 2013-02-22 00:30:16.861698520 +0100 ++++ configure 2013-02-22 00:30:26.189704713 +0100 +@@ -671,6 +671,8 @@ + HAVE_VMWGFX_TRUE + HAVE_LIBKMS_FALSE + HAVE_LIBKMS_TRUE ++HAVE_STRCHRNUL_FALSE ++HAVE_STRCHRNUL_TRUE + CLOCK_LIB + pkgconfigdir + PTHREADSTUBS_LIBS +@@ -12341,6 +12345,27 @@ + done + + ++for ac_func in strchrnul ++do : ++ ac_fn_c_check_func "$LINENO" "strchrnul" "ac_cv_func_strchrnul" ++if test "x$ac_cv_func_strchrnul" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_STRCHRNUL 1 ++_ACEOF ++ HAVE_STRCHRNUL=yes ++fi ++done ++ ++ ++ if test "x$ac_cv_func_strchrnul" = xyes; then ++ HAVE_STRCHRNUL_TRUE= ++ HAVE_STRCHRNUL_FALSE='#' ++else ++ HAVE_STRCHRNUL_TRUE='#' ++ HAVE_STRCHRNUL_FALSE= ++fi ++ ++ + + + MAYBE_WARN="-Wall -Wextra \ diff --git a/graphics/libdrm/files/extra-tests_modetest_Makefile.in b/graphics/libdrm/files/extra-tests_modetest_Makefile.in new file mode 100644 index 0000000..74748e9 --- /dev/null +++ b/graphics/libdrm/files/extra-tests_modetest_Makefile.in @@ -0,0 +1,52 @@ +--- tests/modetest/Makefile.in.orig 2013-04-04 15:41:48.212028807 +0200 ++++ tests/modetest/Makefile.in 2013-04-04 15:45:21.384003991 +0200 +@@ -36,8 +52,11 @@ + host_triplet = @host@ + @HAVE_INSTALL_TESTS_TRUE@bin_PROGRAMS = modetest$(EXEEXT) + @HAVE_INSTALL_TESTS_FALSE@noinst_PROGRAMS = modetest$(EXEEXT) +-@HAVE_CAIRO_TRUE@am__append_1 = $(CAIRO_CFLAGS) +-@HAVE_CAIRO_TRUE@am__append_2 = $(CAIRO_LIBS) ++@HAVE_STRCHRNUL_FALSE@am__append_1 = \ ++@HAVE_STRCHRNUL_FALSE@ strchrnul.c ++ ++@HAVE_CAIRO_TRUE@am__append_2 = $(CAIRO_CFLAGS) ++@HAVE_CAIRO_TRUE@am__append_3 = $(CAIRO_LIBS) + subdir = tests/modetest + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -53,7 +72,10 @@ + CONFIG_CLEAN_VPATH_FILES = + am__installdirs = "$(DESTDIR)$(bindir)" + PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) +-am_modetest_OBJECTS = buffers.$(OBJEXT) modetest.$(OBJEXT) ++am__modetest_SOURCES_DIST = buffers.c modetest.c buffers.h strchrnul.c ++@HAVE_STRCHRNUL_FALSE@am__objects_1 = strchrnul.$(OBJEXT) ++am_modetest_OBJECTS = buffers.$(OBJEXT) modetest.$(OBJEXT) \ ++ $(am__objects_1) + modetest_OBJECTS = $(am_modetest_OBJECTS) + am__DEPENDENCIES_1 = + @HAVE_CAIRO_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +@@ -229,12 +265,10 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AM_CFLAGS = -I$(top_srcdir)/include/drm -I$(top_srcdir)/libkms/ \ +- -I$(top_srcdir) $(am__append_1) +-modetest_SOURCES = \ +- buffers.c modetest.c buffers.h +- ++ -I$(top_srcdir) $(am__append_2) ++modetest_SOURCES = buffers.c modetest.c buffers.h $(am__append_1) + modetest_LDADD = $(top_builddir)/libdrm.la \ +- $(top_builddir)/libkms/libkms.la $(am__append_2) ++ $(top_builddir)/libkms/libkms.la $(am__append_3) + all: all-am + + .SUFFIXES: +@@ -333,6 +370,7 @@ + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffers.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modetest.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strchrnul.Po@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/graphics/libdrm/files/extra-tests_modetest_modetest.c b/graphics/libdrm/files/extra-tests_modetest_modetest.c new file mode 100644 index 0000000..db62e98f --- /dev/null +++ b/graphics/libdrm/files/extra-tests_modetest_modetest.c @@ -0,0 +1,13 @@ +--- tests/modetest/modetest.c.orig 2013-02-22 00:44:28.203705216 +0100 ++++ tests/modetest/modetest.c 2013-02-22 00:44:56.803699770 +0100 +@@ -57,6 +57,10 @@ + + #include "buffers.h" + ++#ifndef HAVE_STRCHRNUL ++char *strchrnul(const char *, int); ++#endif ++ + drmModeRes *resources; + int fd, modes; + diff --git a/graphics/libdrm/files/extra-tests_modetest_strchrnul.c b/graphics/libdrm/files/extra-tests_modetest_strchrnul.c new file mode 100644 index 0000000..26ba9ac --- /dev/null +++ b/graphics/libdrm/files/extra-tests_modetest_strchrnul.c @@ -0,0 +1,48 @@ +--- tests/modetest/strchrnul.c.orig 2013-02-22 00:35:04.198698781 +0100 ++++ tests/modetest/strchrnul.c 2013-02-22 00:34:36.280333357 +0100 +@@ -0,0 +1,45 @@ ++/*- ++ * Copyright (c) 2013 Niclas Zeising ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE ++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ * ++ */ ++ ++/* ++ * Copied from: ++ * svn://svn.freebsd.org/base/head/lib/libc/string/strchrnul.c 246766 2013-02-13 15:46:33Z zeising ++ */ ++ ++char * ++strchrnul(const char *p, int ch) ++{ ++ char c; ++ ++ c = ch; ++ for (;; ++p) { ++ if (*p == c || *p == '\0') ++ return ((char *)p); ++ } ++ /* NOTREACHED */ ++} ++ diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist index 4cdc099..b8b6ed5 100644 --- a/graphics/libdrm/pkg-plist +++ b/graphics/libdrm/pkg-plist @@ -17,12 +17,13 @@ %%NEW%%include/libdrm/drm_mode.h %%NEW%%include/libdrm/drm_sarea.h %%NEW%%include/libdrm/i915_drm.h +%%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_aub.h %%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_bufmgr.h %%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_debug.h %%NEW%%include/libdrm/mach64_drm.h %%NEW%%include/libdrm/mga_drm.h +%%NEW%%include/libdrm/nouveau.h %%NEW%%include/libdrm/nouveau_drm.h -%%NEW%%include/libdrm/nouveau_drmif.h %%NEW%%include/libdrm/r128_drm.h %%NEW%%%%RADEON_DRIVERS%%include/libdrm/r600_pci_ids.h %%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_bo.h @@ -37,17 +38,14 @@ %%NEW%%include/libdrm/sis_drm.h %%NEW%%include/libdrm/via_drm.h %%NEW%%%%KMS%%include/libkms/libkms.h -include/nouveau/nouveau_bo.h -include/nouveau/nouveau_channel.h +%%OLD%%include/nouveau/nouveau_bo.h +%%OLD%%include/nouveau/nouveau_channel.h %%OLD%%include/nouveau/nouveau_class.h -include/nouveau/nouveau_device.h -include/nouveau/nouveau_grobj.h -include/nouveau/nouveau_notifier.h -include/nouveau/nouveau_pushbuf.h -%%NEW%%include/nouveau/nouveau_reloc.h -include/nouveau/nouveau_resource.h -%%NEW%%include/nouveau/nv04_pushbuf.h -%%NEW%%include/nouveau/nvc0_pushbuf.h +%%OLD%%include/nouveau/nouveau_device.h +%%OLD%%include/nouveau/nouveau_grobj.h +%%OLD%%include/nouveau/nouveau_notifier.h +%%OLD%%include/nouveau/nouveau_pushbuf.h +%%OLD%%include/nouveau/nouveau_resource.h include/xf86drm.h include/xf86drmMode.h lib/libdrm.la @@ -58,7 +56,8 @@ lib/libdrm.so.2 %%INTEL_DRIVER%%lib/libdrm_intel.so.1 lib/libdrm_nouveau.la lib/libdrm_nouveau.so -lib/libdrm_nouveau.so.1 +%%OLD%%lib/libdrm_nouveau.so.1 +%%NEW%%lib/libdrm_nouveau.so.2 %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.la %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1 @@ -70,7 +69,7 @@ libdata/pkgconfig/libdrm.pc libdata/pkgconfig/libdrm_nouveau.pc %%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc %%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc -@dirrm include/nouveau +%%OLD%%@dirrm include/nouveau %%NEW%%%%KMS%%@dirrm include/libkms %%NEW%%@dirrm include/libdrm %%OLD%%@dirrm include/drm diff --git a/graphics/libreatlas/Makefile b/graphics/libreatlas/Makefile index 6b62dd5..1a46a87 100644 --- a/graphics/libreatlas/Makefile +++ b/graphics/libreatlas/Makefile @@ -27,13 +27,12 @@ LIB_DEPENDS= mspack:${PORTSDIR}/archivers/libmspack \ freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ freexl:${PORTSDIR}/textproc/freexl \ - fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - xcb:${PORTSDIR}/x11/libxcb + fontconfig:${PORTSDIR}/x11-fonts/fontconfig GNU_CONFIGURE= yes USES= pkgconfig gettext iconv USE_GMAKE= yes -USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \ +USE_XORG= ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xrandr xrender xxf86vm USE_GNOME= atk gdkpixbuf2 glib20 gtk20 pango USE_WX= 2.8 diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile index d633917..3f738ac 100644 --- a/graphics/mesa-demos/Makefile +++ b/graphics/mesa-demos/Makefile @@ -1,4 +1,4 @@ -# Created by: anholt@FreeBSD.org +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ PORTNAME= mesa-demos diff --git a/graphics/pinpoint/Makefile b/graphics/pinpoint/Makefile index 8b0e5cd..0f7847c 100644 --- a/graphics/pinpoint/Makefile +++ b/graphics/pinpoint/Makefile @@ -3,7 +3,7 @@ PORTNAME= pinpoint DISTVERSION= 0.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= GNOME @@ -16,6 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter USE_XZ= yes +USE_GL= gl USE_GMAKE= yes USE_GNOME= librsvg2 GNU_CONFIGURE= yes diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile index d480372..c196dfc 100644 --- a/graphics/zbar/Makefile +++ b/graphics/zbar/Makefile @@ -31,8 +31,7 @@ CONFIGURE_ARGS+= --with-jpeg=no .endif .if ${PORT_OPTIONS:MX11} -USE_XORG= ice sm x11 xau xdmcp xext xv -LIB_DEPENDS+= xcb:${PORTSDIR}/x11/libxcb +USE_XORG= ice sm x11 xau xcb xdmcp xext xv CONFIGURE_ARGS+= --with-x=yes .else CONFIGURE_ARGS+= --with-x=no --without-xshm --without-xv diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile index a62cb1f..b357491 100644 --- a/japanese/mozc-server/Makefile +++ b/japanese/mozc-server/Makefile @@ -181,12 +181,12 @@ do-install-mozc_tool: # ibus_mozc .if ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc" +USE_XORG= xcb GYP_OPTIONS+= --noqt GYP_DEFINES+= use_libibus=1 \ enable_gtk_renderer=1 -LIB_DEPENDS+= ibus-1.0:${PORTSDIR}/textproc/ibus \ - xcb-xfixes:${PORTSDIR}/x11/libxcb +LIB_DEPENDS+= ibus-1.0:${PORTSDIR}/textproc/ibus RUN_DEPENDS+= mozc_server:${PORTSDIR}/japanese/mozc-server \ mozc_tool:${PORTSDIR}/japanese/mozc-tool \ mozc_server_start:${PORTSDIR}/japanese/mozc-additions \ diff --git a/math/xspread/Makefile b/math/xspread/Makefile index fe2f923..a0f00df 100644 --- a/math/xspread/Makefile +++ b/math/xspread/Makefile @@ -31,9 +31,8 @@ PLIST_FILES= bin/pxspread bin/xspread .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MX11} -USE_XORG= x11 xau xdmcp xt -LIB_DEPENDS+= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ - xcb:${PORTSDIR}/x11/libxcb +USE_XORG= x11 xau xcb xdmcp xt +LIB_DEPENDS+= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .else diff --git a/misc/nut/Makefile b/misc/nut/Makefile index aa57457..5efe8d2 100644 --- a/misc/nut/Makefile +++ b/misc/nut/Makefile @@ -35,9 +35,8 @@ LIB_DEPENDS+= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - fltk_images:${PORTSDIR}/x11-toolkits/fltk \ - xcb:${PORTSDIR}/x11/libxcb -USE_XORG+= x11 xau xdmcp xext xft xinerama xrender + fltk_images:${PORTSDIR}/x11-toolkits/fltk +USE_XORG+= x11 xau xcb xdmcp xext xft xinerama xrender MAKE_ENV+= HAVE_FLTK=1 FLTK_NUT="fltk/Nut" PLIST_FILES+= bin/Nut DESKTOP_ENTRIES="Nut" "${COMMENT}" "" "Nut" \ diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile index df2996f..5dc71ba 100644 --- a/multimedia/clutter-gst/Makefile +++ b/multimedia/clutter-gst/Makefile @@ -1,13 +1,10 @@ -# New ports collection makefile for: clutter-gst -# Date created: 2008-12-25 -# Whom: Martin Wilke <miwi@FreeBSD.org> -# +# Created by: Martin Wilke <miwi@FreeBSD.org> # $FreeBSD$ # $MCom: ports/multimedia/clutter-gst/Makefile,v 1.6 2010/06/29 21:14:02 kwm Exp $ PORTNAME= clutter-gst PORTVERSION= 1.3.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://source.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/ @@ -19,8 +16,10 @@ LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter USE_GMAKE= yes USE_BZIP2= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack ltverhack gnomeprefix +USES= pathfix +USE_GNOME= ltverhack gnomeprefix USE_GSTREAMER= yes +USE_GL= gl USE_XORG= xp x11 USE_LDCONFIG= yes diff --git a/multimedia/freetuxtv/Makefile b/multimedia/freetuxtv/Makefile index 56c7032..52d3d11 100644 --- a/multimedia/freetuxtv/Makefile +++ b/multimedia/freetuxtv/Makefile @@ -22,11 +22,10 @@ LIB_DEPENDS= vlc:${PORTSDIR}/multimedia/vlc \ 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 USE_GNOME= glib20 gtk20 -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 GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/multimedia/vdr-plugin-softhddevice/Makefile b/multimedia/vdr-plugin-softhddevice/Makefile index acc75d2..0416752 100644 --- a/multimedia/vdr-plugin-softhddevice/Makefile +++ b/multimedia/vdr-plugin-softhddevice/Makefile @@ -14,12 +14,11 @@ COMMENT= Video Disk Recorder - softhddevice plugin LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg \ vdpau:${PORTSDIR}/multimedia/libvdpau \ - xcb:${PORTSDIR}/x11/libxcb \ xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \ asound:${PORTSDIR}/audio/alsa-lib USES= pkgconfig -USE_XORG+= xv x11 xinerama +USE_XORG+= xv x11 xcb xinerama USE_GL+= gl glu PATCH_STRIP= -p1 HAVE_CONFIGURE= yes diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 9570fea..af6ba03 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -636,9 +636,8 @@ CONFIGURE_ARGS+=--disable-x264 .endif .if ${PORT_OPTIONS:MXCB} -USE_XORG= xpm -LIB_DEPENDS+= xcb:${PORTSDIR}/x11/libxcb \ - xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms +USE_XORG= xcb xpm +LIB_DEPENDS+= xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms CONFIGURE_ARGS+=--enable-xcb --with-x .else CONFIGURE_ARGS+=--disable-xcb --without-x diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile index 20ecef6..fbffa19 100644 --- a/net-im/empathy/Makefile +++ b/net-im/empathy/Makefile @@ -4,7 +4,7 @@ PORTNAME= empathy PORTVERSION= 2.34.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im gnome MASTER_SITES= GNOME @@ -101,6 +101,7 @@ PLIST_SUB+= NST="@comment " .endif .if ${PORT_OPTIONS:MMAP} +USE_GL= gl LIB_DEPENDS+= champlain-0.8:${PORTSDIR}/graphics/libchamplain CONFIGURE_ARGS+=--enable-map PLIST_SUB+= MAP="" diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile index 9af38e2..ab7954a 100644 --- a/net-p2p/retroshare/Makefile +++ b/net-p2p/retroshare/Makefile @@ -26,14 +26,13 @@ LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \ gpg-error:${PORTSDIR}/security/libgpg-error \ gpgme:${PORTSDIR}/security/gpgme \ expat:${PORTSDIR}/textproc/expat2 \ - fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - xcb:${PORTSDIR}/x11/libxcb + fontconfig:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS+= pinentry-qt4:${PORTSDIR}/security/pinentry-qt4 WRKSRC= ${WRKDIR}/trunk USES= gettext iconv USE_GNOME= glib20 -USE_XORG= ice sm x11 xau xdmcp xext xrender +USE_XORG= ice sm x11 xau xcb xdmcp xext xrender USE_QT4= corelib gui network xml script designer_build uic_build \ qmake_build moc_build rcc_build HAS_CONFIGURE= yes diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile index c05dc0c..8860dcd 100644 --- a/net/tigervnc/Makefile +++ b/net/tigervnc/Makefile @@ -15,7 +15,12 @@ COMMENT= TigerVNC is an advanced VNC implementation LISENCE= GPLv2 LISENCE_FILE= ${WRKSRC}/LICENCE.TXT +.if defined(WITH_NEW_XORG) +BROKEN= Does not build +.endif + PATCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-servers/xorg-server:patch +BUILD_DEPENDS= ${LOCALBASE}/include/GL/internal/dri_interface.h:${PORTSDIR}/graphics/dri # almost equivalent to x11-servers/xorg-server's RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \ xkbcomp:${PORTSDIR}/x11/xkbcomp diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile index 28b9cd7..da1116f 100644 --- a/net/x11vnc/Makefile +++ b/net/x11vnc/Makefile @@ -14,10 +14,10 @@ LICENSE= GPLv2 LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ dbus:${PORTSDIR}/devel/dbus \ - xcb:${PORTSDIR}/x11/libxcb \ pthread-stubs:${PORTSDIR}/devel/libpthread-stubs -USE_XORG= x11 xdamage xfixes xrandr xinerama xext xtst xau xrender xdmcp recordproto +USE_XORG= x11 xcb xdamage xfixes xrandr xinerama xext xtst xau xrender \ + xdmcp recordproto # Sets LDFLAGS and adds to CONFIGURE_ENV, therefore we set LDFLAGS LDFLAGS+= -L${LOCALBASE}/lib diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile index 93b63c1..aaf1332 100644 --- a/polish/kadu/Makefile +++ b/polish/kadu/Makefile @@ -33,8 +33,7 @@ LIB_DEPENDS= mpdclient:${PORTSDIR}/audio/libmpdclient \ qzeitgeist:${PORTSDIR}/sysutils/qzeitgeist \ enchant:${PORTSDIR}/textproc/enchant \ expat:${PORTSDIR}/textproc/expat2 \ - fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - xcb:${PORTSDIR}/x11/libxcb + fontconfig:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl # TODO enable devel/libexecinfo # TODO ntrack and ntrack-qt (needs porting) ? @@ -45,7 +44,7 @@ GG7_EMOTS_DISTFILE= dodatkowe_emoty_GG7.tar.gz USE_BZIP2= yes USES= cmake pkgconfig gettext iconv -USE_XORG= ice sm x11 xau xdmcp xext xfixes xrender xscrnsaver +USE_XORG= ice sm x11 xau xcb xdmcp xext xfixes xrender xscrnsaver CMAKE_ARGS= -DKADU_VERSION:STRING="${DISTVERSION}" -DWITH_ENCHANT=ON # Setting KADU_VERSION disables git invocation MAKE_JOBS_SAFE= yes diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile index 99ff9d4..2bf5428 100644 --- a/polish/qnapi/Makefile +++ b/polish/qnapi/Makefile @@ -17,12 +17,11 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ - xcb:${PORTSDIR}/x11/libxcb \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= 7z:${PORTSDIR}/archivers/p7zip USES= gettext iconv -USE_XORG= ice sm x11 xau xdmcp xext xrender +USE_XORG= ice sm x11 xau xcb xdmcp xext xrender USE_QT4= corelib gui network xml qmake_build moc_build uic_build rcc_build USE_KDE4= kdehier QMAKE_ARGS= PREFIX=${PREFIX} KDE4_PREFIX=${KDE4_PREFIX} diff --git a/print/photoprint/Makefile b/print/photoprint/Makefile index 766adff..123ce4b 100644 --- a/print/photoprint/Makefile +++ b/print/photoprint/Makefile @@ -20,13 +20,12 @@ LIB_DEPENDS= cups:${PORTSDIR}/print/cups-client \ pixman:${PORTSDIR}/x11/pixman \ png15:${PORTSDIR}/graphics/png \ pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ - tiff:${PORTSDIR}/graphics/tiff \ - xcb:${PORTSDIR}/x11/libxcb + tiff:${PORTSDIR}/graphics/tiff GNU_CONFIGURE= yes USES= gettext USE_GNOME= desktopfileutils pango -USE_XORG= x11 xau xcomposite xcursor xdamage xdmcp xext \ +USE_XORG= x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xrandr xrender INSTALLS_ICONS= yes diff --git a/science/massxpert/Makefile b/science/massxpert/Makefile index 3b9d69b..c6d02de 100644 --- a/science/massxpert/Makefile +++ b/science/massxpert/Makefile @@ -14,15 +14,14 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ 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 LICENSE= GPLv3 USE_GCC= any USE_BZIP2= yes USES= cmake gettext iconv -USE_XORG= ice sm x11 xau xdmcp xext xrender +USE_XORG= ice sm x11 xau xcb xdmcp xext xrender USE_GNOME= glib20 USE_QT4= corelib gui xml rcc_build qmake_build uic_build moc_build \ svg diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile index 6ed0bad..abe6f6f 100644 --- a/sysutils/gsmartcontrol/Makefile +++ b/sysutils/gsmartcontrol/Makefile @@ -22,8 +22,7 @@ LIB_DEPENDS= atkmm-1.6:${PORTSDIR}/accessibility/atkmm \ expat:${PORTSDIR}/textproc/expat2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \ - pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm \ - xcb:${PORTSDIR}/x11/libxcb + pangomm-1.4:${PORTSDIR}/x11-toolkits/pangomm RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ smartctl:${PORTSDIR}/sysutils/smartmontools @@ -31,7 +30,7 @@ USE_AUTOTOOLS= libtool USES= pkgconfig gettext iconv USE_BZIP2= yes USE_GNOME= gtk20 -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 INSTALLS_ICONS= yes diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile index a487a97..08304f6 100644 --- a/sysutils/gtk-imonc/Makefile +++ b/sysutils/gtk-imonc/Makefile @@ -18,13 +18,12 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ 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 GNU_CONFIGURE= yes USES= pkgconfig gettext iconv USE_GNOME= gdkpixbuf2 gtk20 -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 MAKE_JOBS_SAFE= yes diff --git a/sysutils/nitrogen/Makefile b/sysutils/nitrogen/Makefile index 39c5c68..014c607 100644 --- a/sysutils/nitrogen/Makefile +++ b/sysutils/nitrogen/Makefile @@ -25,8 +25,7 @@ LIB_DEPENDS= atkmm:${PORTSDIR}/accessibility/atkmm \ expat:${PORTSDIR}/textproc/expat2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \ - pangomm:${PORTSDIR}/x11-toolkits/pangomm \ - xcb:${PORTSDIR}/x11/libxcb + pangomm:${PORTSDIR}/x11-toolkits/pangomm RUN_DEPENDS= gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \ hicolor-icon-theme>0:${PORTSDIR}/misc/hicolor-icon-theme @@ -35,7 +34,7 @@ OPTIONS_DEFAULT=XINERAMA USES= gettext iconv USE_GNOME= gtk20 -USE_XORG= pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \ +USE_XORG= pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \ xrandr xrender GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-inotify diff --git a/x11-clocks/oclock/Makefile b/x11-clocks/oclock/Makefile index 19c120e..25ccf9e 100644 --- a/x11-clocks/oclock/Makefile +++ b/x11-clocks/oclock/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: oclock -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= oclock PORTVERSION= 1.0.3 diff --git a/x11-clocks/xclock/Makefile b/x11-clocks/xclock/Makefile index 13776d4..ba36abd 100644 --- a/x11-clocks/xclock/Makefile +++ b/x11-clocks/xclock/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xclock -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xclock PORTVERSION= 1.0.6 diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile index e73f065..add20a8 100644 --- a/x11-drivers/xf86-input-acecad/Makefile +++ b/x11-drivers/xf86-input-acecad/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xf86-input-acecad -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-input-acecad PORTVERSION= 1.5.0 @@ -13,7 +8,6 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org acecad input driver XORG_CAT= driver -USE_XORG= xextproto videoproto MAN4= acecad.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-egalax/Makefile b/x11-drivers/xf86-input-egalax/Makefile index b0198f8..88c6e1a 100644 --- a/x11-drivers/xf86-input-egalax/Makefile +++ b/x11-drivers/xf86-input-egalax/Makefile @@ -25,7 +25,7 @@ IGNORE= is useless without uep(4) kernel driver .endif .if defined(WITH_NEW_XORG) -IGNORE= does not build with X server 1.10 +IGNORE= does not build with X server 1.12 .endif .include <bsd.port.post.mk> diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile index fe1cddd..46de1f6 100644 --- a/x11-drivers/xf86-input-elographics/Makefile +++ b/x11-drivers/xf86-input-elographics/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xf86-input-elographics -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-input-elographics PORTVERSION= ${ELO_VERSION} @@ -14,7 +9,6 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org elographics input driver XORG_CAT= driver -USE_XORG= xextproto videoproto MAN4= elographics.4x .if defined(WITH_NEW_XORG) diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile new file mode 100644 index 0000000..ae3b53b --- /dev/null +++ b/x11-drivers/xf86-input-fpit/Makefile @@ -0,0 +1,19 @@ +# $FreeBSD$ + +PORTNAME= xf86-input-fpit +PORTVERSION= 1.4.0 +CATEGORIES= x11-drivers + +MAINTAINER= x11@FreeBSD.org +COMMENT= X.Org fpit input driver + +XORG_CAT= driver +USE_XORG= xrandr + +MAN4= fpit.4x + +.if !defined(WITH_NEW_XORG) +IGNORE= does not build with X server 1.7.7 +.endif + +.include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-fpit/distinfo b/x11-drivers/xf86-input-fpit/distinfo new file mode 100644 index 0000000..1e97d5e --- /dev/null +++ b/x11-drivers/xf86-input-fpit/distinfo @@ -0,0 +1,2 @@ +SHA256 (xorg/driver/xf86-input-fpit-1.4.0.tar.bz2) = 38a80ad6e9b367e068390b2ef92e0bbb9c21c09ea835a5190ae14c2271e68f9a +SIZE (xorg/driver/xf86-input-fpit-1.4.0.tar.bz2) = 277843 diff --git a/x11-drivers/xf86-input-fpit/pkg-descr b/x11-drivers/xf86-input-fpit/pkg-descr new file mode 100644 index 0000000..28985ef --- /dev/null +++ b/x11-drivers/xf86-input-fpit/pkg-descr @@ -0,0 +1,3 @@ +This package contains the X.Org xf86-input-fpit driver. + +WWW: http://www.x.org diff --git a/x11-drivers/xf86-input-fpit/pkg-plist b/x11-drivers/xf86-input-fpit/pkg-plist new file mode 100644 index 0000000..724fb95 --- /dev/null +++ b/x11-drivers/xf86-input-fpit/pkg-plist @@ -0,0 +1,6 @@ +lib/xorg/modules/input/fpit_drv.la +lib/xorg/modules/input/fpit_drv.so +share/X11/xorg.conf.d/50-fpit.conf +@dirrmtry lib/xorg/modules/input +@dirrmtry lib/xorg/modules +@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile index 2f7b5c7..4c6ffaf 100644 --- a/x11-drivers/xf86-input-hyperpen/Makefile +++ b/x11-drivers/xf86-input-hyperpen/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xf86-input-hyperpen -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-input-hyperpen PORTVERSION= ${HYPERVER} @@ -14,13 +9,10 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org hyperpen input driver XORG_CAT= driver -USE_XORG= xextproto videoproto .if defined(WITH_NEW_XORG) HYPERVER= 1.4.1 HYPERREVISION= 0 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_xf86HyperPen.c - .else HYPERVER= 1.3.0 HYPERREVISION= 6 diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile index 94f2872..f2e9e1e 100644 --- a/x11-drivers/xf86-input-joystick/Makefile +++ b/x11-drivers/xf86-input-joystick/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xf86-input-joystick -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-input-joystick PORTVERSION= ${JOYVER} @@ -14,11 +9,10 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org joystick input driver XORG_CAT= driver -USE_XORG= xextproto videoproto MAN4= joystick.4x .if defined(WITH_NEW_XORG) -JOYVER= 1.6.0 +JOYVER= 1.6.2 JOYREVISION= 0 .else JOYVER= 1.5.0 diff --git a/x11-drivers/xf86-input-joystick/distinfo b/x11-drivers/xf86-input-joystick/distinfo index db447f9..821ce73 100644 --- a/x11-drivers/xf86-input-joystick/distinfo +++ b/x11-drivers/xf86-input-joystick/distinfo @@ -1,4 +1,4 @@ SHA256 (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9 SIZE (xorg/driver/xf86-input-joystick-1.5.0.tar.bz2) = 283763 -SHA256 (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 4f1c15ec7372dd340ec7e1a8ca19d75148896ee3883184c3663cbaa12cf738f1 -SIZE (xorg/driver/xf86-input-joystick-1.6.0.tar.bz2) = 310552 +SHA256 (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = ee3b86ed72f3b5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d +SIZE (xorg/driver/xf86-input-joystick-1.6.2.tar.bz2) = 327539 diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile index 86be55c..c4d4ae6 100644 --- a/x11-drivers/xf86-input-keyboard/Makefile +++ b/x11-drivers/xf86-input-keyboard/Makefile @@ -1,19 +1,14 @@ -# New ports collection makefile for: xf86-input-keyboard -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-input-keyboard -PORTVERSION= 1.6.1 +PORTVERSION= 1.7.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org keyboard input driver XORG_CAT= driver -USE_XORG= kbproto xextproto videoproto +USE_XORG= kbproto MAN4= kbd.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo index f093391..35dda24 100644 --- a/x11-drivers/xf86-input-keyboard/distinfo +++ b/x11-drivers/xf86-input-keyboard/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3 -SIZE (xorg/driver/xf86-input-keyboard-1.6.1.tar.bz2) = 304166 +SHA256 (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c +SIZE (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 319043 diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile index 38eb761..9b48bf0 100644 --- a/x11-drivers/xf86-input-magictouch/Makefile +++ b/x11-drivers/xf86-input-magictouch/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xf86-input-magictouch -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-input-magictouch PORTVERSION= 1.0.0.5 diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile index 42ee890..cabe85a 100644 --- a/x11-drivers/xf86-input-mouse/Makefile +++ b/x11-drivers/xf86-input-mouse/Makefile @@ -1,18 +1,14 @@ -# Created by: Florent Thoumie <flz@FreeBSD.org> # $FreeBSD$ PORTNAME= xf86-input-mouse -PORTVERSION= 1.7.1 -PORTREVISION= 1 +PORTVERSION= 1.9.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org mouse input driver -CONFIGURE_ARGS+=--disable-silent-rules - XORG_CAT= driver -USE_XORG= xextproto videoproto +USES= pathfix MAN4= mousedrv.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-mouse/distinfo b/x11-drivers/xf86-input-mouse/distinfo index 890cfcb..00bb525 100644 --- a/x11-drivers/xf86-input-mouse/distinfo +++ b/x11-drivers/xf86-input-mouse/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12 -SIZE (xorg/driver/xf86-input-mouse-1.7.1.tar.bz2) = 319429 +SHA256 (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 5d601e4bae53d5e9ead4ecd700f1beb5aeaf78b79e634c4aa381a9ce00276488 +SIZE (xorg/driver/xf86-input-mouse-1.9.0.tar.bz2) = 353339 diff --git a/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c b/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c index b1da04c..078d52a 100644 --- a/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c +++ b/x11-drivers/xf86-input-mouse/files/patch-src-bsd_mouse.c @@ -1,64 +1,57 @@ ---- src/bsd_mouse.c.orig 2008-11-26 23:11:36.000000000 -0500 -+++ src/bsd_mouse.c 2009-04-07 17:10:17.000000000 -0400 -@@ -1,4 +1,3 @@ -- - /* - * Copyright (c) 1999-2003 by The XFree86 Project, Inc. - * -@@ -71,15 +70,20 @@ +--- src/bsd_mouse.c.orig 2012-07-27 08:10:56.000000000 +0200 ++++ src/bsd_mouse.c 2012-07-30 00:49:09.000000000 +0200 +@@ -71,15 +71,20 @@ static const char *FindDevice(InputInfoPtr, const char *, int); #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -+#if !defined(XPS2_SUPPORT) && (__FreeBSD_kernel_version >= 700106) ++#if !defined(XPS2_SUPPORT) +#define XPS2_SUPPORT +#endif /* These are for FreeBSD and DragonFly */ - #define DEFAULT_MOUSE_DEV "/dev/mouse" - #define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse" - #define DEFAULT_PS2_DEV "/dev/psm0" -+#define DEFAULT_USB_DEV "/dev/ums0" + #define DEFAULT_MOUSE_DEV "/dev/mouse" + #define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse" + #define DEFAULT_PS2_DEV "/dev/psm0" ++#define DEFAULT_USB_DEV "/dev/ums0" static const char *mouseDevs[] = { - DEFAULT_MOUSE_DEV, - DEFAULT_SYSMOUSE_DEV, - DEFAULT_PS2_DEV, -+ DEFAULT_USB_DEV, - NULL + DEFAULT_MOUSE_DEV, + DEFAULT_SYSMOUSE_DEV, + DEFAULT_PS2_DEV, ++ DEFAULT_USB_DEV, + NULL }; #elif (defined(__OpenBSD__) || defined(__NetBSD__)) && defined(WSCONS_SUPPORT) -@@ -100,7 +104,11 @@ +@@ -100,7 +105,11 @@ #if defined(__NetBSD__) return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) - return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC; + return MSE_SERIAL | MSE_BUS | MSE_PS2 | +#ifdef XPS2_SUPPORT -+ MSE_XPS2 | ++ MSE_XPS2 | +#endif -+ MSE_AUTO | MSE_MISC; ++ MSE_AUTO | MSE_MISC; #else - return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO; + return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO | MSE_MISC; #endif -@@ -179,10 +187,31 @@ - { MOUSE_PROTO_THINK, "ThinkingMouse" }, - { MOUSE_PROTO_SYSMOUSE, "SysMouse" } +@@ -180,9 +189,30 @@ + { MOUSE_PROTO_SYSMOUSE, "SysMouse" } }; -- -+ + +#ifdef XPS2_SUPPORT +static struct { -+ int dmodel; -+ char *name; ++ int dmodel; ++ char *name; +} ps2proto[] = { -+ { MOUSE_MODEL_NETSCROLL, "NetScrollPS/2" }, -+ { MOUSE_MODEL_NET, "NetMousePS/2" }, -+ { MOUSE_MODEL_GLIDEPOINT, "GlidePointPS/2" }, -+ { MOUSE_MODEL_THINK, "ThinkingMousePS/2" }, -+ { MOUSE_MODEL_INTELLI, "IMPS/2" }, -+ { MOUSE_MODEL_MOUSEMANPLUS, "MouseManPlusPS/2" }, -+ { MOUSE_MODEL_EXPLORER, "ExplorerPS/2" }, -+ { MOUSE_MODEL_4D, "IMPS/2" }, -+ { MOUSE_MODEL_4DPLUS, "IMPS/2" }, ++ { MOUSE_MODEL_NETSCROLL, "NetScrollPS/2" }, ++ { MOUSE_MODEL_NET, "NetMousePS/2" }, ++ { MOUSE_MODEL_GLIDEPOINT, "GlidePointPS/2" }, ++ { MOUSE_MODEL_THINK, "ThinkingMousePS/2" }, ++ { MOUSE_MODEL_INTELLI, "IMPS/2" }, ++ { MOUSE_MODEL_MOUSEMANPLUS, "MouseManPlusPS/2" }, ++ { MOUSE_MODEL_EXPLORER, "ExplorerPS/2" }, ++ { MOUSE_MODEL_4D, "IMPS/2" }, ++ { MOUSE_MODEL_4DPLUS, "IMPS/2" }, +}; +#endif + @@ -72,56 +65,52 @@ int i; mousehw_t hw; mousemode_t mode; -@@ -190,10 +219,16 @@ +@@ -190,7 +220,13 @@ if (pInfo->fd == -1) - return NULL; + return NULL; +#ifdef XPS2_SUPPORT /* set the driver operation level, if applicable */ + dev = xf86FindOptionValue(pInfo->options, "Device"); + if (dev != NULL && !strncmp(dev, DEFAULT_PS2_DEV, 8)) -+ i = 2; ++ i = 2; + else +#endif i = 1; ioctl(pInfo->fd, MOUSE_SETLEVEL, &i); -- -+ - /* interrogate the driver and get some intelligence on the device. */ - hw.iftype = MOUSE_IF_UNKNOWN; - hw.model = MOUSE_MODEL_GENERIC; -@@ -209,9 +244,18 @@ - protoPara[0] = mode.syncmask[0]; - protoPara[1] = mode.syncmask[1]; - } -+ proto = devproto[i].name; + +@@ -209,9 +245,18 @@ + protoPara[0] = mode.syncmask[0]; + protoPara[1] = mode.syncmask[1]; + } ++ proto = devproto[i].name; +#ifdef XPS2_SUPPORT -+ if (mode.protocol == MOUSE_PROTO_PS2) -+ for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i) -+ if (hw.model == ps2proto[i].dmodel) { -+ proto = ps2proto[i].name; -+ break; -+ } ++ if (mode.protocol == MOUSE_PROTO_PS2) ++ for (i = 0; i < sizeof(ps2proto)/sizeof(ps2proto[0]); ++i) ++ if (hw.model == ps2proto[i].dmodel) { ++ proto = ps2proto[i].name; ++ break; ++ } +#endif - xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n", -- pInfo->name, devproto[i].name); -- return devproto[i].name; -+ pInfo->name, proto); -+ return proto; - } - } + xf86MsgVerb(X_INFO, 3, "%s: SetupAuto: protocol is %s\n", +- pInfo->name, devproto[i].name); +- return devproto[i].name; ++ pInfo->name, proto); ++ return proto; + } + } } -@@ -234,41 +278,41 @@ - (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) { - /* - * As the FreeBSD sysmouse driver defaults to protocol level 0 -- * everytime it is opened we enforce protocol level 1 again at -+ * everytime it is closed we enforce protocol level 1 again at - * this point. - */ - mode.level = 1; +@@ -234,41 +279,41 @@ + (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) { + /* + * As the FreeBSD sysmouse driver defaults to protocol level 0 +- * everytime it is opened we enforce protocol level 1 again at ++ * everytime it is closed we enforce protocol level 1 again at + * this point. + */ + mode.level = 1; } else -- mode.level = -1; +- mode.level = -1; -#else - mode.level = -1; #endif @@ -151,26 +140,26 @@ + unsigned int i; - if ((f = fopen(MOUSED_PID_FILE, "r")) != NULL) { -- if (fscanf(f, "%u", &pid) == 1 && pid > 0) { -- if (kill(pid, 0) == 0) { -- fclose(f); -- return TRUE; -- } +- if (fscanf(f, "%u", &pid) == 1 && pid > 0) { +- if (kill(pid, 0) == 0) { +- fclose(f); +- return TRUE; +- } + if (dev) -+ sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev); ++ sprintf(cmd, "sh -c 'fstat %s | grep -c moused' 2>/dev/null", dev); + else -+ sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null"); ++ sprintf(cmd, "sh -c 'pgrep -nx moused' 2>/dev/null"); + if ((f = popen(cmd, "r")) != NULL) { -+ if (fscanf(f, "%u", &i) == 1 && i > 0) { -+ pclose(f); -+ return TRUE; - } -- fclose(f); -+ pclose(f); ++ if (fscanf(f, "%u", &i) == 1 && i > 0) { ++ pclose(f); ++ return TRUE; + } +- fclose(f); ++ pclose(f); } return FALSE; } -@@ -276,17 +320,17 @@ +@@ -276,17 +321,17 @@ static const char * FindDevice(InputInfoPtr pInfo, const char *protocol, int flags) { @@ -182,63 +171,63 @@ struct stat sb; for (pdev = mouseDevs; *pdev; pdev++) { -- SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK)); -- if (fd == -1) { -+ SYSCALL (ret = stat(*pdev, &sb)); -+ if (ret == -1) { +- SYSCALL (fd = open(*pdev, O_RDWR | O_NONBLOCK)); +- if (fd == -1) { ++ SYSCALL (ret = stat(*pdev, &sb)); ++ if (ret == -1) { #ifdef DEBUG -- ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno)); -+ ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno)); +- ErrorF("Cannot open %s (%s)\n", *pdev, strerror(errno)); ++ ErrorF("Cannot stat %s (%s)\n", *pdev, strerror(errno)); #endif - } else { - /* -@@ -295,28 +339,32 @@ - * the test for whether /dev/sysmouse is usable can be made. - */ - if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) { -- if (fstat(fd, &devMouseStat) == 0) -- devMouse = TRUE; -- close(fd); -+ memcpy(&devMouseStat, &sb, sizeof(devMouseStat)); -+ devMouse = TRUE; - continue; - } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) { - /* Check if /dev/mouse is the same as /dev/sysmouse. */ -- if (devMouse && fstat(fd, &sb) == 0 && -- devMouseStat.st_dev == sb.st_dev && -+ if (devMouse && devMouseStat.st_dev == sb.st_dev && - devMouseStat.st_ino == sb.st_ino) { - /* If the same, use /dev/sysmouse. */ - devMouse = FALSE; - } -- close(fd); -- if (MousedRunning()) -+ if (MousedRunning(NULL)) - break; -- else { + } else { + /* +@@ -295,28 +340,32 @@ + * the test for whether /dev/sysmouse is usable can be made. + */ + if (!strcmp(*pdev, DEFAULT_MOUSE_DEV)) { +- if (fstat(fd, &devMouseStat) == 0) +- devMouse = TRUE; +- close(fd); ++ memcpy(&devMouseStat, &sb, sizeof(devMouseStat)); ++ devMouse = TRUE; + continue; + } else if (!strcmp(*pdev, DEFAULT_SYSMOUSE_DEV)) { + /* Check if /dev/mouse is the same as /dev/sysmouse. */ +- if (devMouse && fstat(fd, &sb) == 0 && +- devMouseStat.st_dev == sb.st_dev && ++ if (devMouse && devMouseStat.st_dev == sb.st_dev && + devMouseStat.st_ino == sb.st_ino) { + /* If the same, use /dev/sysmouse. */ + devMouse = FALSE; + } +- close(fd); +- if (MousedRunning()) ++ if (MousedRunning(NULL)) + break; +- else { -#ifdef DEBUG -- ErrorF("moused isn't running\n"); +- ErrorF("moused isn't running\n"); -#endif -- } - } else { -- close(fd); -+ /* Check if /dev/mouse is the same as this device. */ -+ if (devMouse && devMouseStat.st_dev == sb.st_dev && -+ devMouseStat.st_ino == sb.st_ino) { -+ /* If the same, use this device. */ -+ devMouse = FALSE; -+ } -+ if (MousedRunning(*pdev)) -+ continue; -+ /* ums(4) does not support anything but SysMouse protocol. */ -+ if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol && -+ xf86NameCmp(protocol, "auto") != 0 && -+ xf86NameCmp(protocol, "sysmouse") != 0) -+ continue; - break; - } - } -@@ -782,7 +830,9 @@ +- } + } else { +- close(fd); ++ /* Check if /dev/mouse is the same as this device. */ ++ if (devMouse && devMouseStat.st_dev == sb.st_dev && ++ devMouseStat.st_ino == sb.st_ino) { ++ /* If the same, use this device. */ ++ devMouse = FALSE; ++ } ++ if (MousedRunning(*pdev)) ++ continue; ++ /* ums(4) does not support anything but SysMouse protocol. */ ++ if (!strncmp(*pdev, DEFAULT_USB_DEV, 8) && protocol && ++ xf86NameCmp(protocol, "auto") != 0 && ++ xf86NameCmp(protocol, "sysmouse") != 0) ++ continue; + break; + } + } +@@ -764,7 +813,9 @@ p->CheckProtocol = CheckProtocol; #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE) p->SetupAuto = SetupAuto; diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in b/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in new file mode 100644 index 0000000..5b1c899 --- /dev/null +++ b/x11-drivers/xf86-input-mouse/files/patch-src_Makefile.in @@ -0,0 +1,11 @@ +--- ./src/Makefile.in.orig 2011-07-05 18:09:54.000000000 +0200 ++++ ./src/Makefile.in 2012-03-02 14:02:43.000000000 +0100 +@@ -279,7 +279,7 @@ + # _ladir passes a dummy rpath to libtool so the thing will actually link + # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. + @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la +-@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version ++@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version -lusbhid + @DRIVER_NAME@_drv_ladir = @inputdir@ + + # We have to list all the mouse drivers here, even if we don't build them, so diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c index 8255608..2d363d5 100644 --- a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c +++ b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.c @@ -1,11 +1,182 @@ ---- src/mouse.c.orig 2012-10-18 11:06:28.000000000 +0400 -+++ src/mouse.c 2012-10-18 11:06:57.000000000 +0400 -@@ -872,6 +872,8 @@ MousePreInit(InputDriverPtr drv, IDevPtr - pInfo->private_flags = 0; - pInfo->always_core_feedback = NULL; +--- src/mouse.c.orig 2012-07-27 08:10:56.000000000 +0200 ++++ src/mouse.c 2012-07-30 00:31:48.000000000 +0200 +@@ -280,13 +280,39 @@ -+ COLLECT_INPUT_OPTIONS(pInfo, NULL); + pMse = pInfo->private; + +- pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0); ++ i = xf86SetIntOption(pInfo->options, "Buttons", 0); ++ if (i != 0) ++ pMse->buttons = i; + if (!pMse->buttons) { + pMse->buttons = MSE_DFLTBUTTONS; + buttons_from = X_DEFAULT; + } + origButtons = pMse->buttons; + ++ s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL); ++ if (s) { ++ int b, n = 0; ++ char *s1 = s; ++ /* keep getting numbers which are buttons */ ++ while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) { ++ /* check sanity for a button */ ++ if (b < 0 || b > MSE_MAXBUTTONS) { ++ xf86Msg(X_WARNING, ++ "ButtonMapping: Invalid button number = %d\n", b); ++ break; ++ }; ++ pMse->buttonMap[n++] = 1 << (b-1); ++ if (b > pMse->buttons) pMse->buttons = b; ++ } ++ free(s); ++ } ++ /* get maximum of mapped buttons */ ++ for (i = pMse->buttons-1; i >= 0; i--) { ++ int f = ffs (pMse->buttonMap[i]); ++ if (f > pMse->buttons) ++ pMse->buttons = f; ++ } + - if (NewMousePreInit(drv, pInfo, flags) == Success) - { - /* Check if SendDragEvents has been disabled. */ + pMse->emulate3Buttons = xf86SetBoolOption(pInfo->options, + "Emulate3Buttons", FALSE); + if (!xf86FindOptionValue(pInfo->options,"Emulate3Buttons")) { +@@ -298,6 +324,8 @@ + "Emulate3Timeout", 50); + if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) { + MessageType from = X_CONFIG; ++ if (pMse->buttons < 3) ++ pMse->buttons = 3; + if (pMse->emulate3ButtonsSoft) + from = X_DEFAULT; + xf86Msg(from, "%s: Emulate3Buttons, Emulate3Timeout: %d\n", +@@ -305,6 +333,8 @@ + } + + pMse->chordMiddle = xf86SetBoolOption(pInfo->options, "ChordMiddle", FALSE); ++ if (pMse->chordMiddle && pMse->buttons < 3) ++ pMse->buttons = 3; + pMse->flipXY = xf86SetBoolOption(pInfo->options, "FlipXY", FALSE); + if (xf86SetBoolOption(pInfo->options, "InvX", FALSE)) { + pMse->invX = -1; +@@ -315,7 +345,7 @@ + } else + pMse->invY = 1; + pMse->angleOffset = xf86SetIntOption(pInfo->options, "AngleOffset", 0); +- ++ pMse->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0); + + if (pMse->pDragLock) + free(pMse->pDragLock); +@@ -425,14 +455,17 @@ + free(s); + } + +- s = xf86SetStrOption(pInfo->options, "ZAxisMapping", "4 5"); ++ s = xf86SetStrOption(pInfo->options, "ZAxisMapping", ++ pMse->hasZ ? ( pMse->hasW ? "4 5 6 7" : "4 5" ) : "off"); + if (s) { + int b1 = 0, b2 = 0, b3 = 0, b4 = 0; + char *msg = NULL; + + pMse->negativeZ = pMse->positiveZ = MSE_NOAXISMAP; + pMse->negativeW = pMse->positiveW = MSE_NOAXISMAP; +- if (!xf86NameCmp(s, "x")) { ++ if (!xf86NameCmp(s, "off")) { ++ msg = xstrdup("off"); ++ } else if (!xf86NameCmp(s, "x")) { + pMse->negativeZ = pMse->positiveZ = MSE_MAPTOX; + msg = xstrdup("X axis"); + } else if (!xf86NameCmp(s, "y")) { +@@ -568,29 +601,6 @@ + pInfo->name, wheelButton, pMse->wheelInertia, + pMse->wheelButtonTimeout); + } +- s = xf86SetStrOption(pInfo->options, "ButtonMapping", NULL); +- if (s) { +- int b, n = 0; +- char *s1 = s; +- /* keep getting numbers which are buttons */ +- while (s1 && n < MSE_MAXBUTTONS && (b = strtol(s1, &s1, 10)) != 0) { +- /* check sanity for a button */ +- if (b < 0 || b > MSE_MAXBUTTONS) { +- xf86Msg(X_WARNING, +- "ButtonMapping: Invalid button number = %d\n", b); +- break; +- }; +- pMse->buttonMap[n++] = 1 << (b-1); +- if (b > pMse->buttons) pMse->buttons = b; +- } +- free(s); +- } +- /* get maximum of mapped buttons */ +- for (i = pMse->buttons-1; i >= 0; i--) { +- int f = ffs (pMse->buttonMap[i]); +- if (f > pMse->buttons) +- pMse->buttons = f; +- } + if (origButtons != pMse->buttons) + buttons_from = X_CONFIG; + xf86Msg(buttons_from, "%s: Buttons: %d\n", pInfo->name, pMse->buttons); +@@ -668,7 +678,6 @@ + } + pMse->sampleRate = xf86SetIntOption(pInfo->options, "SampleRate", 0); + pMse->resolution = xf86SetIntOption(pInfo->options, "Resolution", 0); +- mPriv->sensitivity = xf86SetRealOption(pInfo->options, "Sensitivity", 1.0); + } + + static void +@@ -959,6 +968,8 @@ + /* Default Mapping: 1 2 3 8 9 10 11 ... */ + for (i = 0; i < MSE_MAXBUTTONS; i++) + pMse->buttonMap[i] = 1 << (i > 2 && i < MSE_MAXBUTTONS-4 ? i+4 : i); ++ pMse->hasZ = 1; ++ pMse->hasW = 0; + + protocol = MousePickProtocol(pInfo, device, protocol, &protocolID); + +@@ -2137,7 +2148,7 @@ + + if (pMse->emulateWheel) { + /* Emulate wheel button handling */ +- if(pMse->wheelButton == 0) ++ if (pMse->wheelButton == 0) + wheelButtonMask = 0; + else + wheelButtonMask = 1 << (pMse->wheelButton - 1); +@@ -2221,6 +2232,9 @@ + } + } + } ++ } else { ++ pMse->wheelXDistance = 0; ++ pMse->wheelYDistance = 0; + } + + /* Absorb the mouse movement while the wheel button is pressed. */ +@@ -2238,7 +2252,7 @@ + if (pMse->emulate3ButtonsSoft && pMse->emulate3Pending && (dx || dy)) + buttonTimer(pInfo); + +- if (dx || dy) ++ if ((dx || dy) && !pMse->disableXY) + xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy); + + if (change) { +@@ -2448,11 +2462,11 @@ + + /* Accumulate the scaled dx, dy in the private variables + fracdx,fracdy and return the integer number part */ +- if (mousepriv) { +- mousepriv->fracdx += mousepriv->sensitivity*dx; +- mousepriv->fracdy += mousepriv->sensitivity*dy; +- mousepriv->fracdx -= ( dx=(int)(mousepriv->fracdx) ); +- mousepriv->fracdy -= ( dy=(int)(mousepriv->fracdy) ); ++ if (pMse->sensitivity != 0) { ++ pMse->fracdx += pMse->sensitivity*dx; ++ pMse->fracdy += pMse->sensitivity*dy; ++ pMse->fracdx -= ( dx=(int)(pMse->fracdx) ); ++ pMse->fracdy -= ( dy=(int)(pMse->fracdy) ); + } + + /* If mouse wheel movement has to be mapped on a button, we need to diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h new file mode 100644 index 0000000..abb2ac9 --- /dev/null +++ b/x11-drivers/xf86-input-mouse/files/patch-src_mouse.h @@ -0,0 +1,25 @@ +--- src/mouse.h.orig 2012-07-27 08:10:56.000000000 +0200 ++++ src/mouse.h 2012-07-30 00:41:02.000000000 +0200 +@@ -217,10 +217,13 @@ + Bool emulate3ButtonsSoft; + int emulate3Timeout;/* Timeout for 3 button emulation */ + Bool chordMiddle; ++ Bool disableXY; + Bool flipXY; + int invX; + int invY; + int resolution; ++ Bool hasW; ++ Bool hasZ; + int negativeZ; /* button mask */ + int positiveZ; /* button mask */ + int negativeW; /* button mask */ +@@ -259,6 +262,8 @@ + int doubleClickOldSourceState; + int lastMappedButtons; + int buttonMap[MSE_MAXBUTTONS]; ++ float fracdx,fracdy; ++ float sensitivity; + } MouseDevRec, *MouseDevPtr; + + #endif /* _XF86OSMOUSE_H_ */ diff --git a/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h b/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h new file mode 100644 index 0000000..8abb8c3 --- /dev/null +++ b/x11-drivers/xf86-input-mouse/files/patch-src_mousePriv.h @@ -0,0 +1,11 @@ +--- src/mousePriv.h.orig 2012-07-27 08:10:56.000000000 +0200 ++++ src/mousePriv.h 2012-07-30 00:39:00.000000000 +0200 +@@ -63,8 +63,6 @@ + int acc; + CARD32 pnpLast; + Bool disablePnPauto; +- float fracdx,fracdy; +- float sensitivity; + } mousePrivRec, *mousePrivPtr; + + /* mouse proto flags */ diff --git a/x11-drivers/xf86-input-mouse/pkg-plist b/x11-drivers/xf86-input-mouse/pkg-plist index dd465f1..3e9b203 100644 --- a/x11-drivers/xf86-input-mouse/pkg-plist +++ b/x11-drivers/xf86-input-mouse/pkg-plist @@ -1,5 +1,8 @@ +include/xorg/xf86-mouse-properties.h lib/xorg/modules/input/mouse_drv.la lib/xorg/modules/input/mouse_drv.so +libdata/pkgconfig/xorg-mouse.pc @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg +@dirrmtry include/xorg diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile index adb94e6..7e5d23c 100644 --- a/x11-drivers/xf86-input-mutouch/Makefile +++ b/x11-drivers/xf86-input-mutouch/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xf86-input-mutouch -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-input-mutouch PORTVERSION= 1.3.0 @@ -13,7 +8,6 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org mutouch input driver XORG_CAT= driver -USE_XORG= xextproto videoproto MAN4= mutouch.4x .if !defined(WITH_NEW_XORG) diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile index 5fdd360..9f29f54 100644 --- a/x11-drivers/xf86-input-penmount/Makefile +++ b/x11-drivers/xf86-input-penmount/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xf86-input-penmount -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-input-penmount PORTVERSION= ${PEN_VERSION} @@ -14,7 +9,6 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org penmount input driver XORG_CAT= driver -USE_XORG= xextproto videoproto MAN4= penmount.4x .if defined(WITH_NEW_XORG) diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile index 8a5e57c..aec3f7d 100644 --- a/x11-drivers/xf86-input-synaptics/Makefile +++ b/x11-drivers/xf86-input-synaptics/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: xf86-input-synaptics -# Date Created: 25 Sep 2008 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-input-synaptics -PORTVERSION= 1.5.0 +PORTVERSION= ${SYNAPTICS_VERSION} +PORTREVISION= ${SYNAPTICS_REVISION} CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -14,25 +10,47 @@ COMMENT= X.Org synaptics input driver CONFLICTS= synaptics-[0-9]* -LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal +OPTIONS_DEFINE= HAL +OPTIONS_DEFAULT=HAL + +.include <bsd.port.options.mk> -USES= pathfix -USE_XORG= x11 xextproto videoproto +USES= pathfix +USE_XORG= x11 XORG_CAT= driver +.if ${PORT_OPTIONS:MHAL} +PLIST_SUB+= HAL="" +LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal +.else +PLIST_SUB+= HAL="@comment " +.endif + MAN1= syndaemon.1 \ synclient.1 MAN4= synaptics.4x -post-install: - ${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor - ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \ - ${PREFIX}/share/hal/fdi/policy/10osvendor/ - .if defined(WITH_NEW_XORG) +SYNAPTICS_VERSION= 1.7.1 +SYNAPTICS_REVISION= 0 PLIST_SUB+= NEW="" OLD="@comment " .else +SYNAPTICS_VERSION= 1.6.4 +SYNAPTICS_REVISION= 0 PLIST_SUB+= NEW="@comment " OLD="" +EXTRA_PATCHES+= ${PATCHDIR}/extra-Makefile.in +.endif + +post-install: +.if ${PORT_OPTIONS:MHAL} + ${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor + ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \ + ${PREFIX}/share/hal/fdi/policy/10osvendor/ +.if !defined(WITH_NEW_XORG) + ${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty + ${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \ + ${PREFIX}/share/hal/fdi/policy/20thirdparty/ +.endif .endif .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo index 21ece95..bad1c22 100644 --- a/x11-drivers/xf86-input-synaptics/distinfo +++ b/x11-drivers/xf86-input-synaptics/distinfo @@ -1,2 +1,4 @@ -SHA256 (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 95cc5399fc49c9a35b02c2272cd99b8438f4609b219278c66a79e74c916a1c4e -SIZE (xorg/driver/xf86-input-synaptics-1.5.0.tar.bz2) = 431123 +SHA256 (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = fe15b1afc61b40800f74a0dcf976c15b299ca0680ae5e537baef543455a732ee +SIZE (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = 447004 +SHA256 (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = db5825660e1fb23190697f609bf75d4450fe707344a14298e1c9b47039bbb58e +SIZE (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = 441407 diff --git a/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in b/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in new file mode 100644 index 0000000..957f9fc --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/files/extra-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2013-04-04 14:47:16.881259598 +0200 ++++ Makefile.in 2013-04-04 14:47:20.568244417 +0200 +@@ -321,7 +321,7 @@ + --with-sdkdir='$${includedir}/xorg' \ + --with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d' + +-SUBDIRS = include src man tools conf test ++SUBDIRS = include src man tools test + MAINTAINERCLEANFILES = ChangeLog INSTALL + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = xorg-synaptics.pc diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf86-input-synaptics/pkg-plist index 4d1aec8..3f9ad11 100644 --- a/x11-drivers/xf86-input-synaptics/pkg-plist +++ b/x11-drivers/xf86-input-synaptics/pkg-plist @@ -1,18 +1,18 @@ bin/synclient bin/syndaemon include/xorg/synaptics-properties.h -include/xorg/synaptics.h +%%OLD%%include/xorg/synaptics.h lib/xorg/modules/input/synaptics_drv.la lib/xorg/modules/input/synaptics_drv.so libdata/pkgconfig/xorg-synaptics.pc %%NEW%%share/X11/xorg.conf.d/50-synaptics.conf -share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi -%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi +%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi +%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg @dirrmtry include/xorg -@dirrmtry share/hal/fdi/policy/10osvendor -@dirrmtry share/hal/fdi/policy -@dirrmtry share/hal/fdi -@dirrmtry share/hal +%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor +%%HAL%%@dirrmtry share/hal/fdi/policy +%%HAL%%@dirrmtry share/hal/fdi +%%HAL%%@dirrmtry share/hal diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile index 7bfac60..ca879b5 100644 --- a/x11-drivers/xf86-input-vmmouse/Makefile +++ b/x11-drivers/xf86-input-vmmouse/Makefile @@ -1,18 +1,15 @@ -# New ports collection makefile for: xf86-input-vmmouse -# Date Created: 17 Feb 2006 -# Whom: NIIMI Satoshi <sa2c@sa2c.net> -# +# Created by: NIIMI Satoshi <sa2c@sa2c.net> # $FreeBSD$ -# PORTNAME= xf86-input-vmmouse -PORTVERSION= 12.6.9 -PORTREVISION= 2 +PORTVERSION= 13.0.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org vmmouse input driver +LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal + XORG_CAT= driver CONFIGURE_ARGS= --with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts USE_GMAKE= yes @@ -23,4 +20,10 @@ MAN4= vmmouse.4x ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= The vmmouse protocol is only supported on x86-compatible architectures. +.if defined(WITH_NEW_XORG) +PLIST_SUB+= NEW="" +.else +PLIST_SUB+= NEW="@comment " +.endif + .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-vmmouse/distinfo b/x11-drivers/xf86-input-vmmouse/distinfo index d3fd665..0445b6b 100644 --- a/x11-drivers/xf86-input-vmmouse/distinfo +++ b/x11-drivers/xf86-input-vmmouse/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = a5e2069fc080de9c7d037c0def0135a5c93b76a8b535099e021d65a5e1d0b00f -SIZE (xorg/driver/xf86-input-vmmouse-12.6.9.tar.bz2) = 273002 +SHA256 (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c +SIZE (xorg/driver/xf86-input-vmmouse-13.0.0.tar.bz2) = 314269 diff --git a/x11-drivers/xf86-input-vmmouse/pkg-plist b/x11-drivers/xf86-input-vmmouse/pkg-plist index d5ba6a3..0af5d79 100644 --- a/x11-drivers/xf86-input-vmmouse/pkg-plist +++ b/x11-drivers/xf86-input-vmmouse/pkg-plist @@ -2,6 +2,7 @@ bin/vmmouse_detect libexec/hal/scripts/hal-probe-vmmouse lib/xorg/modules/input/vmmouse_drv.la lib/xorg/modules/input/vmmouse_drv.so +%%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile index deea0df..d768b9d 100644 --- a/x11-drivers/xf86-input-void/Makefile +++ b/x11-drivers/xf86-input-void/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xf86-input-void -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-input-void PORTVERSION= ${VOID_VERSION} @@ -14,7 +9,6 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org void input driver XORG_CAT= driver -USE_XORG= xextproto videoproto MAN4= void.4x .if defined(WITH_NEW_XORG) diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile index 96546c4..65e37a3 100644 --- a/x11-drivers/xf86-video-apm/Makefile +++ b/x11-drivers/xf86-video-apm/Makefile @@ -1,20 +1,13 @@ -# New ports collection makefile for: xf86-video-apm -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-apm -PORTVERSION= 1.2.3 -PORTREVISION= 1 +PORTVERSION= 1.2.5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org apm display driver XORG_CAT= driver -USE_XORG= videoproto xextproto MAN4= apm.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-apm/distinfo b/x11-drivers/xf86-video-apm/distinfo index 230f03e..cd9591f 100644 --- a/x11-drivers/xf86-video-apm/distinfo +++ b/x11-drivers/xf86-video-apm/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 4046ea18dbd76a9df5f68695025c2c411c20564af9198974506a041ebd4a30da -SIZE (xorg/driver/xf86-video-apm-1.2.3.tar.bz2) = 295470 +SHA256 (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f +SIZE (xorg/driver/xf86-video-apm-1.2.5.tar.bz2) = 325277 diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile index de559d8..c3e8443 100644 --- a/x11-drivers/xf86-video-ark/Makefile +++ b/x11-drivers/xf86-video-ark/Makefile @@ -1,19 +1,12 @@ -# New ports collection makefile for: xf86-video-ark -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-ark -PORTVERSION= 0.7.3 -PORTREVISION= 1 +PORTVERSION= 0.7.5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org ark display driver XORG_CAT= driver -USE_XORG= xextproto videoproto .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-ark/distinfo b/x11-drivers/xf86-video-ark/distinfo index d7e2a50..bbd43c7 100644 --- a/x11-drivers/xf86-video-ark/distinfo +++ b/x11-drivers/xf86-video-ark/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98 -SIZE (xorg/driver/xf86-video-ark-0.7.3.tar.bz2) = 238946 +SHA256 (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e +SIZE (xorg/driver/xf86-video-ark-0.7.5.tar.bz2) = 290423 diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile index 0f173cd..369e3d2 100644 --- a/x11-drivers/xf86-video-ati/Makefile +++ b/x11-drivers/xf86-video-ati/Makefile @@ -1,13 +1,7 @@ -# New ports collection makefile for: xf86-video-ati -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-ati -PORTVERSION= 6.14.3 -PORTREVISION= 1 +PORTVERSION= 6.14.6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -15,7 +9,7 @@ COMMENT= X.Org ati display driver USE_GL= gl XORG_CAT= driver -USE_XORG= xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto +USE_XORG= xf86driproto xineramaproto xf86miscproto glproto MAN4= ati.4x radeon.4x CONFIGURE_ARGS+=--disable-kms diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo index 8308036..baa6ed5 100644 --- a/x11-drivers/xf86-video-ati/distinfo +++ b/x11-drivers/xf86-video-ati/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 844a2649eff6a3e92aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4 -SIZE (xorg/driver/xf86-video-ati-6.14.3.tar.bz2) = 1113119 +SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36 +SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = 1139495 diff --git a/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c b/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c index 84a992a..73d311a 100644 --- a/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c +++ b/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c @@ -1,17 +1,15 @@ ---- src/radeon_accel.c.orig 2012-04-15 19:36:08.000000000 +0200 -+++ src/radeon_accel.c 2012-04-15 19:36:15.000000000 +0200 -@@ -982,10 +982,9 @@ +--- src/radeon_accel.c.orig 2012-06-25 10:19:41.000000000 +0200 ++++ src/radeon_accel.c 2012-07-30 02:11:51.000000000 +0200 +@@ -967,10 +967,9 @@ for (; nwords > 0; --nwords, ++d, ++s) #ifdef __powerpc__ - asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d)); + asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d)); #else -- *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00) +- *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00) - | ((*s & 0xff00) << 8) | ((*s & 0xff) << 24); + *d = (*s >> 8) | (*s << 8); #endif return; - } - - + } diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile index 15e327e..0187092 100644 --- a/x11-drivers/xf86-video-chips/Makefile +++ b/x11-drivers/xf86-video-chips/Makefile @@ -1,19 +1,13 @@ -# New ports collection makefile for: xf86-video-chips -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-chips -PORTVERSION= 1.2.4 +PORTVERSION= 1.2.5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org chips display driver XORG_CAT= driver -USE_XORG= videoproto xextproto MAN4= chips.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-chips/distinfo b/x11-drivers/xf86-video-chips/distinfo index f03b719..a6eb707 100644 --- a/x11-drivers/xf86-video-chips/distinfo +++ b/x11-drivers/xf86-video-chips/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25 -SIZE (xorg/driver/xf86-video-chips-1.2.4.tar.bz2) = 365618 +SHA256 (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2 +SIZE (xorg/driver/xf86-video-chips-1.2.5.tar.bz2) = 398804 diff --git a/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am b/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am new file mode 100644 index 0000000..2ec5982 --- /dev/null +++ b/x11-drivers/xf86-video-chips/files/patch-util_Makefile.am @@ -0,0 +1,13 @@ +--- util/Makefile.am.orig 2013-03-25 20:49:28.885754151 +0100 ++++ util/Makefile.am 2013-03-25 20:50:10.467748226 +0100 +@@ -3,7 +3,7 @@ + noinst_PROGRAMS = dRegs mRegs modClock memClock + endif + +-dRegs_SOURCES = dRegs.c AsmMacros.h +-mRegs_SOURCES = mRegs.c AsmMacros.h +-modClock_SOURCES = modClock.c AsmMacros.h ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h + memClock_SOURCES = modClock.c AsmMacros.h diff --git a/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in b/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in new file mode 100644 index 0000000..b8d9624 --- /dev/null +++ b/x11-drivers/xf86-video-chips/files/patch-util_Makefile.in @@ -0,0 +1,15 @@ +--- util/Makefile.in.orig 2013-03-25 20:50:53.827746698 +0100 ++++ util/Makefile.in 2013-03-25 20:50:55.499747558 +0100 +@@ -238,9 +238,9 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-dRegs_SOURCES = dRegs.c AsmMacros.h +-mRegs_SOURCES = mRegs.c AsmMacros.h +-modClock_SOURCES = modClock.c AsmMacros.h ++dRegs_SOURCES = dRegs.c AsmMacros.h iopl.h ++mRegs_SOURCES = mRegs.c AsmMacros.h iopl.h ++modClock_SOURCES = modClock.c AsmMacros.h iopl.h + memClock_SOURCES = modClock.c AsmMacros.h + all: all-am + diff --git a/x11-drivers/xf86-video-chips/files/patch-util_iopl.h b/x11-drivers/xf86-video-chips/files/patch-util_iopl.h new file mode 100644 index 0000000..50db4d1 --- /dev/null +++ b/x11-drivers/xf86-video-chips/files/patch-util_iopl.h @@ -0,0 +1,63 @@ +--- util/iopl.h.orig 2013-03-25 20:48:15.486758154 +0100 ++++ util/iopl.h 2013-03-25 20:47:56.000000000 +0100 +@@ -0,0 +1,60 @@ ++#ifdef __NetBSD__ ++# include <sys/types.h> ++# include <machine/pio.h> ++# include <machine/sysarch.h> ++#else ++# if defined(__linux__) ++/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc ++ * # include <sys/io.h> ++ */ ++int iopl(int level); ++# endif ++# if defined(SVR4) && defined(i386) ++# include <sys/types.h> ++# ifdef NCR ++ /* broken NCR <sys/sysi86.h> */ ++# define __STDC ++# include <sys/sysi86.h> ++# undef __STDC ++# else ++# include <sys/sysi86.h> ++# endif ++# ifdef SVR4 ++# if !defined(sun) ++# include <sys/seg.h> ++# endif ++# endif ++# include <sys/v86.h> ++# if defined(sun) ++# include <sys/psw.h> ++# endif ++# endif ++# include "AsmMacros.h" ++#endif /* NetBSD */ ++ ++#include <unistd.h> ++#include <stdio.h> ++#include <stdlib.h> ++ ++#ifdef __NetBSD__ ++# define SET_IOPL() i386_iopl(3) ++# define RESET_IOPL() i386_iopl(0) ++#else ++# if defined(SVR4) && defined(i386) ++# ifndef SI86IOPL ++# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) ++# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) ++# else ++# define SET_IOPL() sysi86(SI86IOPL,3) ++# define RESET_IOPL() sysi86(SI86IOPL,0) ++# endif ++# else ++# ifdef linux ++# define SET_IOPL() iopl(3) ++# define RESET_IOPL() iopl(0) ++# else ++# define SET_IOPL() (void)0 ++# define RESET_IOPL() (void)0 ++# endif ++# endif ++#endif diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile index 0df0cf1..01a93fa 100644 --- a/x11-drivers/xf86-video-cirrus/Makefile +++ b/x11-drivers/xf86-video-cirrus/Makefile @@ -1,20 +1,13 @@ -# New ports collection makefile for: xf86-video-cirrus -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-cirrus -PORTVERSION= 1.3.2 -PORTREVISION= 2 +PORTVERSION= 1.5.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org cirrus display driver XORG_CAT= driver -USE_XORG= videoproto xextproto MAN4= cirrus.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-cirrus/distinfo b/x11-drivers/xf86-video-cirrus/distinfo index 936b7ca..cd297e4 100644 --- a/x11-drivers/xf86-video-cirrus/distinfo +++ b/x11-drivers/xf86-video-cirrus/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a -SIZE (xorg/driver/xf86-video-cirrus-1.3.2.tar.bz2) = 286949 +SHA256 (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7 +SIZE (xorg/driver/xf86-video-cirrus-1.5.2.tar.bz2) = 327547 diff --git a/x11-drivers/xf86-video-cyrix/Makefile b/x11-drivers/xf86-video-cyrix/Makefile index fd32fe3..e46a311 100644 --- a/x11-drivers/xf86-video-cyrix/Makefile +++ b/x11-drivers/xf86-video-cyrix/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xf86-video-cyrix -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-cyrix PORTVERSION= 1.1.0 diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile index 2154b3a..e4ab998 100644 --- a/x11-drivers/xf86-video-dummy/Makefile +++ b/x11-drivers/xf86-video-dummy/Makefile @@ -1,18 +1,13 @@ -# New ports collection makefile for: xf86-video-dummy -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-dummy -PORTVERSION= 0.3.5 +PORTVERSION= 0.3.6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org dummy display driver XORG_CAT= driver -USE_XORG= videoproto xf86dgaproto +USE_XORG= xf86dgaproto .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-dummy/distinfo b/x11-drivers/xf86-video-dummy/distinfo index 899bec9..bb0e34d 100644 --- a/x11-drivers/xf86-video-dummy/distinfo +++ b/x11-drivers/xf86-video-dummy/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f -SIZE (xorg/driver/xf86-video-dummy-0.3.5.tar.bz2) = 274761 +SHA256 (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798 +SIZE (xorg/driver/xf86-video-dummy-0.3.6.tar.bz2) = 285892 diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile index 09b6a6a..7f30b8d 100644 --- a/x11-drivers/xf86-video-fbdev/Makefile +++ b/x11-drivers/xf86-video-fbdev/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xf86-video-fbdev -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-fbdev -PORTVERSION= 0.4.2 +PORTVERSION= 0.4.3 PORTREVISION= 1 CATEGORIES= x11-drivers @@ -14,7 +9,6 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org fbdev display driver XORG_CAT= driver -USE_XORG= videoproto MAN4= fbdev.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-fbdev/distinfo b/x11-drivers/xf86-video-fbdev/distinfo index 9f19d13..603c5ce 100644 --- a/x11-drivers/xf86-video-fbdev/distinfo +++ b/x11-drivers/xf86-video-fbdev/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5 -SIZE (xorg/driver/xf86-video-fbdev-0.4.2.tar.bz2) = 263094 +SHA256 (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831 +SIZE (xorg/driver/xf86-video-fbdev-0.4.3.tar.bz2) = 289056 diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile index 320b6b1..e3175b1 100644 --- a/x11-drivers/xf86-video-glint/Makefile +++ b/x11-drivers/xf86-video-glint/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xf86-video-glint -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-glint -PORTVERSION= 1.2.6 +PORTVERSION= 1.2.8 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -15,7 +10,7 @@ COMMENT= X.Org glint display driver USE_GL= gl XORG_CAT= driver -USE_XORG= xf86driproto videoproto xextproto xf86dgaproto glproto +USE_XORG= xf86driproto xf86dgaproto glproto MAN4= glint.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-glint/distinfo b/x11-drivers/xf86-video-glint/distinfo index 1e7a988..8d55f37 100644 --- a/x11-drivers/xf86-video-glint/distinfo +++ b/x11-drivers/xf86-video-glint/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7 -SIZE (xorg/driver/xf86-video-glint-1.2.6.tar.bz2) = 393872 +SHA256 (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221 +SIZE (xorg/driver/xf86-video-glint-1.2.8.tar.bz2) = 395371 diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile index 8a570b8..9c6c57e 100644 --- a/x11-drivers/xf86-video-i128/Makefile +++ b/x11-drivers/xf86-video-i128/Makefile @@ -1,20 +1,13 @@ -# New ports collection makefile for: xf86-video-i128 -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-i128 -PORTVERSION= 1.3.4 -PORTREVISION= 1 +PORTVERSION= 1.3.6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org i128 display driver XORG_CAT= driver -USE_XORG= videoproto xextproto MAN4= i128.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-i128/distinfo b/x11-drivers/xf86-video-i128/distinfo index 1b2a870..2c29d2b 100644 --- a/x11-drivers/xf86-video-i128/distinfo +++ b/x11-drivers/xf86-video-i128/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf -SIZE (xorg/driver/xf86-video-i128-1.3.4.tar.bz2) = 292046 +SHA256 (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c +SIZE (xorg/driver/xf86-video-i128-1.3.6.tar.bz2) = 324894 diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile index b9f11c5..50f4c11 100644 --- a/x11-drivers/xf86-video-i740/Makefile +++ b/x11-drivers/xf86-video-i740/Makefile @@ -1,20 +1,13 @@ -# New ports collection makefile for: xf86-video-i740 -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-i740 -PORTVERSION= 1.3.2 -PORTREVISION= 2 +PORTVERSION= 1.3.4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org i740 display driver XORG_CAT= driver -USE_XORG= videoproto xextproto MAN4= i740.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-i740/distinfo b/x11-drivers/xf86-video-i740/distinfo index 2b108cd..1907b7d 100644 --- a/x11-drivers/xf86-video-i740/distinfo +++ b/x11-drivers/xf86-video-i740/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943 -SIZE (xorg/driver/xf86-video-i740-1.3.2.tar.bz2) = 273853 +SHA256 (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78 +SIZE (xorg/driver/xf86-video-i740-1.3.4.tar.bz2) = 316654 diff --git a/x11-drivers/xf86-video-imstt/Makefile b/x11-drivers/xf86-video-imstt/Makefile index cf048f3..d868793 100644 --- a/x11-drivers/xf86-video-imstt/Makefile +++ b/x11-drivers/xf86-video-imstt/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xf86-video-imstt -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-imstt PORTVERSION= 1.1.0 diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile index 5d6d0a6..e256158 100644 --- a/x11-drivers/xf86-video-intel/Makefile +++ b/x11-drivers/xf86-video-intel/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xf86-video-intel -# Date Created: 28 May 2007 -# Whom: lesi@FreeBSD.org -# +# Created by: lesi@FreeBSD.org # $FreeBSD$ -# PORTNAME= xf86-video-intel PORTVERSION= ${INTEL_VERSION} @@ -18,15 +14,29 @@ USE_GL= gl USE_LDCONFIG= yes XORG_CAT= driver -USE_XORG= xvmc xineramaproto xextproto x11 xf86driproto glproto +USE_XORG= glproto \ + pixman \ + x11 \ + xext \ + xf86driproto \ + xineramaproto \ + xrender \ + xvmc + MAN4= intel.4x .if defined(WITH_NEW_XORG) -INTEL_VERSION= 2.17.0 -INTEL_REVISION= 1 +INTEL_VERSION= 2.21.6 +INTEL_REVISION= 0 +CONFIGURE_ARGS+= --enable-sna MAKE_JOBS_UNSAFE=yes PLIST_SUB+= OLD="@comment " -EXTRA_PATCHES+= ${PATCHDIR}/extra-i915kms +EXTRA_PATCHES+= ${PATCHDIR}/extra-clang \ + ${PATCHDIR}/extra-src_sna_compiler.h \ + ${PATCHDIR}/extra-src_sna_kgem.c \ + ${PATCHDIR}/extra-src__sna__sna_threads.c \ + ${PATCHDIR}/extra-i915kms +LIB_DEPENDS+= xcb-util:${PORTSDIR}/x11/xcb-util .else INTEL_VERSION= 2.7.1 INTEL_REVISION= 4 diff --git a/x11-drivers/xf86-video-intel/distinfo b/x11-drivers/xf86-video-intel/distinfo index fa854eb..9044ccc 100644 --- a/x11-drivers/xf86-video-intel/distinfo +++ b/x11-drivers/xf86-video-intel/distinfo @@ -1,4 +1,4 @@ SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42 SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625 -SHA256 (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387 -SIZE (xorg/driver/xf86-video-intel-2.17.0.tar.bz2) = 1339717 +SHA256 (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9 +SIZE (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = 1721176 diff --git a/x11-drivers/xf86-video-intel/files/extra-clang b/x11-drivers/xf86-video-intel/files/extra-clang new file mode 100644 index 0000000..bb49945 --- /dev/null +++ b/x11-drivers/xf86-video-intel/files/extra-clang @@ -0,0 +1,53 @@ +--- src/intel_display.c.orig 2012-12-11 20:33:06.000000000 +0100 ++++ src/intel_display.c 2012-12-11 20:33:45.000000000 +0100 +@@ -1691,7 +1691,7 @@ + static drmModeEncoderPtr + intel_get_kencoder(struct intel_mode *mode, int num) + { +- struct intel_output *iterator; ++ struct intel_output *iterator = NULL; + int id = mode->mode_res->encoders[num]; + + list_for_each_entry(iterator, &mode->outputs, link) +--- src/intel_batchbuffer.c.orig 2012-12-11 20:34:55.000000000 +0100 ++++ src/intel_batchbuffer.c 2012-12-11 20:35:19.000000000 +0100 +@@ -119,7 +119,7 @@ + static void intel_batch_do_flush(ScrnInfoPtr scrn) + { + intel_screen_private *intel = intel_get_screen_private(scrn); +- struct intel_pixmap *priv; ++ struct intel_pixmap *priv = NULL; + + list_for_each_entry(priv, &intel->batch_pixmaps, batch) + priv->dirty = 0; +--- src/sna/sna_damage.c.orig 2012-12-11 20:41:38.000000000 +0100 ++++ src/sna/sna_damage.c 2012-12-11 20:42:23.000000000 +0100 +@@ -410,7 +410,7 @@ + int n, nboxes; + BoxPtr boxes, free_boxes = NULL; + pixman_region16_t *region = &damage->region; +- struct sna_damage_box *iter; ++ struct sna_damage_box *iter = NULL; + + assert(damage->mode != DAMAGE_ALL); + assert(damage->dirty); +@@ -1671,7 +1671,7 @@ + { + int n, nboxes; + BoxPtr boxes; +- struct sna_damage_box *iter; ++ struct sna_damage_box *iter = NULL; + + RegionCopy(r, &damage->region); + if (!damage->dirty) +--- uxa/uxa-accel.c.orig 2012-12-11 20:50:56.000000000 +0100 ++++ uxa/uxa-accel.c 2012-12-11 20:51:14.000000000 +0100 +@@ -944,7 +944,7 @@ + + if (uxa_screen->info->flags & UXA_USE_GLAMOR) { + int ok = 0; +- RegionPtr region; ++ RegionPtr region = NULL; + + if (uxa_prepare_access(pDst, UXA_GLAMOR_ACCESS_RW)) { + if (uxa_prepare_access(pSrc, UXA_GLAMOR_ACCESS_RO)) { diff --git a/x11-drivers/xf86-video-intel/files/extra-i915kms b/x11-drivers/xf86-video-intel/files/extra-i915kms index ed50181..c900909 100644 --- a/x11-drivers/xf86-video-intel/files/extra-i915kms +++ b/x11-drivers/xf86-video-intel/files/extra-i915kms @@ -1,11 +1,13 @@ ---- src/intel_driver.c.orig 2012-05-17 16:13:46.000000000 +0200 -+++ src/intel_driver.c 2012-05-17 16:14:46.000000000 +0200 -@@ -334,7 +334,7 @@ - snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d", +--- src/intel_module.c.orig 2012-09-27 23:31:20.000000000 +0300 ++++ src/intel_module.c 2012-11-02 17:32:00.819723398 +0200 +@@ -393,8 +393,8 @@ dev->domain, dev->bus, dev->dev, dev->func); -- intel->drmSubFD = drmOpen("i915", busid); -+ intel->drmSubFD = drmOpen("i915kms", busid); - if (intel->drmSubFD == -1) { - xf86DrvMsg(scrn->scrnIndex, X_ERROR, - "[drm] Failed to open DRM device for %s: %s\n", + ret = drmCheckModesettingSupported(id); +- if (ret) { +- if (xf86LoadKernelModule("i915")) ++ if (ret || 1) { ++ if (xf86LoadKernelModule("i915kms")) + ret = drmCheckModesettingSupported(id); + if (ret) + return FALSE; diff --git a/x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c b/x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c new file mode 100644 index 0000000..57361b9 --- /dev/null +++ b/x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c @@ -0,0 +1,14 @@ +--- src/sna/sna_threads.c.orig 2013-02-02 00:03:44.000000000 +0000 ++++ src/sna/sna_threads.c 2013-02-02 00:04:39.000000000 +0000 +@@ -94,7 +94,11 @@ + size_t len = 0; + char *line = NULL; + uint32_t processors = 0, cores = 0; ++#ifdef __GLIBC__ + while (getline(&line, &len, file) != -1) { ++#else ++ while ((line = fgetln(file, &len)) != (char *) NULL) { ++#endif + int id; + if (sscanf(line, "physical id : %d", &id) == 1) { + if (id >= 32) diff --git a/x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h b/x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h new file mode 100644 index 0000000..4713174 --- /dev/null +++ b/x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h @@ -0,0 +1,18 @@ +--- src/sna/compiler.h.orig 2013-03-12 12:48:29.745101779 +0100 ++++ src/sna/compiler.h 2013-03-12 12:48:52.857102997 +0100 +@@ -37,7 +37,6 @@ + #define must_check __attribute__((warn_unused_result)) + #define constant __attribute__((const)) + #define pure __attribute__((pure)) +-#define __packed__ __attribute__((__packed__)) + #define flatten __attribute__((flatten)) + #else + #define likely(expr) (expr) +@@ -48,7 +47,6 @@ + #define must_check + #define constant + #define pure +-#define __packed__ + #define flatten + #endif + diff --git a/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c b/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c new file mode 100644 index 0000000..9771d08 --- /dev/null +++ b/x11-drivers/xf86-video-intel/files/extra-src_sna_kgem.c @@ -0,0 +1,91 @@ +--- src/sna/kgem.c.orig 2013-03-11 11:19:02.000000000 +0100 ++++ src/sna/kgem.c 2013-03-12 12:56:49.452065668 +0100 +@@ -658,7 +658,11 @@ + if (file) { + size_t len = 0; + char *line = NULL; ++#ifdef __GLIBC__ + while (getline(&line, &len, file) != -1) { ++#else ++ while ((line = fgetln(file, &len)) != (char *) NULL) { ++#endif + int mb; + if (sscanf(line, "cache size : %d KB", &mb) == 1) { + /* Paranoid check against gargantuan caches */ +@@ -1666,7 +1670,8 @@ + static struct kgem_bo * + search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags) + { +- struct kgem_bo *bo, *first = NULL; ++ struct kgem_bo *bo = NULL; ++ struct kgem_bo *first = NULL; + + DBG(("%s: num_pages=%d, flags=%x\n", __FUNCTION__, num_pages, flags)); + +@@ -1868,7 +1873,8 @@ + + static bool kgem_retire__flushing(struct kgem *kgem) + { +- struct kgem_bo *bo, *next; ++ struct kgem_bo *bo = NULL; ++ struct kgem_bo *next; + bool retired = false; + + list_for_each_entry_safe(bo, next, &kgem->flushing, request) { +@@ -2073,7 +2079,8 @@ + static void kgem_commit(struct kgem *kgem) + { + struct kgem_request *rq = kgem->next_request; +- struct kgem_bo *bo, *next; ++ struct kgem_bo *bo = NULL; ++ struct kgem_bo *next; + + list_for_each_entry_safe(bo, next, &rq->buffers, request) { + assert(next->request.prev == &bo->request); +@@ -2154,7 +2161,8 @@ + + static void kgem_finish_buffers(struct kgem *kgem) + { +- struct kgem_buffer *bo, *next; ++ struct kgem_buffer *bo = NULL; ++ struct kgem_buffer *next; + + list_for_each_entry_safe(bo, next, &kgem->batch_buffers, base.list) { + DBG(("%s: buffer handle=%d, used=%d, exec?=%d, write=%d, mmapped=%d\n", +@@ -2963,7 +2971,8 @@ + static struct kgem_bo * + search_linear_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags) + { +- struct kgem_bo *bo, *first = NULL; ++ struct kgem_bo *bo = NULL; ++ struct kgem_bo *first = NULL; + bool use_active = (flags & CREATE_INACTIVE) == 0; + struct list *cache; + +@@ -3521,7 +3530,7 @@ + uint32_t flags) + { + struct list *cache; +- struct kgem_bo *bo; ++ struct kgem_bo *bo = NULL; + uint32_t pitch, tiled_height, size; + uint32_t handle; + int i, bucket, retry; +@@ -4834,7 +4843,7 @@ + void kgem_clear_dirty(struct kgem *kgem) + { + struct list * const buffers = &kgem->next_request->buffers; +- struct kgem_bo *bo; ++ struct kgem_bo *bo = NULL; + + list_for_each_entry(bo, buffers, request) { + if (!bo->dirty) +@@ -5072,7 +5081,7 @@ + uint32_t size, uint32_t flags, + void **ret) + { +- struct kgem_buffer *bo; ++ struct kgem_buffer *bo = NULL; + unsigned offset, alloc; + struct kgem_bo *old; + diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile index fbd0fdd..2264420 100644 --- a/x11-drivers/xf86-video-mach64/Makefile +++ b/x11-drivers/xf86-video-mach64/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xf86-video-mach64 -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-mach64 -PORTVERSION= 6.9.0 +PORTVERSION= 6.9.3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -15,6 +10,6 @@ COMMENT= X.Org mach64 display driver USE_GL= gl XORG_CAT= driver -USE_XORG= glproto videoproto xextproto xf86driproto xf86miscproto +USE_XORG= glproto xf86driproto xf86miscproto .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-mach64/distinfo b/x11-drivers/xf86-video-mach64/distinfo index 356c869..d4739a0 100644 --- a/x11-drivers/xf86-video-mach64/distinfo +++ b/x11-drivers/xf86-video-mach64/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = a214f066c1cc997cb2d4db8474b51f731b51f8486c023c62a0e2c69f283bcd1a -SIZE (xorg/driver/xf86-video-mach64-6.9.0.tar.bz2) = 505200 +SHA256 (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218 +SIZE (xorg/driver/xf86-video-mach64-6.9.3.tar.bz2) = 525988 diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile index b343fb2..f9a5959 100644 --- a/x11-drivers/xf86-video-mga/Makefile +++ b/x11-drivers/xf86-video-mga/Makefile @@ -1,13 +1,8 @@ -# New ports collection makefile for: xf86-video-mga -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-mga -PORTVERSION= 1.4.13 -PORTEPOCH= 2 +PORTVERSION= 1.6.1 +PORTEPOCH= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -16,7 +11,7 @@ COMMENT= X.Org mga display driver USE_GL= gl XORG_CAT= driver -USE_XORG= xf86driproto videoproto xextproto glproto +USE_XORG= xf86driproto glproto MAN4= mga.4x pre-patch: diff --git a/x11-drivers/xf86-video-mga/distinfo b/x11-drivers/xf86-video-mga/distinfo index 7a6ef1a..f24b15a 100644 --- a/x11-drivers/xf86-video-mga/distinfo +++ b/x11-drivers/xf86-video-mga/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6 -SIZE (xorg/driver/xf86-video-mga-1.4.13.tar.bz2) = 423134 +SHA256 (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 6a70f5015f822eef82a18eedf3d3ee5fdfa81f1c0e701103ab837ffbd61aa4b4 +SIZE (xorg/driver/xf86-video-mga-1.6.1.tar.bz2) = 446495 diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile index 533e26b..4748da1 100644 --- a/x11-drivers/xf86-video-neomagic/Makefile +++ b/x11-drivers/xf86-video-neomagic/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xf86-video-neomagic -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-neomagic -PORTVERSION= 1.2.5 +PORTVERSION= 1.2.7 PORTREVISION= 1 CATEGORIES= x11-drivers @@ -14,7 +9,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org neomagic display driver XORG_CAT= driver -USE_XORG= videoproto xextproto xf86dgaproto +USE_XORG= xf86dgaproto MAN4= neomagic.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-neomagic/distinfo b/x11-drivers/xf86-video-neomagic/distinfo index 67022a7..e740d00 100644 --- a/x11-drivers/xf86-video-neomagic/distinfo +++ b/x11-drivers/xf86-video-neomagic/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = c0b69e83a4bd6c257a2bf55b33a7442d33df451d37561fa8ae00fb1566b1504b -SIZE (xorg/driver/xf86-video-neomagic-1.2.5.tar.bz2) = 294723 +SHA256 (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76 +SIZE (xorg/driver/xf86-video-neomagic-1.2.7.tar.bz2) = 328716 diff --git a/x11-drivers/xf86-video-newport/Makefile b/x11-drivers/xf86-video-newport/Makefile index 14f6c96..962ee74 100644 --- a/x11-drivers/xf86-video-newport/Makefile +++ b/x11-drivers/xf86-video-newport/Makefile @@ -1,20 +1,13 @@ -# New ports collection makefile for: xf86-video-newport -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-newport -PORTVERSION= 0.2.3 -PORTREVISION= 2 +PORTVERSION= 0.2.4 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org newport display driver XORG_CAT= driver -USE_XORG= videoproto MAN4= newport.4x post-patch: diff --git a/x11-drivers/xf86-video-newport/distinfo b/x11-drivers/xf86-video-newport/distinfo index 7d0ce5c..bd6af4a 100644 --- a/x11-drivers/xf86-video-newport/distinfo +++ b/x11-drivers/xf86-video-newport/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270 -SIZE (xorg/driver/xf86-video-newport-0.2.3.tar.bz2) = 266377 +SHA256 (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 91cc41c6b17b068ed865c5d00b7662faaa1f7523ca449200abcd6539c4ad4ef9 +SIZE (xorg/driver/xf86-video-newport-0.2.4.tar.bz2) = 308541 diff --git a/x11-drivers/xf86-video-nouveau/Makefile b/x11-drivers/xf86-video-nouveau/Makefile index 64afb7a..3f80904 100644 --- a/x11-drivers/xf86-video-nouveau/Makefile +++ b/x11-drivers/xf86-video-nouveau/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xf86-video-nouveau -# Date Created: 29 Jan 2009 -# Whom: Anonymous <swell.k@gmail.com> -# +# Created by: Anonymous <swell.k@gmail.com> # $FreeBSD$ -# PORTNAME= xf86-video-nouveau PORTVERSION= 0.0.10.${SNAPDATE} @@ -16,7 +12,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Free nouveau display driver for nvidia-based cards XORG_CAT= driver -USE_XORG= videoproto xextproto xf86driproto glproto +USE_XORG= xf86driproto glproto MAN4= nouveau.4x MAKE_JOBS_SAFE= yes diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile index db48fb6..2e8a95d 100644 --- a/x11-drivers/xf86-video-nv/Makefile +++ b/x11-drivers/xf86-video-nv/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xf86-video-nv -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-nv -PORTVERSION= 2.1.18 +PORTVERSION= 2.1.20 PORTREVISION= 1 CATEGORIES= x11-drivers @@ -14,7 +9,6 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org nv display driver XORG_CAT= driver -USE_XORG= videoproto xextproto MAN4= nv.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-nv/distinfo b/x11-drivers/xf86-video-nv/distinfo index efc4d2e..54a09c6 100644 --- a/x11-drivers/xf86-video-nv/distinfo +++ b/x11-drivers/xf86-video-nv/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 6cf726cc8377cd823ea6038938ea8a88e883fea01b13a749b5491e26535cf415 -SIZE (xorg/driver/xf86-video-nv-2.1.18.tar.bz2) = 354719 +SHA256 (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf +SIZE (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 396982 diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile index b3e4d07..fad0cb9 100644 --- a/x11-drivers/xf86-video-openchrome/Makefile +++ b/x11-drivers/xf86-video-openchrome/Makefile @@ -1,15 +1,8 @@ -# New ports collection makefile for: xf86-video-openchrome -# Date Created: 17 Sep 2007 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-openchrome -PORTVERSION= 0.2.904 -PORTREVISION= 3 +PORTVERSION= 0.3.3 CATEGORIES= x11-drivers -MASTER_SITES= http://www.openchrome.org/releases/ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org openChrome display driver @@ -17,7 +10,7 @@ COMMENT= X.Org openChrome display driver USE_GL= gl XORG_CAT= driver -USE_XORG= videoproto xf86driproto xextproto xvmc glproto +USE_XORG= xf86driproto xvmc glproto MAN4= openchrome.4x MAKE_ARGS+= drivermandir=${LOCALBASE}/man/man4 diff --git a/x11-drivers/xf86-video-openchrome/distinfo b/x11-drivers/xf86-video-openchrome/distinfo index 98e6907..59ce0a1 100644 --- a/x11-drivers/xf86-video-openchrome/distinfo +++ b/x11-drivers/xf86-video-openchrome/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea -SIZE (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = 460051 +SHA256 (xorg/driver/xf86-video-openchrome-0.3.3.tar.bz2) = e49e2f1e5dac86408e5a74b87038cc4082d2c3fba4e0579823161991432412ed +SIZE (xorg/driver/xf86-video-openchrome-0.3.3.tar.bz2) = 518705 diff --git a/x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c b/x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c deleted file mode 100644 index ad794cb..0000000 --- a/x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c +++ /dev/null @@ -1,32 +0,0 @@ ---- src/via_vgahw.c.orig 2009-10-03 22:48:55.000000000 +0200 -+++ src/via_vgahw.c 2012-02-08 10:43:08.000000000 +0100 -@@ -36,6 +36,11 @@ - #include "via_driver.h" /* for HAVE_DEBUG */ - #include "via_vgahw.h" - -+#if ABI_VIDEODRV_VERSION < 12 -+#define PIOOFFSET hwp->PIOOffset -+#else -+#define PIOOFFSET 0 -+#endif - - static CARD8 - ViaVgahwIn(vgaHWPtr hwp, int address) -@@ -43,7 +48,7 @@ - if (hwp->MMIOBase) - return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + address); - else -- return inb(hwp->PIOOffset + address); -+ return inb(PIOOFFSET + address); - } - - static void -@@ -52,7 +57,7 @@ - if (hwp->MMIOBase) - MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + address, value); - else -- outb(hwp->PIOOffset + address, value); -+ outb(PIOOFFSET + address, value); - } - - /* diff --git a/x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c b/x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c deleted file mode 100644 index 6eb3f18..0000000 --- a/x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c +++ /dev/null @@ -1,83 +0,0 @@ -Fix Xvideo crash in X.org server 1.10 - -http://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=cd753845e02466b81f426793e4f5619afab05d82 - ---- src/via_video.c.orig 2012-02-08 10:13:54.000000000 +0100 -+++ src/via_video.c 2012-02-08 10:14:33.000000000 +0100 -@@ -763,67 +763,6 @@ - return 0; - } - -- --/* -- * This one gets called, for example, on panning. -- */ -- --static int --viaReputImage(ScrnInfoPtr pScrn, -- short drw_x, short drw_y, RegionPtr clipBoxes, pointer data, -- DrawablePtr pDraw) --{ -- -- DDUPDATEOVERLAY UpdateOverlay_Video; -- LPDDUPDATEOVERLAY lpUpdateOverlay = &UpdateOverlay_Video; -- viaPortPrivPtr pPriv = (viaPortPrivPtr) data; -- VIAPtr pVia = VIAPTR(pScrn); -- -- if (!RegionsEqual(&pPriv->clip, clipBoxes)) { -- REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes); -- if (pPriv->autoPaint) { -- if (pDraw->type == DRAWABLE_WINDOW) { -- viaPaintColorkey(pScrn, pPriv, clipBoxes, pDraw); -- } else { -- xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey, -- clipBoxes); -- } -- } -- } -- -- if (drw_x == pPriv->old_drw_x && -- drw_y == pPriv->old_drw_y && -- pVia->swov.oldPanningX == pVia->swov.panning_x && -- pVia->swov.oldPanningY == pVia->swov.panning_y) { -- viaXvError(pScrn, pPriv, xve_none); -- return Success; -- } -- -- lpUpdateOverlay->SrcLeft = pPriv->old_src_x; -- lpUpdateOverlay->SrcTop = pPriv->old_src_y; -- lpUpdateOverlay->SrcRight = pPriv->old_src_x + pPriv->old_src_w; -- lpUpdateOverlay->SrcBottom = pPriv->old_src_y + pPriv->old_src_h; -- -- lpUpdateOverlay->DstLeft = drw_x; -- lpUpdateOverlay->DstTop = drw_y; -- lpUpdateOverlay->DstRight = drw_x + pPriv->old_drw_w; -- lpUpdateOverlay->DstBottom = drw_y + pPriv->old_drw_h; -- pPriv->old_drw_x = drw_x; -- pPriv->old_drw_y = drw_y; -- -- lpUpdateOverlay->dwFlags = DDOVER_KEYDEST; -- -- if (pScrn->bitsPerPixel == 8) -- lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey & 0xff; -- else -- lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey; -- -- VIAVidUpdateOverlay(pScrn, lpUpdateOverlay); -- -- viaXvError(pScrn, pPriv, xve_none); -- return Success; --} -- - static unsigned - viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors) - { -@@ -884,7 +823,7 @@ - viaAdaptPtr[i]->GetPortAttribute = viaGetPortAttribute; - viaAdaptPtr[i]->SetPortAttribute = viaSetPortAttribute; - viaAdaptPtr[i]->PutImage = viaPutImage; -- viaAdaptPtr[i]->ReputImage = viaReputImage; -+ viaAdaptPtr[i]->ReputImage = NULL; - viaAdaptPtr[i]->QueryImageAttributes = viaQueryImageAttributes; - for (j = 0; j < numPorts; ++j) { - viaPortPriv[j].dmaBounceBuffer = NULL; diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile index 14a78b3..8878a88 100644 --- a/x11-drivers/xf86-video-r128/Makefile +++ b/x11-drivers/xf86-video-r128/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xf86-video-r128 -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-r128 -PORTVERSION= 6.8.1 +PORTVERSION= 6.8.4 PORTREVISION= 3 CATEGORIES= x11-drivers @@ -15,7 +10,7 @@ COMMENT= X.Org r128 display driver USE_GL= gl XORG_CAT= driver -USE_XORG= glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto +USE_XORG= glproto xf86driproto xf86miscproto xineramaproto MAN4= r128.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-r128/distinfo b/x11-drivers/xf86-video-r128/distinfo index 9131723..541af7b 100644 --- a/x11-drivers/xf86-video-r128/distinfo +++ b/x11-drivers/xf86-video-r128/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca -SIZE (xorg/driver/xf86-video-r128-6.8.1.tar.bz2) = 418251 +SHA256 (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 6fbfbba2589c1daf45f048009d6521bb687adbdf2f695eb961b316ce68935cd7 +SIZE (xorg/driver/xf86-video-r128-6.8.4.tar.bz2) = 459364 diff --git a/x11-drivers/xf86-video-rdc/Makefile b/x11-drivers/xf86-video-rdc/Makefile index 3d9cf64..40e19bc 100644 --- a/x11-drivers/xf86-video-rdc/Makefile +++ b/x11-drivers/xf86-video-rdc/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xf86-video-rdc -# Date created: 14 April 2010 -# Whom: stas -# +# Created by: stas # $FreeBSD$ -# PORTNAME= xf86-video-rdc PORTVERSION= 0.9 @@ -17,6 +13,10 @@ COMMENT= X.Org RDC display driver XORG_CAT= driver USE_XORG= xvmc xf86driproto xextproto x11 glproto +.if defined(WITH_NEW_XORG) +IGNORE= does not build with X server 1.12 +.endif + do-install: ${MKDIR} ${PREFIX}/lib/xorg/modules/drivers ${INSTALL_PROGRAM} ${WRKSRC}/src/.libs/rdc_drv.so \ diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile index 72fdd37..0b4d2a6 100644 --- a/x11-drivers/xf86-video-rendition/Makefile +++ b/x11-drivers/xf86-video-rendition/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xf86-video-rendition -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-rendition -PORTVERSION= 4.2.4 +PORTVERSION= 4.2.5 PORTREVISION= 1 CATEGORIES= x11-drivers @@ -14,7 +9,6 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org rendition display driver XORG_CAT= driver -USE_XORG= xextproto videoproto MAN4= rendition.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-rendition/distinfo b/x11-drivers/xf86-video-rendition/distinfo index 2b683b7..8686170 100644 --- a/x11-drivers/xf86-video-rendition/distinfo +++ b/x11-drivers/xf86-video-rendition/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 3b9b8e6709c3a7c00904e9a6cb63d7805b5f5f33dc96254f438c1f8d5fb72aa9 -SIZE (xorg/driver/xf86-video-rendition-4.2.4.tar.bz2) = 320573 +SHA256 (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb +SIZE (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 356351 diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile index e8cd850..c6fd38a 100644 --- a/x11-drivers/xf86-video-s3/Makefile +++ b/x11-drivers/xf86-video-s3/Makefile @@ -1,20 +1,13 @@ -# New ports collection makefile for: xf86-video-s3 -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-s3 -PORTVERSION= 0.6.3 -PORTREVISION= 3 +PORTVERSION= 0.6.5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org s3 display driver XORG_CAT= driver -USE_XORG= videoproto xextproto MAN4= s3.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-s3/distinfo b/x11-drivers/xf86-video-s3/distinfo index 5b0ccdf..1dd127d 100644 --- a/x11-drivers/xf86-video-s3/distinfo +++ b/x11-drivers/xf86-video-s3/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144 -SIZE (xorg/driver/xf86-video-s3-0.6.3.tar.bz2) = 277148 +SHA256 (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39 +SIZE (xorg/driver/xf86-video-s3-0.6.5.tar.bz2) = 325582 diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile index 22581ca..5d947f0 100644 --- a/x11-drivers/xf86-video-s3virge/Makefile +++ b/x11-drivers/xf86-video-s3virge/Makefile @@ -1,20 +1,13 @@ -# New ports collection makefile for: xf86-video-s3virge -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-s3virge -PORTVERSION= 1.10.4 -PORTREVISION= 2 +PORTVERSION= 1.10.6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org s3virge display driver XORG_CAT= driver -USE_XORG= videoproto xextproto MAN4= s3virge.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-s3virge/distinfo b/x11-drivers/xf86-video-s3virge/distinfo index 2788f39..8eabf45 100644 --- a/x11-drivers/xf86-video-s3virge/distinfo +++ b/x11-drivers/xf86-video-s3virge/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8 -SIZE (xorg/driver/xf86-video-s3virge-1.10.4.tar.bz2) = 300224 +SHA256 (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e +SIZE (xorg/driver/xf86-video-s3virge-1.10.6.tar.bz2) = 349790 diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile index 7510229..36abb6d 100644 --- a/x11-drivers/xf86-video-savage/Makefile +++ b/x11-drivers/xf86-video-savage/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xf86-video-savage -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-savage -PORTVERSION= 2.3.3 +PORTVERSION= 2.3.6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -14,9 +9,8 @@ COMMENT= X.Org savage display driver USE_GL= gl -WITH_FBSD10_FIX=yes XORG_CAT= driver -USE_XORG= xf86driproto videoproto xextproto glproto +USE_XORG= xf86driproto glproto MAN4= savage.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-savage/distinfo b/x11-drivers/xf86-video-savage/distinfo index 6b54372..1732846 100644 --- a/x11-drivers/xf86-video-savage/distinfo +++ b/x11-drivers/xf86-video-savage/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2 -SIZE (xorg/driver/xf86-video-savage-2.3.3.tar.bz2) = 371252 +SHA256 (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6 +SIZE (xorg/driver/xf86-video-savage-2.3.6.tar.bz2) = 403495 diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile index 681fdd4..dd044dc 100644 --- a/x11-drivers/xf86-video-siliconmotion/Makefile +++ b/x11-drivers/xf86-video-siliconmotion/Makefile @@ -1,19 +1,13 @@ -# New ports collection makefile for: xf86-video-siliconmotion -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-siliconmotion -PORTVERSION= 1.7.5 +PORTVERSION= 1.7.7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org siliconmotion display driver XORG_CAT= driver -USE_XORG= videoproto xextproto MAN4= siliconmotion.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-siliconmotion/distinfo b/x11-drivers/xf86-video-siliconmotion/distinfo index 5707cf9..536d2c2 100644 --- a/x11-drivers/xf86-video-siliconmotion/distinfo +++ b/x11-drivers/xf86-video-siliconmotion/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 97dd597186029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913 -SIZE (xorg/driver/xf86-video-siliconmotion-1.7.5.tar.bz2) = 351610 +SHA256 (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa +SIZE (xorg/driver/xf86-video-siliconmotion-1.7.7.tar.bz2) = 385957 diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile index 16f7899..0568828 100644 --- a/x11-drivers/xf86-video-sis/Makefile +++ b/x11-drivers/xf86-video-sis/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xf86-video-sis -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-sis -PORTVERSION= 0.10.3 +PORTVERSION= 0.10.7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -17,11 +12,7 @@ CONFLICTS= xf86-video-sis-intel-[0-9]* USE_GL= gl XORG_CAT= driver -USE_XORG= xf86dgaproto xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto +USE_XORG= xf86dgaproto xf86driproto xineramaproto xf86miscproto glproto MAN4= sis.4x -post-patch: - @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ - ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-sis/distinfo b/x11-drivers/xf86-video-sis/distinfo index 0b66a0d..7a8c42e 100644 --- a/x11-drivers/xf86-video-sis/distinfo +++ b/x11-drivers/xf86-video-sis/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 9b39b3e22fd2adab812fea06073c37971c7235c02c7f457bf8b60c1ae351c737 -SIZE (xorg/driver/xf86-video-sis-0.10.3.tar.bz2) = 649750 +SHA256 (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0 +SIZE (xorg/driver/xf86-video-sis-0.10.7.tar.bz2) = 699499 diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile index 0f5db11..630a968 100644 --- a/x11-drivers/xf86-video-sunffb/Makefile +++ b/x11-drivers/xf86-video-sunffb/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xf86-video-sunffb -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-sunffb PORTVERSION= 1.2.1 diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile index b8fd2e1..9a8e70c 100644 --- a/x11-drivers/xf86-video-tdfx/Makefile +++ b/x11-drivers/xf86-video-tdfx/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xf86-video-tdfx -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-tdfx -PORTVERSION= 1.4.3 +PORTVERSION= 1.4.5 PORTREVISION= 2 CATEGORIES= x11-drivers @@ -16,7 +11,7 @@ COMMENT= X.Org tdfx display driver USE_GL= gl XORG_CAT= driver -USE_XORG= xf86driproto videoproto xextproto glproto +USE_XORG= xf86driproto glproto MAN4= tdfx.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-tdfx/distinfo b/x11-drivers/xf86-video-tdfx/distinfo index 88ae8fb..c726ba6 100644 --- a/x11-drivers/xf86-video-tdfx/distinfo +++ b/x11-drivers/xf86-video-tdfx/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33 -SIZE (xorg/driver/xf86-video-tdfx-1.4.3.tar.bz2) = 290172 +SHA256 (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859 +SIZE (xorg/driver/xf86-video-tdfx-1.4.5.tar.bz2) = 339623 diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile index a78f578..827dc8b 100644 --- a/x11-drivers/xf86-video-tga/Makefile +++ b/x11-drivers/xf86-video-tga/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xf86-video-tga -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-tga -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 PORTREVISION= 2 CATEGORIES= x11-drivers @@ -14,6 +9,6 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org tga display driver XORG_CAT= driver -USE_XORG= videoproto xextproto xf86dgaproto +USE_XORG= xf86dgaproto .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-tga/distinfo b/x11-drivers/xf86-video-tga/distinfo index abe79c9..d0af787 100644 --- a/x11-drivers/xf86-video-tga/distinfo +++ b/x11-drivers/xf86-video-tga/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 70a4754ef6602cf48d910b9727d015cb3cae946c096ef260b56dfe2f80cdb855 -SIZE (xorg/driver/xf86-video-tga-1.2.1.tar.bz2) = 273334 +SHA256 (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131 +SIZE (xorg/driver/xf86-video-tga-1.2.2.tar.bz2) = 318943 diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile index 76b0570..ca4491c 100644 --- a/x11-drivers/xf86-video-trident/Makefile +++ b/x11-drivers/xf86-video-trident/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xf86-video-trident -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-trident -PORTVERSION= 1.3.4 +PORTVERSION= 1.3.6 PORTREVISION= 1 CATEGORIES= x11-drivers @@ -14,7 +9,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org trident display driver XORG_CAT= driver -USE_XORG= videoproto xextproto xf86dgaproto +USE_XORG= xf86dgaproto MAN4= trident.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-trident/distinfo b/x11-drivers/xf86-video-trident/distinfo index 80d0901..db131b8 100644 --- a/x11-drivers/xf86-video-trident/distinfo +++ b/x11-drivers/xf86-video-trident/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 58e61631e0ef2c58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8 -SIZE (xorg/driver/xf86-video-trident-1.3.4.tar.bz2) = 310898 +SHA256 (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104 +SIZE (xorg/driver/xf86-video-trident-1.3.6.tar.bz2) = 356092 diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile index 521fc6f..4134fa9 100644 --- a/x11-drivers/xf86-video-tseng/Makefile +++ b/x11-drivers/xf86-video-tseng/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xf86-video-tseng -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-tseng -PORTVERSION= 1.2.4 +PORTVERSION= 1.2.5 PORTREVISION= 1 CATEGORIES= x11-drivers @@ -14,7 +9,6 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org tseng display driver XORG_CAT= driver -USE_XORG= videoproto xextproto MAN4= tseng.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-tseng/distinfo b/x11-drivers/xf86-video-tseng/distinfo index 475278a..c0ad1ad 100644 --- a/x11-drivers/xf86-video-tseng/distinfo +++ b/x11-drivers/xf86-video-tseng/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = d0dd5dfb4c6a8d0e0baf7fbb5f1784d6b4d1804f1eb188d19963867245e7d13d -SIZE (xorg/driver/xf86-video-tseng-1.2.4.tar.bz2) = 296314 +SHA256 (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819 +SIZE (xorg/driver/xf86-video-tseng-1.2.5.tar.bz2) = 330575 diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile index 5fdfb03..04588d1 100644 --- a/x11-drivers/xf86-video-vesa/Makefile +++ b/x11-drivers/xf86-video-vesa/Makefile @@ -1,20 +1,13 @@ -# New ports collection makefile for: xf86-video-vesa -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-vesa -PORTVERSION= 2.3.0 -PORTREVISION= 2 +PORTVERSION= 2.3.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org vesa display driver XORG_CAT= driver -USE_XORG= xextproto videoproto MAN4= vesa.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-vesa/distinfo b/x11-drivers/xf86-video-vesa/distinfo index 59364f5..f9dbf13 100644 --- a/x11-drivers/xf86-video-vesa/distinfo +++ b/x11-drivers/xf86-video-vesa/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a -SIZE (xorg/driver/xf86-video-vesa-2.3.0.tar.bz2) = 264539 +SHA256 (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3 +SIZE (xorg/driver/xf86-video-vesa-2.3.2.tar.bz2) = 298186 diff --git a/x11-drivers/xf86-video-via/Makefile b/x11-drivers/xf86-video-via/Makefile index 8b6d3c9..eb05e60 100644 --- a/x11-drivers/xf86-video-via/Makefile +++ b/x11-drivers/xf86-video-via/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xf86-video-via -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-via PORTVERSION= 0.2.2 diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile index 92cd78d..d8aa97d 100644 --- a/x11-drivers/xf86-video-vmware/Makefile +++ b/x11-drivers/xf86-video-vmware/Makefile @@ -1,13 +1,7 @@ -# New ports collection makefile for: xf86-video-vmware -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-vmware -PORTVERSION= 12.0.2 -PORTREVISION= 1 +PORTVERSION= 13.0.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-vmware/distinfo b/x11-drivers/xf86-video-vmware/distinfo index 03af6aa..1265b6e 100644 --- a/x11-drivers/xf86-video-vmware/distinfo +++ b/x11-drivers/xf86-video-vmware/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147 -SIZE (xorg/driver/xf86-video-vmware-12.0.2.tar.bz2) = 432468 +SHA256 (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d +SIZE (xorg/driver/xf86-video-vmware-13.0.1.tar.bz2) = 432401 diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile index 5cc2a7d..a6df423 100644 --- a/x11-drivers/xf86-video-voodoo/Makefile +++ b/x11-drivers/xf86-video-voodoo/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xf86-video-voodoo -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86-video-voodoo -PORTVERSION= 1.2.4 +PORTVERSION= 1.2.5 PORTREVISION= 1 CATEGORIES= x11-drivers @@ -14,7 +9,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org voodoo display driver XORG_CAT= driver -USE_XORG= xf86dgaproto xextproto videoproto +USE_XORG= xf86dgaproto MAN4= voodoo.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-voodoo/distinfo b/x11-drivers/xf86-video-voodoo/distinfo index 20eff8e..cd1d29c 100644 --- a/x11-drivers/xf86-video-voodoo/distinfo +++ b/x11-drivers/xf86-video-voodoo/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = f00238bbcf61dba726deedcd4d7416923844e3b0116671a1b1df8bf43d224741 -SIZE (xorg/driver/xf86-video-voodoo-1.2.4.tar.bz2) = 274523 +SHA256 (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8 +SIZE (xorg/driver/xf86-video-voodoo-1.2.5.tar.bz2) = 305489 diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile index 47c95f2..2cb28b1 100644 --- a/x11-drivers/xorg-drivers/Makefile +++ b/x11-drivers/xorg-drivers/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= xorg-drivers -PORTVERSION= 7.5.2 +PORTVERSION= 7.7 CATEGORIES= x11-drivers MASTER_SITES= # none DISTFILES= # none @@ -92,10 +92,9 @@ INTEL_DESC= Install intel video driver OPENCHROME_DESC= Install openchrome video driver SUNFFB_DESC= Install sunffb video driver -# these drivers module name are different then the plugin they install +# these drivers have a different module name compared to the plugin they install QUIRKS= keyboard:kbd - .include <bsd.port.options.mk> # Manual add arch specific drivers so they be added to depend lines. diff --git a/x11-fonts/bdftopcf/Makefile b/x11-fonts/bdftopcf/Makefile index 3e664f1..a5c6d9e 100644 --- a/x11-fonts/bdftopcf/Makefile +++ b/x11-fonts/bdftopcf/Makefile @@ -9,7 +9,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Convert X font from BDF to PCF XORG_CAT= app -USE_XORG= xfont xorg-macros +USE_XORG= xfont PLIST_FILES= bin/bdftopcf MAN1= bdftopcf.1 diff --git a/x11-fonts/encodings/Makefile b/x11-fonts/encodings/Makefile index 5433a32..4840274 100644 --- a/x11-fonts/encodings/Makefile +++ b/x11-fonts/encodings/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: encodings -# Date created: Oct 29 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= encodings PORTVERSION= 1.0.4 diff --git a/x11-fonts/font-adobe-100dpi/Makefile b/x11-fonts/font-adobe-100dpi/Makefile index 0064296..0f634fa 100644 --- a/x11-fonts/font-adobe-100dpi/Makefile +++ b/x11-fonts/font-adobe-100dpi/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-adobe-100dpi -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-adobe-100dpi PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-adobe-75dpi/Makefile b/x11-fonts/font-adobe-75dpi/Makefile index a25694b..ecdd02c 100644 --- a/x11-fonts/font-adobe-75dpi/Makefile +++ b/x11-fonts/font-adobe-75dpi/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-adobe-75dpi -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-adobe-75dpi PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-adobe-utopia-100dpi/Makefile b/x11-fonts/font-adobe-utopia-100dpi/Makefile index 5c5b0d7..9abf4ae 100644 --- a/x11-fonts/font-adobe-utopia-100dpi/Makefile +++ b/x11-fonts/font-adobe-utopia-100dpi/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-adobe-utopia-100dpi -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-adobe-utopia-100dpi PORTVERSION= 1.0.4 diff --git a/x11-fonts/font-adobe-utopia-75dpi/Makefile b/x11-fonts/font-adobe-utopia-75dpi/Makefile index ec86172..6fcafcc 100644 --- a/x11-fonts/font-adobe-utopia-75dpi/Makefile +++ b/x11-fonts/font-adobe-utopia-75dpi/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-adobe-utopia-75dpi -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-adobe-utopia-75dpi PORTVERSION= 1.0.4 diff --git a/x11-fonts/font-adobe-utopia-type1/Makefile b/x11-fonts/font-adobe-utopia-type1/Makefile index 41f2b8e..a19133e 100644 --- a/x11-fonts/font-adobe-utopia-type1/Makefile +++ b/x11-fonts/font-adobe-utopia-type1/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-adobe-utopia-type1 -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-adobe-utopia-type1 PORTVERSION= 1.0.4 diff --git a/x11-fonts/font-alias/Makefile b/x11-fonts/font-alias/Makefile index d1a956f..e745bae 100644 --- a/x11-fonts/font-alias/Makefile +++ b/x11-fonts/font-alias/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-alias -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-alias PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-arabic-misc/Makefile b/x11-fonts/font-arabic-misc/Makefile index ba54032..3c39874 100644 --- a/x11-fonts/font-arabic-misc/Makefile +++ b/x11-fonts/font-arabic-misc/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-arabic-misc -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-arabic-misc PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-bh-100dpi/Makefile b/x11-fonts/font-bh-100dpi/Makefile index d6d927c..2411a37 100644 --- a/x11-fonts/font-bh-100dpi/Makefile +++ b/x11-fonts/font-bh-100dpi/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-bh-100dpi -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-bh-100dpi PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-bh-75dpi/Makefile b/x11-fonts/font-bh-75dpi/Makefile index 11f9774..921a01d 100644 --- a/x11-fonts/font-bh-75dpi/Makefile +++ b/x11-fonts/font-bh-75dpi/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-bh-75dpi -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-bh-75dpi PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile index ca44b27..a23ca06 100644 --- a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile +++ b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-bh-lucidatypewriter-100dpi -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-bh-lucidatypewriter-100dpi PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile index 8b3169d1..335df69 100644 --- a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile +++ b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-bh-lucidatypewriter-75dpi -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-bh-lucidatypewriter-75dpi PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-bh-ttf/Makefile b/x11-fonts/font-bh-ttf/Makefile index 6e4df07..ae81fe9 100644 --- a/x11-fonts/font-bh-ttf/Makefile +++ b/x11-fonts/font-bh-ttf/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-bh-ttf -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-bh-ttf PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-bh-type1/Makefile b/x11-fonts/font-bh-type1/Makefile index f2972e4..65d8928 100644 --- a/x11-fonts/font-bh-type1/Makefile +++ b/x11-fonts/font-bh-type1/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-bh-type1 -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-bh-type1 PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-bitstream-100dpi/Makefile b/x11-fonts/font-bitstream-100dpi/Makefile index b6bbad0..a38a56e 100644 --- a/x11-fonts/font-bitstream-100dpi/Makefile +++ b/x11-fonts/font-bitstream-100dpi/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-bitstream-100dpi -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-bitstream-100dpi PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-bitstream-75dpi/Makefile b/x11-fonts/font-bitstream-75dpi/Makefile index f7e40ef..4ef122e 100644 --- a/x11-fonts/font-bitstream-75dpi/Makefile +++ b/x11-fonts/font-bitstream-75dpi/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-bitstream-75dpi -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-bitstream-75dpi PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-bitstream-speedo/Makefile b/x11-fonts/font-bitstream-speedo/Makefile index 87b0893..d2a8159 100644 --- a/x11-fonts/font-bitstream-speedo/Makefile +++ b/x11-fonts/font-bitstream-speedo/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: font-bitstream-speedo -# Date created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= font-bitstream-speedo PORTVERSION= 1.0.2 diff --git a/x11-fonts/font-bitstream-type1/Makefile b/x11-fonts/font-bitstream-type1/Makefile index 030a966..00a6e5f 100644 --- a/x11-fonts/font-bitstream-type1/Makefile +++ b/x11-fonts/font-bitstream-type1/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-bitstream-type1 -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-bitstream-type1 PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-cronyx-cyrillic/Makefile b/x11-fonts/font-cronyx-cyrillic/Makefile index d4608f4..3bca6ec 100644 --- a/x11-fonts/font-cronyx-cyrillic/Makefile +++ b/x11-fonts/font-cronyx-cyrillic/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-cronyx-cyrillic -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-cronyx-cyrillic PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-cursor-misc/Makefile b/x11-fonts/font-cursor-misc/Makefile index 3a860ff..09920f54 100644 --- a/x11-fonts/font-cursor-misc/Makefile +++ b/x11-fonts/font-cursor-misc/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-cursor-misc -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-cursor-misc PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-daewoo-misc/Makefile b/x11-fonts/font-daewoo-misc/Makefile index f372291..952dd33 100644 --- a/x11-fonts/font-daewoo-misc/Makefile +++ b/x11-fonts/font-daewoo-misc/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-daewoo-misc -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-daewoo-misc PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-dec-misc/Makefile b/x11-fonts/font-dec-misc/Makefile index 8d1f8b9..a6bf1ed 100644 --- a/x11-fonts/font-dec-misc/Makefile +++ b/x11-fonts/font-dec-misc/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-dec-misc -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-dec-misc PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-ibm-type1/Makefile b/x11-fonts/font-ibm-type1/Makefile index 8746b35..ae4dd6e 100644 --- a/x11-fonts/font-ibm-type1/Makefile +++ b/x11-fonts/font-ibm-type1/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-ibm-type1 -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-ibm-type1 PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-isas-misc/Makefile b/x11-fonts/font-isas-misc/Makefile index 0f3b0ca..0e03836 100644 --- a/x11-fonts/font-isas-misc/Makefile +++ b/x11-fonts/font-isas-misc/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-isas-misc -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-isas-misc PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-jis-misc/Makefile b/x11-fonts/font-jis-misc/Makefile index bae0599..43968fb 100644 --- a/x11-fonts/font-jis-misc/Makefile +++ b/x11-fonts/font-jis-misc/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-jis-misc -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-jis-misc PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-micro-misc/Makefile b/x11-fonts/font-micro-misc/Makefile index e584449..b443a44 100644 --- a/x11-fonts/font-micro-misc/Makefile +++ b/x11-fonts/font-micro-misc/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-micro-misc -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-micro-misc PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-misc-cyrillic/Makefile b/x11-fonts/font-misc-cyrillic/Makefile index 8c88914..d06da83 100644 --- a/x11-fonts/font-misc-cyrillic/Makefile +++ b/x11-fonts/font-misc-cyrillic/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-misc-cyrillic -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-misc-cyrillic PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-misc-ethiopic/Makefile b/x11-fonts/font-misc-ethiopic/Makefile index 867740a..81cdcf8 100644 --- a/x11-fonts/font-misc-ethiopic/Makefile +++ b/x11-fonts/font-misc-ethiopic/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: font-misc-ethiopic -# Date created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= font-misc-ethiopic PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-misc-meltho/Makefile b/x11-fonts/font-misc-meltho/Makefile index 53d159e..00116af 100644 --- a/x11-fonts/font-misc-meltho/Makefile +++ b/x11-fonts/font-misc-meltho/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: font-misc-meltho -# Date created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= font-misc-meltho PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-misc-misc/Makefile b/x11-fonts/font-misc-misc/Makefile index b10ab10..99e9eb5 100644 --- a/x11-fonts/font-misc-misc/Makefile +++ b/x11-fonts/font-misc-misc/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-misc-misc -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-misc-misc PORTVERSION= 1.1.2 diff --git a/x11-fonts/font-mutt-misc/Makefile b/x11-fonts/font-mutt-misc/Makefile index 9bbf5c7..28ff192 100644 --- a/x11-fonts/font-mutt-misc/Makefile +++ b/x11-fonts/font-mutt-misc/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-mutt-misc -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-mutt-misc PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-schumacher-misc/Makefile b/x11-fonts/font-schumacher-misc/Makefile index b62692b..06b1f42 100644 --- a/x11-fonts/font-schumacher-misc/Makefile +++ b/x11-fonts/font-schumacher-misc/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-schumacher-misc -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-schumacher-misc PORTVERSION= 1.1.2 diff --git a/x11-fonts/font-screen-cyrillic/Makefile b/x11-fonts/font-screen-cyrillic/Makefile index 0b016a6..bd2a49c 100644 --- a/x11-fonts/font-screen-cyrillic/Makefile +++ b/x11-fonts/font-screen-cyrillic/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-screen-cyrillic -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-screen-cyrillic PORTVERSION= 1.0.4 diff --git a/x11-fonts/font-sony-misc/Makefile b/x11-fonts/font-sony-misc/Makefile index bc7d85e..0ffd90e 100644 --- a/x11-fonts/font-sony-misc/Makefile +++ b/x11-fonts/font-sony-misc/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-sony-misc -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-sony-misc PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-sun-misc/Makefile b/x11-fonts/font-sun-misc/Makefile index 9fefb61..0eeee71 100644 --- a/x11-fonts/font-sun-misc/Makefile +++ b/x11-fonts/font-sun-misc/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-sun-misc -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-sun-misc PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-util/Makefile b/x11-fonts/font-util/Makefile index 362b168..faea38b 100644 --- a/x11-fonts/font-util/Makefile +++ b/x11-fonts/font-util/Makefile @@ -10,9 +10,6 @@ COMMENT= Create an index of X font files in a directory XORG_CAT= font -USES= pkgconfig -USE_XORG= xorg-macros - MAN1= bdftruncate.1 ucs2any.1 .include <bsd.port.mk> diff --git a/x11-fonts/font-winitzki-cyrillic/Makefile b/x11-fonts/font-winitzki-cyrillic/Makefile index bcdbe43..9b8b09b 100644 --- a/x11-fonts/font-winitzki-cyrillic/Makefile +++ b/x11-fonts/font-winitzki-cyrillic/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-winitzki-cyrillic -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-winitzki-cyrillic PORTVERSION= 1.0.3 diff --git a/x11-fonts/font-xfree86-type1/Makefile b/x11-fonts/font-xfree86-type1/Makefile index d38aad9..3095a1d 100644 --- a/x11-fonts/font-xfree86-type1/Makefile +++ b/x11-fonts/font-xfree86-type1/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: font-xfree86-type1 -# Date created: 28 Aug 2005 -# Whom: Pawel Worach -# +# Created by: Pawel Worach # $FreeBSD$ -# PORTNAME= font-xfree86-type1 PORTVERSION= 1.0.4 diff --git a/x11-fonts/fontcacheproto/Makefile b/x11-fonts/fontcacheproto/Makefile index 1e49db1..e0075d1 100644 --- a/x11-fonts/fontcacheproto/Makefile +++ b/x11-fonts/fontcacheproto/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: fontcacheproto -# Date Created: 08 Aug 2005 -# Whom: Dejan Lesjak <lesi@FreeBSD.org> -# +# Created by: Dejan Lesjak <lesi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= fontcacheproto PORTVERSION= 0.1.3 diff --git a/x11-fonts/fontsproto/Makefile b/x11-fonts/fontsproto/Makefile index 4ed4e6e..878eaad 100644 --- a/x11-fonts/fontsproto/Makefile +++ b/x11-fonts/fontsproto/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: fontsproto -# Date Created: 08 Aug 2005 -# Whom: Dejan Lesjak <lesi@FreeBSD.org> -# +# Created by: Dejan Lesjak <lesi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= fontsproto -PORTVERSION= 2.1.1 +PORTVERSION= 2.1.2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/fontsproto/distinfo b/x11-fonts/fontsproto/distinfo index 8e94064..10e1d1e 100644 --- a/x11-fonts/fontsproto/distinfo +++ b/x11-fonts/fontsproto/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/proto/fontsproto-2.1.1.tar.bz2) = 9c9abc81e2927e6b6ffc6eece1f3fbc7559f506a2848673a21e72c0ae4d639bc -SIZE (xorg/proto/fontsproto-2.1.1.tar.bz2) = 131040 +SHA256 (xorg/proto/fontsproto-2.1.2.tar.bz2) = 869c97e5a536a8f3c9bc8b9923780ff1f062094bab935e26f96df3d6f1aa68a9 +SIZE (xorg/proto/fontsproto-2.1.2.tar.bz2) = 141990 diff --git a/x11-fonts/fonttosfnt/Makefile b/x11-fonts/fonttosfnt/Makefile index 1c9241f..0f2e56b 100644 --- a/x11-fonts/fonttosfnt/Makefile +++ b/x11-fonts/fonttosfnt/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: fonttosfnt -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= fonttosfnt PORTVERSION= 1.0.4 diff --git a/x11-fonts/fslsfonts/Makefile b/x11-fonts/fslsfonts/Makefile index f4f242c..e320b07 100644 --- a/x11-fonts/fslsfonts/Makefile +++ b/x11-fonts/fslsfonts/Makefile @@ -8,7 +8,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= List fonts served by the X font server XORG_CAT= app -USE_XORG= x11 libfs xorg-macros +USE_XORG= x11 libfs PLIST_FILES= bin/fslsfonts diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile index ad9cbf6..69f34b0 100644 --- a/x11-fonts/libFS/Makefile +++ b/x11-fonts/libFS/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: libFS -# Date Created: 21 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= libFS -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/libFS/distinfo b/x11-fonts/libFS/distinfo index 56f1fd9..db35f4f 100644 --- a/x11-fonts/libFS/distinfo +++ b/x11-fonts/libFS/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libFS-1.0.3.tar.bz2) = ab7af9754568af60b54be67c0966cb742ad7eb7ff73faa2c76e0b71c988f2419 -SIZE (xorg/lib/libFS-1.0.3.tar.bz2) = 284331 +SHA256 (xorg/lib/libFS-1.0.4.tar.bz2) = 7073761e7594d43180a922605fb64cce60e5ccb8c06f8efa24f2d4621f5e8315 +SIZE (xorg/lib/libFS-1.0.4.tar.bz2) = 291155 diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile index 841f082..922cce5 100644 --- a/x11-fonts/libXfont/Makefile +++ b/x11-fonts/libXfont/Makefile @@ -1,13 +1,8 @@ -# New ports collection makefile for: libXfont -# Date Created: 29 Oct, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXfont -PORTVERSION= 1.4.4 -PORTREVISION= 1 +PORTVERSION= 1.4.5 PORTEPOCH= 1 CATEGORIES= x11-fonts diff --git a/x11-fonts/libXfont/distinfo b/x11-fonts/libXfont/distinfo index 41f79ca..caac3e2 100644 --- a/x11-fonts/libXfont/distinfo +++ b/x11-fonts/libXfont/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXfont-1.4.4.tar.bz2) = a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a -SIZE (xorg/lib/libXfont-1.4.4.tar.bz2) = 440022 +SHA256 (xorg/lib/libXfont-1.4.5.tar.bz2) = bbf96fb80b6b95cdb1dc968085082a6e668193a54cd9d6e2af669909c0cb7170 +SIZE (xorg/lib/libXfont-1.4.5.tar.bz2) = 470879 diff --git a/x11-fonts/libXfont/files/patch-src_fontfile_decompress.c b/x11-fonts/libXfont/files/patch-src_fontfile_decompress.c deleted file mode 100644 index 7499041..0000000 --- a/x11-fonts/libXfont/files/patch-src_fontfile_decompress.c +++ /dev/null @@ -1,101 +0,0 @@ -From bd48ad11fd11412c62c3ac8ed5d52c4f10a985aa Mon Sep 17 00:00:00 2001 -From: Joerg Sonnenberger <joerg@britannica.bec.de> -Date: Sun, 21 Aug 2011 16:51:53 +0000 -Subject: Do proper input validation to fix for CVE-2011-2895. - -It ensures that all valid input can be decompressed, checks that the -overflow conditions doesn't happen and generally tightens the -validation of the LZW stream and doesn't pessimize the inner loop for -no good reason. It's derived from a change in libarchive from 2004. - -Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr> -Reviewed-by: Tomas Hoger <thoger@redhat.com> - ---- src/fontfile/decompress.c.orig 2011-08-10 22:22:01.000000000 +0200 -+++ src/fontfile/decompress.c 2012-03-13 12:55:35.000000000 +0100 -@@ -97,7 +97,7 @@ static char_type magic_header[] = { "\03 - #define FIRST 257 /* first free entry */ - #define CLEAR 256 /* table clear output code */ - --#define STACK_SIZE 8192 -+#define STACK_SIZE 65300 - - typedef struct _compressedFILE { - BufFilePtr file; -@@ -178,14 +178,12 @@ BufFilePushCompressed (BufFilePtr f) - file->tab_suffix[code] = (char_type) code; - } - file->free_ent = ((file->block_compress) ? FIRST : 256 ); -+ file->oldcode = -1; - file->clear_flg = 0; - file->offset = 0; - file->size = 0; - file->stackp = file->de_stack; - bzero(file->buf, BITS); -- file->finchar = file->oldcode = getcode (file); -- if (file->oldcode != -1) -- *file->stackp++ = file->finchar; - return BufFileCreate ((char *) file, - BufCompressedFill, - 0, -@@ -230,9 +228,6 @@ BufCompressedFill (BufFilePtr f) - if (buf == bufend) - break; - -- if (oldcode == -1) -- break; -- - code = getcode (file); - if (code == -1) - break; -@@ -241,26 +236,35 @@ BufCompressedFill (BufFilePtr f) - for ( code = 255; code >= 0; code-- ) - file->tab_prefix[code] = 0; - file->clear_flg = 1; -- file->free_ent = FIRST - 1; -- if ( (code = getcode (file)) == -1 ) /* O, untimely death! */ -- break; -+ file->free_ent = FIRST; -+ oldcode = -1; -+ continue; - } - incode = code; - /* - * Special case for KwKwK string. - */ - if ( code >= file->free_ent ) { -+ if ( code > file->free_ent || oldcode == -1 ) { -+ /* Bad stream. */ -+ return BUFFILEEOF; -+ } - *stackp++ = finchar; - code = oldcode; - } -- -+ -+ /* -+ * The above condition ensures that code < free_ent. -+ * The construction of tab_prefixof in turn guarantees that -+ * each iteration decreases code and therefore stack usage is -+ * bound by 1 << BITS - 256. -+ */ -+ - /* - * Generate output characters in reverse order - */ - while ( code >= 256 ) - { -- if (stackp - de_stack >= STACK_SIZE - 1) -- return BUFFILEEOF; - *stackp++ = file->tab_suffix[code]; - code = file->tab_prefix[code]; - } -@@ -270,7 +274,7 @@ BufCompressedFill (BufFilePtr f) - /* - * Generate the new entry. - */ -- if ( (code=file->free_ent) < file->maxmaxcode ) { -+ if ( (code=file->free_ent) < file->maxmaxcode && oldcode != -1) { - file->tab_prefix[code] = (unsigned short)oldcode; - file->tab_suffix[code] = finchar; - file->free_ent = code+1; diff --git a/x11-fonts/libXfontcache/Makefile b/x11-fonts/libXfontcache/Makefile index 19974c0..6c902ef 100644 --- a/x11-fonts/libXfontcache/Makefile +++ b/x11-fonts/libXfontcache/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: libXfontcache -# Date Created: 21 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= libXfontcache PORTVERSION= 1.0.5 diff --git a/x11-fonts/libfontenc/Makefile b/x11-fonts/libfontenc/Makefile index 41c3c29..163fd21 100644 --- a/x11-fonts/libfontenc/Makefile +++ b/x11-fonts/libfontenc/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libfontenc -# Date Created: 08 Aug 2005 -# Whom: Dejan Lesjak <lesi@FreeBSD.org> -# +# Created by: Dejan Lesjak <lesi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libfontenc -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/libfontenc/distinfo b/x11-fonts/libfontenc/distinfo index ee6157e..875d9c0 100644 --- a/x11-fonts/libfontenc/distinfo +++ b/x11-fonts/libfontenc/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libfontenc-1.1.0.tar.bz2) = 348a1b0142f61afeaafc9497e997d6f10074affed8682e202d019f10170b9cbf -SIZE (xorg/lib/libfontenc-1.1.0.tar.bz2) = 268872 +SHA256 (xorg/lib/libfontenc-1.1.2.tar.bz2) = a9a4efed3359b2e80161bb66b65038fac145137fa134e71335264cbc23b02f62 +SIZE (xorg/lib/libfontenc-1.1.2.tar.bz2) = 294884 diff --git a/x11-fonts/mkfontdir/Makefile b/x11-fonts/mkfontdir/Makefile index a6b1b5f..ec1e964 100644 --- a/x11-fonts/mkfontdir/Makefile +++ b/x11-fonts/mkfontdir/Makefile @@ -8,7 +8,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= Create an index of X font files in a directory -USE_XORG= xorg-macros RUN_DEPENDS= mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale XORG_CAT= app diff --git a/x11-fonts/mkfontscale/Makefile b/x11-fonts/mkfontscale/Makefile index 554da7e..3623790 100644 --- a/x11-fonts/mkfontscale/Makefile +++ b/x11-fonts/mkfontscale/Makefile @@ -11,7 +11,7 @@ COMMENT= Creates an index of scalable font files for X LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 XORG_CAT= app -USE_XORG= xproto fontenc xorg-macros +USE_XORG= xproto fontenc PLIST_FILES= bin/mkfontscale MAN1= mkfontscale.1 diff --git a/x11-fonts/showfont/Makefile b/x11-fonts/showfont/Makefile index 2dc85b5..e16f27b 100644 --- a/x11-fonts/showfont/Makefile +++ b/x11-fonts/showfont/Makefile @@ -8,7 +8,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Font dumper for the X font server XORG_CAT= app -USE_XORG= libfs xorg-macros +USE_XORG= libfs PLIST_FILES= bin/showfont diff --git a/x11-fonts/xf86bigfontproto/Makefile b/x11-fonts/xf86bigfontproto/Makefile index 8ff6b00..7ac1769 100644 --- a/x11-fonts/xf86bigfontproto/Makefile +++ b/x11-fonts/xf86bigfontproto/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xf86bigfontproto -# Date Created: 06 Feb 2006 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xf86bigfontproto PORTVERSION= 1.2.0 diff --git a/x11-fonts/xfontsel/Makefile b/x11-fonts/xfontsel/Makefile index f2b5bd1..490b92b 100644 --- a/x11-fonts/xfontsel/Makefile +++ b/x11-fonts/xfontsel/Makefile @@ -8,7 +8,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Point and click selection of X11 font names XORG_CAT= app -USE_XORG= xt xaw xorg-macros +USE_XORG= xt xaw MAN1= xfontsel.1 diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile index f43c4dd..e864876 100644 --- a/x11-fonts/xfs/Makefile +++ b/x11-fonts/xfs/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xfs -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xfs -PORTVERSION= 1.1.1 +PORTVERSION= 1.1.3 PORTEPOCH= 1 CATEGORIES= x11-fonts @@ -17,7 +12,7 @@ XORG_CAT= app USE_GMAKE= yes USE_XORG= libfs xfont xtrans USE_RC_SUBR= xfs -CONFIGURE_ENV+= ac_cv_path_XMLTO="" +CONFIGURE_ARGS= --without-xmlto --without-fop MAN1= xfs.1 diff --git a/x11-fonts/xfs/distinfo b/x11-fonts/xfs/distinfo index b6e6da0..7b7d7f0 100644 --- a/x11-fonts/xfs/distinfo +++ b/x11-fonts/xfs/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/app/xfs-1.1.1.tar.bz2) = 0c83763a3c9843fdb1d420f18bea3632c5d7aaf91f94a6d9b3f0f5f1d541b5fb -SIZE (xorg/app/xfs-1.1.1.tar.bz2) = 216188 +SHA256 (xorg/app/xfs-1.1.3.tar.bz2) = 7bf44a32ad04dbbcf3b5eef2cbfe879459378b312cb795e0d2d25e665f7196b7 +SIZE (xorg/app/xfs-1.1.3.tar.bz2) = 232076 diff --git a/x11-fonts/xfsinfo/Makefile b/x11-fonts/xfsinfo/Makefile index 30e09b1..4fbfaa2 100644 --- a/x11-fonts/xfsinfo/Makefile +++ b/x11-fonts/xfsinfo/Makefile @@ -8,7 +8,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X font server information utility XORG_CAT= app -USE_XORG= x11 libfs xorg-macros +USE_XORG= x11 libfs PLIST_FILES= bin/xfsinfo diff --git a/x11-fonts/xlsfonts/Makefile b/x11-fonts/xlsfonts/Makefile index bb94368..e5a042e 100644 --- a/x11-fonts/xlsfonts/Makefile +++ b/x11-fonts/xlsfonts/Makefile @@ -8,7 +8,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Server font list displayer for X XORG_CAT= app -USE_XORG= x11 xorg-macros +USE_XORG= x11 PLIST_FILES= bin/xlsfonts diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile index 5c6d686..e827077 100644 --- a/x11-fonts/xorg-fonts-100dpi/Makefile +++ b/x11-fonts/xorg-fonts-100dpi/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: xorg-fonts-100dpi -# Date created: 30 May 2004 -# Whom: anholt@FreeBSD.org -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xorg-fonts-100dpi -PORTVERSION= 7.5.1 +PORTVERSION= 7.7 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile index 47cb254..4ee956d 100644 --- a/x11-fonts/xorg-fonts-75dpi/Makefile +++ b/x11-fonts/xorg-fonts-75dpi/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: xorg-fonts-75dpi -# Date created: 30 May 2004 -# Whom: anholt@FreeBSD.org -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xorg-fonts-75dpi -PORTVERSION= 7.5.1 +PORTVERSION= 7.7 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile index 6e217a9..dac9095 100644 --- a/x11-fonts/xorg-fonts-cyrillic/Makefile +++ b/x11-fonts/xorg-fonts-cyrillic/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: xorg-fonts-cyrillic -# Date created: 30 May 2004 -# Whom: anholt@FreeBSD.org -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xorg-fonts-cyrillic -PORTVERSION= 7.5.1 +PORTVERSION= 7.7 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile index a614c97..ae34475 100644 --- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile +++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: xorg-fonts-miscbitmaps -# Date created: 30 May 2004 -# Whom: anholt@FreeBSD.org -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xorg-fonts-miscbitmaps -PORTVERSION= 7.5.1 +PORTVERSION= 7.7 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile index a819626..14647fd 100644 --- a/x11-fonts/xorg-fonts-truetype/Makefile +++ b/x11-fonts/xorg-fonts-truetype/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: xorg-fonts-truetype -# Date created: 30 May 2004 -# Whom: anholt@FreeBSD.org -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xorg-fonts-truetype -PORTVERSION= 7.5.1 +PORTVERSION= 7.7 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile index 3c43419..6351076 100644 --- a/x11-fonts/xorg-fonts-type1/Makefile +++ b/x11-fonts/xorg-fonts-type1/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: xorg-fonts-type1 -# Date created: 30 May 2004 -# Whom: anholt@FreeBSD.org -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xorg-fonts-type1 -PORTVERSION= 7.5.1 +PORTVERSION= 7.7 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile index 627c415..d89ea41 100644 --- a/x11-fonts/xorg-fonts/Makefile +++ b/x11-fonts/xorg-fonts/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xorg-fonts -# Date created: Jun 22 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xorg-fonts -PORTVERSION= 7.5.1 +PORTVERSION= 7.7 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none diff --git a/x11-servers/mga_hal/Makefile b/x11-servers/mga_hal/Makefile index cf56a40..eb37cad 100644 --- a/x11-servers/mga_hal/Makefile +++ b/x11-servers/mga_hal/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: mga_hal -# Date created: 12 Jan 2005 -# Whom: anholt@FreeBSD.org -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= mga_hal PORTVERSION= 4.4.0 diff --git a/x11-servers/xephyr/Makefile b/x11-servers/xephyr/Makefile index d14a679..08a055b 100644 --- a/x11-servers/xephyr/Makefile +++ b/x11-servers/xephyr/Makefile @@ -1,14 +1,9 @@ -# New ports collection makefile for: xephyr -# Date created: 2008-05-18 -# Whom: Max Brazhnikov <makc@issp.ac.ru> -# # $FreeBSD$ -# PORTNAME= xephyr PORTREVISION= 0 -COMMENT= A kdrive based X server from X.Org +COMMENT= X server from X.Org based on kdrive MASTERDIR= ${.CURDIR}/../xorg-server DESCR= ${.CURDIR}/pkg-descr @@ -22,8 +17,7 @@ USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ CONFIGURE_ARGS= --enable-kdrive --enable-xephyr --disable-dmx --disable-xvfb \ --without-xmlto --disable-docs --disable-devel-docs \ - --disable-xorg --disable-xnest \ - --localstatedir=/var --without-dtrace + --disable-xnest --localstatedir=/var --without-dtrace SLAVE_PORT= yes PLIST_FILES= bin/Xephyr diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile index aa3ebc9..2521fdf 100644 --- a/x11-servers/xorg-dmx/Makefile +++ b/x11-servers/xorg-dmx/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xorg-dmx -# Date created: 13 Mar 2005 -# Whom: lesi@FreeBSD.org -# +# Created by: lesi@FreeBSD.org # $FreeBSD$ -# PORTNAME= xorg-dmx PORTREVISION= 0 @@ -21,7 +17,7 @@ USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \ xau dmx xtst xres pixman xtrans -CONFIGURE_ARGS= --disable-xvfb --disable-xorg --disable-xnest \ +CONFIGURE_ARGS= --disable-xvfb --disable-xnest \ --without-xmlto --disable-docs --disable-devel-docs \ --enable-dmx --localstatedir=/var --without-dtrace diff --git a/x11-servers/xorg-dmx/pkg-plist b/x11-servers/xorg-dmx/pkg-plist index 657dfd5..c7fea5a 100644 --- a/x11-servers/xorg-dmx/pkg-plist +++ b/x11-servers/xorg-dmx/pkg-plist @@ -11,5 +11,3 @@ bin/dmxtodmx bin/dmxwininfo bin/vdltodmx bin/xdmxconfig -%%NEW%%@dirrmtry share/X11/xorg.conf.d -%%NEW%%@dirrmtry share/X11 diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile index ef991df..ea01804 100644 --- a/x11-servers/xorg-nestserver/Makefile +++ b/x11-servers/xorg-nestserver/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xorg-nestserver -# Date created: 21 July 2004 -# Whom: anholt@FreeBSD.org -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xorg-nestserver -PORTREVISION= 1 COMMENT= Nesting X server from X.Org @@ -20,7 +15,7 @@ USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \ xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans -CONFIGURE_ARGS= --disable-dmx --disable-xvfb --disable-xorg \ +CONFIGURE_ARGS= --disable-dmx --disable-xvfb \ --without-xmlto --disable-docs --disable-devel-docs \ --localstatedir=/var --without-dtrace diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index e8d26f8..0359b5b 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -1,45 +1,42 @@ -# New ports collection makefile for: xorg-server -# Date created: 7 May 2004 -# Whom: anholt@FreeBSD.org -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME?= xorg-server PORTVERSION= ${XORG_VERSION} PORTREVISION?= ${XORG_REVISION} PORTEPOCH?= 1 CATEGORIES= x11-servers -MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/ -DISTFILES= xorg-server-${PORTVERSION}.tar.bz2 +MASTER_SITES= XORG +MASTER_SITE_SUBDIR= individual/xserver +DISTNAME= xorg-server-${PORTVERSION} MAINTAINER= x11@FreeBSD.org COMMENT?= X.Org X server and related programs LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm - -RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config \ +RUN_DEPENDS= xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \ xkbcomp:${PORTSDIR}/x11/xkbcomp XORG_CAT= xserver SLAVE_PORT?= no .if defined(WITH_NEW_XORG) -XORG_VERSION= 1.10.6 -XORG_REVISION= 2 +XORG_VERSION= 1.12.4 +XORG_REVISION= 0 PLIST_SUB+= OLD="@comment " NEW="" -EXTRA_PATCHES+= ${FILESDIR}/extra-hw_dmx_glxProxy_compsize.h \ - ${FILESDIR}/extra-hw_dmx_glxProxy_glxcmds.h \ - ${FILESDIR}/extra-clang +EXTRA_PATCHES+= ${FILESDIR}/extra-clang .else XORG_VERSION= 1.7.7 XORG_REVISION= 6 PLIST_SUB+= OLD="" NEW="@comment " -EXTRA_PATCHES+= ${FILESDIR}/extra-dix_events.c -EXTRA_PATCHES+= ${FILESDIR}/extra-include_eventstr.h -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-os-utils.c +EXTRA_PATCHES+= ${FILESDIR}/extra-include_eventstr.h \ + ${FILESDIR}/extra-os-utils.c \ + ${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \ + ${FILESDIR}/extra-Xserver-os-xprintf.c \ + ${FILESDIR}/extra-servermd.h .endif +USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl USE_XORG?= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \ @@ -48,8 +45,7 @@ USE_XORG?= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \ xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ resourceproto fontsproto inputproto xf86dgaproto \ videoproto compositeproto trapproto recordproto xineramaproto \ - xinerama evieproto xfont fontenc xkbui pixman pciaccess \ - xorg-macros + xinerama evieproto xfont fontenc xkbui pixman pciaccess MAKE_JOBS_UNSAFE= yes USE_OPENSSL= yes @@ -96,7 +92,7 @@ CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include" .endif .if ${PORT_OPTIONS:MHAL} -LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal +LIB_DEPENDS+= hal:${PORTSDIR}/sysutils/hal CONFIGURE_ARGS+= --enable-config-hal=yes .else CONFIGURE_ARGS+= --enable-config-hal=no @@ -115,7 +111,11 @@ CONFIGURE_ARGS+=--enable-install-setuid=no .endif .if ${ARCH} == i386 -EXTRA_PATCHES+= ${FILESDIR}/extra-arch-i386 +.if defined(WITH_NEW_XORG) +EXTRA_PATCHES+= ${FILESDIR}/extra-new-arch-i386 +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-old-arch-i386 +.endif .endif .if ${ARCH} == ia64 @@ -166,6 +166,8 @@ post-patch: .if ${SLAVE_PORT} == "no" pre-su-install: +# The .xorg dir because else the xorg-server might not load the correct +# libglx module. ${MKDIR} ${PREFIX}/lib/xorg/modules/extensions/.xorg ${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \ ${PREFIX}/lib/xorg/modules/extensions/.xorg/ diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo index 7e27de5..7f1ac51 100644 --- a/x11-servers/xorg-server/distinfo +++ b/x11-servers/xorg-server/distinfo @@ -1,4 +1,4 @@ SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257 -SHA256 (xorg/xserver/xorg-server-1.10.6.tar.bz2) = c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682 -SIZE (xorg/xserver/xorg-server-1.10.6.tar.bz2) = 5406712 +SHA256 (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 +SIZE (xorg/xserver/xorg-server-1.12.4.tar.bz2) = 5444761 diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c b/x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c index 651be80..651be80 100644 --- a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c +++ b/x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c diff --git a/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c b/x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c index e9fb876..e9fb876 100644 --- a/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c +++ b/x11-servers/xorg-server/files/extra-Xserver-os-xprintf.c diff --git a/x11-servers/xorg-server/files/extra-clang b/x11-servers/xorg-server/files/extra-clang index 8281759..359e55e 100644 --- a/x11-servers/xorg-server/files/extra-clang +++ b/x11-servers/xorg-server/files/extra-clang @@ -1,53 +1,75 @@ ---- hw/xfree86/common/xf86Xinput.c.orig 2012-12-13 23:58:55.673738569 +0100 -+++ hw/xfree86/common/xf86Xinput.c 2012-12-13 23:59:52.528738525 +0100 -@@ -479,7 +479,7 @@ - MatchAttrToken(const char *attr, struct list *patterns, - int (*compare)(const char *attr, const char *pattern)) +--- dix/events.c.orig 2012-07-09 02:32:59.000000000 +0200 ++++ dix/events.c 2012-07-22 14:34:46.000000000 +0200 +@@ -5189,7 +5189,8 @@ + InitEvents(void) + { + int i; +- QdEventPtr qe, tmp; ++ QdEventPtr qe = NULL; ++ QdEventPtr tmp; + + inputInfo.numDevices = 0; + inputInfo.devices = (DeviceIntPtr) NULL; +--- hw/xfree86/common/xf86Xinput.c.orig 2012-06-26 08:24:18.000000000 +0200 ++++ hw/xfree86/common/xf86Xinput.c 2012-07-22 14:34:46.000000000 +0200 +@@ -524,7 +524,7 @@ + MatchAttrToken(const char *attr, struct xorg_list *patterns, + int (*compare) (const char *attr, const char *pattern)) { - const xf86MatchGroup *group; + const xf86MatchGroup *group = NULL; /* If there are no patterns, accept the match */ - if (list_is_empty(patterns)) ---- hw/xfree86/parser/InputClass.c.orig 2012-12-14 00:03:07.149734651 +0100 -+++ hw/xfree86/parser/InputClass.c 2012-12-14 00:04:09.522735172 +0100 -@@ -338,7 +338,8 @@ - XF86ConfInputClassPtr prev; - - while (ptr) { -- xf86MatchGroup *group, *next; -+ xf86MatchGroup *group = NULL; -+ xf86MatchGroup *next; - char **list; - - TestFree(ptr->identifier); ---- hw/xfree86/dri2/dri2.c.orig 2012-12-14 00:06:39.680738243 +0100 -+++ hw/xfree86/dri2/dri2.c 2012-12-14 00:08:14.310729622 +0100 -@@ -201,7 +201,7 @@ + if (xorg_list_is_empty(patterns)) +--- hw/xfree86/dri2/dri2.c.orig 2012-07-09 02:32:59.000000000 +0200 ++++ hw/xfree86/dri2/dri2.c 2012-07-22 14:38:42.000000000 +0200 +@@ -239,7 +239,7 @@ static DRI2DrawableRefPtr DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id) { - DRI2DrawableRefPtr ref; + DRI2DrawableRefPtr ref = NULL; - list_for_each_entry(ref, &pPriv->reference_list, link) { - if (ref->id == id) -@@ -267,7 +267,8 @@ + xorg_list_for_each_entry(ref, &pPriv->reference_list, link) { + if (ref->id == id) +@@ -306,7 +306,8 @@ { DRI2DrawablePtr pPriv = p; - DRI2ScreenPtr ds = pPriv->dri2_screen; + DRI2ScreenPtr ds = pPriv->dri2_screen; - DRI2DrawableRefPtr ref, next; + DRI2DrawableRefPtr ref = NULL; -+ DRI2DrawableRefPtr next; ++ DRI2DrawableRefPtr next; WindowPtr pWin; PixmapPtr pPixmap; DrawablePtr pDraw; -@@ -534,7 +535,7 @@ +@@ -587,7 +588,7 @@ DRI2InvalidateDrawable(DrawablePtr pDraw) { DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw); - DRI2DrawableRefPtr ref; + DRI2DrawableRefPtr ref = NULL; - if (!pPriv) + if (!pPriv || !pPriv->needInvalidate) return; +--- test/list.c.orig 2012-06-26 06:12:51.000000000 +0200 ++++ test/list.c 2012-07-22 14:34:46.000000000 +0200 +@@ -187,7 +187,7 @@ + { + struct parent parent = { 0 }; + struct child child[3]; +- struct child *c; ++ struct child *c = NULL; + int i = 0; + + xorg_list_init(&parent.children); +--- xfixes/cursor.c.orig 2012-07-06 07:17:19.000000000 +0200 ++++ xfixes/cursor.c 2012-07-22 14:34:46.000000000 +0200 +@@ -1143,7 +1143,7 @@ + barrier_find_nearest(CursorScreenPtr cs, int dir, + int x1, int y1, int x2, int y2) + { +- struct PointerBarrierClient *c; ++ struct PointerBarrierClient *c = NULL; + struct PointerBarrier *nearest = NULL; + double min_distance = INT_MAX; /* can't get higher than that in X anyway */ + diff --git a/x11-servers/xorg-server/files/extra-dix_events.c b/x11-servers/xorg-server/files/extra-dix_events.c deleted file mode 100644 index caa7a99..0000000 --- a/x11-servers/xorg-server/files/extra-dix_events.c +++ /dev/null @@ -1,89 +0,0 @@ ---- dix/events.c.orig 2010-05-04 02:47:57.000000000 +0200 -+++ dix/events.c 2012-04-24 12:59:22.000000000 +0200 -@@ -3440,7 +3440,6 @@ CheckPassiveGrabsOnWindow( - { - DeviceIntPtr gdev; - XkbSrvInfoPtr xkbi = NULL; -- Mask mask = 0; - - gdev= grab->modifierDevice; - if (grab->grabtype == GRABTYPE_CORE) -@@ -3555,9 +3554,6 @@ CheckPassiveGrabsOnWindow( - } - xE = &core; - count = 1; -- mask = grab->eventMask; -- if (grab->ownerEvents) -- mask |= pWin->eventMask; - } else if (match & XI2_MATCH) - { - rc = EventToXI2((InternalEvent*)event, &xE); -@@ -3569,34 +3565,6 @@ CheckPassiveGrabsOnWindow( - continue; - } - count = 1; -- -- /* FIXME: EventToXI2 returns NULL for enter events, so -- * dereferencing the event is bad. Internal event types are -- * aligned with core events, so the else clause is valid. -- * long-term we should use internal events for enter/focus -- * as well */ -- if (xE) -- mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8]; -- else if (event->type == XI_Enter || event->type == XI_FocusIn) -- mask = grab->xi2mask[device->id][event->type/8]; -- -- if (grab->ownerEvents && wOtherInputMasks(grab->window)) -- { -- InputClientsPtr icp = -- wOtherInputMasks(grab->window)->inputClients; -- -- while(icp) -- { -- if (rClient(icp) == rClient(grab)) -- { -- int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type; -- mask |= icp->xi2mask[device->id][evtype/8]; -- break; -- } -- -- icp = icp->next; -- } -- } - } else - { - rc = EventToXI((InternalEvent*)event, &xE, &count); -@@ -3607,23 +3575,6 @@ CheckPassiveGrabsOnWindow( - "(%d, %d).\n", device->name, event->type, rc); - continue; - } -- mask = grab->eventMask; -- if (grab->ownerEvents && wOtherInputMasks(grab->window)) -- { -- InputClientsPtr icp = -- wOtherInputMasks(grab->window)->inputClients; -- -- while(icp) -- { -- if (rClient(icp) == rClient(grab)) -- { -- mask |= icp->mask[device->id]; -- break; -- } -- -- icp = icp->next; -- } -- } - } - - (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE); -@@ -3632,7 +3583,8 @@ CheckPassiveGrabsOnWindow( - { - FixUpEventFromWindow(device, xE, grab->window, None, TRUE); - -- TryClientEvents(rClient(grab), device, xE, count, mask, -+ TryClientEvents(rClient(grab), device, xE, count, -+ GetEventFilter(device, xE), - GetEventFilter(device, xE), grab); - } - diff --git a/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h b/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h deleted file mode 100644 index 612a7b0..0000000 --- a/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_compsize.h +++ /dev/null @@ -1,54 +0,0 @@ ---- hw/dmx/glxProxy/compsize.h.orig 2012-03-15 11:14:45.000000000 +0100 -+++ hw/dmx/glxProxy/compsize.h 2012-03-15 11:14:38.000000000 +0100 -@@ -0,0 +1,51 @@ -+/* -+ * Copyright 2011 Apple Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining -+ * a copy of this software and associated documentation files (the -+ * "Software"), to deal in the Software without restriction, including -+ * without limitation on the rights to use, copy, modify, merge, -+ * publish, distribute, sublicense, and/or sell copies of the Software, -+ * and to permit persons to whom the Software is furnished to do so, -+ * subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the -+ * next paragraph) shall be included in all copies or substantial -+ * portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+ * SOFTWARE. -+ */ -+ -+#ifndef __compsize_h__ -+#define __compsize_h__ -+ -+extern GLint __glColorTableParameterfv_size(GLenum pname); -+extern GLint __glColorTableParameteriv_size(GLenum pname); -+extern GLint __glConvolutionParameterfv_size(GLenum pname); -+extern GLint __glConvolutionParameteriv_size(GLenum pname); -+extern GLint __glFogfv_size(GLenum pname); -+extern GLint __glFogiv_size(GLenum pname); -+extern GLint __glLightModelfv_size(GLenum pname); -+extern GLint __glLightModeliv_size(GLenum pname); -+extern GLint __glLightfv_size(GLenum pname); -+extern GLint __glLightiv_size(GLenum pname); -+extern GLint __glMaterialfv_size(GLenum pname); -+extern GLint __glMaterialiv_size(GLenum pname); -+extern GLint __glTexEnvfv_size(GLenum e); -+extern GLint __glTexEnviv_size(GLenum e); -+extern GLint __glTexGendv_size(GLenum e); -+extern GLint __glTexGenfv_size(GLenum e); -+extern GLint __glTexGeniv_size(GLenum e); -+extern GLint __glTexParameterfv_size(GLenum e); -+extern GLint __glTexParameteriv_size(GLenum e); -+ -+#endif /* !__compsize_h__ */ diff --git a/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h b/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h deleted file mode 100644 index b75028b..0000000 --- a/x11-servers/xorg-server/files/extra-hw_dmx_glxProxy_glxcmds.h +++ /dev/null @@ -1,40 +0,0 @@ ---- hw/dmx/glxProxy/glxcmds.h.orig 2012-03-15 11:31:45.000000000 +0100 -+++ hw/dmx/glxProxy/glxcmds.h 2012-03-15 11:31:11.000000000 +0100 -@@ -0,0 +1,37 @@ -+/* -+ * Copyright 2011 Apple Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining -+ * a copy of this software and associated documentation files (the -+ * "Software"), to deal in the Software without restriction, including -+ * without limitation on the rights to use, copy, modify, merge, -+ * publish, distribute, sublicense, and/or sell copies of the Software, -+ * and to permit persons to whom the Software is furnished to do so, -+ * subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the -+ * next paragraph) shall be included in all copies or substantial -+ * portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS -+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+ * SOFTWARE. -+ */ -+ -+#ifndef __GLX_cmds_h__ -+#define __GLX_cmds_h__ -+ -+extern int __glXBindSwapBarrierSGIX(__GLXclientState *cl, GLbyte *pc); -+extern int __glXCreateContextWithConfigSGIX(__GLXclientState *cl, GLbyte *pc); -+extern int __glXJoinSwapGroupSGIX(__GLXclientState *cl, GLbyte *pc); -+extern int __glXMakeCurrentReadSGI(__GLXclientState *cl, GLbyte *pc); -+extern int __glXQueryMaxSwapBarriersSGIX(__GLXclientState *cl, GLbyte *pc); -+ -+#endif /* !__GLX_cmds_h__ */ diff --git a/x11-servers/xorg-server/files/extra-new-arch-i386 b/x11-servers/xorg-server/files/extra-new-arch-i386 new file mode 100644 index 0000000..1a0bdee --- /dev/null +++ b/x11-servers/xorg-server/files/extra-new-arch-i386 @@ -0,0 +1,11 @@ +--- hw/xfree86/common/compiler.h.orig 2012-05-17 19:09:03.000000000 +0200 ++++ hw/xfree86/common/compiler.h 2013-01-18 13:59:18.366436857 +0100 +@@ -1335,7 +1335,7 @@ + + #if !defined(__SUNPRO_C) + #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__) +-#ifdef GCCUSESGAS ++#if defined(GCCUSESGAS) || defined(__clang__) + + /* + * If gcc uses gas rather than the native assembler, the syntax of these diff --git a/x11-servers/xorg-server/files/extra-arch-i386 b/x11-servers/xorg-server/files/extra-old-arch-i386 index c5e558c..c5e558c 100644 --- a/x11-servers/xorg-server/files/extra-arch-i386 +++ b/x11-servers/xorg-server/files/extra-old-arch-i386 diff --git a/x11-servers/xorg-server/files/extra-patch-os-utils.c b/x11-servers/xorg-server/files/extra-os-utils.c index 2980ded..2980ded 100644 --- a/x11-servers/xorg-server/files/extra-patch-os-utils.c +++ b/x11-servers/xorg-server/files/extra-os-utils.c diff --git a/x11-servers/xorg-server/files/patch-servermd.h b/x11-servers/xorg-server/files/extra-servermd.h index 5bbb1e4..5bbb1e4 100644 --- a/x11-servers/xorg-server/files/patch-servermd.h +++ b/x11-servers/xorg-server/files/extra-servermd.h diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist index 48be23a..bee307f 100644 --- a/x11-servers/xorg-server/pkg-plist +++ b/x11-servers/xorg-server/pkg-plist @@ -12,6 +12,7 @@ include/xorg/bt829.h %%OLD%%include/xorg/bstorestr.h %%NEW%%include/xorg/callback.h %%OLD%%include/xorg/cfb8_16.h +%%NEW%%include/xorg/client.h include/xorg/closestr.h include/xorg/closure.h include/xorg/colormap.h @@ -83,6 +84,7 @@ include/xorg/mioverlay.h include/xorg/msp3430.h include/xorg/opaque.h include/xorg/os.h +%%NEW%%include/xorg/optionstr.h include/xorg/panoramiXsrv.h include/xorg/panoramiX.h include/xorg/picture.h @@ -138,6 +140,7 @@ include/xorg/xf86DDC.h include/xorg/xf86Modes.h include/xorg/xf86Module.h include/xorg/xf86Opt.h +%%NEW%%include/xorg/xf86Optionstr.h include/xorg/xf86Optrec.h include/xorg/xf86Parser.h include/xorg/xf86Pci.h @@ -225,7 +228,7 @@ lib/xorg/protocol.txt libdata/pkgconfig/xorg-server.pc share/aclocal/xorg-server.m4 %%NEW%%@exec /bin/mkdir -p %D/share/X11/xorg.conf.d -%%NEW%%@dirrm share/doc/xorg-server +@comment %%NEW%%@dirrm share/doc/xorg-server @dirrm include/xorg @dirrm lib/xorg/modules/extensions/.xorg @dirrm lib/xorg/modules/extensions diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile index 3f4bd30..1dd6ee2 100644 --- a/x11-servers/xorg-vfbserver/Makefile +++ b/x11-servers/xorg-vfbserver/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xorg-vfbserver -# Date created: 17 June 2004 -# Whom: anholt@FreeBSD.org -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xorg-vfbserver -PORTREVISION= 1 COMMENT= X virtual framebuffer server from X.Org @@ -20,8 +15,8 @@ USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ xineramaproto xinerama evieproto xkbfile xfont fontenc \ xkbui xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans -CONFIGURE_ARGS= --disable-dmx --disable-xnest --disable-xorg \ - --without-xmlto --disable-docs --disable-devel-docs \ +CONFIGURE_ARGS= --disable-dmx --disable-xnest \ + --without-xmlto --disable-docs --disable-devel1-docs \ --localstatedir=/var --without-dtrace SLAVE_PORT= yes diff --git a/x11-themes/xcursor-themes/Makefile b/x11-themes/xcursor-themes/Makefile index 1a1ffaf..37240fd 100644 --- a/x11-themes/xcursor-themes/Makefile +++ b/x11-themes/xcursor-themes/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xcursor-themes -# Date Created: Nov 2 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xcursor-themes PORTVERSION= 1.0.3 diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile index 5ca4d06..6ce5935 100644 --- a/x11-toolkits/gtkglext/Makefile +++ b/x11-toolkits/gtkglext/Makefile @@ -20,7 +20,6 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ png15:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ - xcb:${PORTSDIR}/x11/libxcb \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig OPTIONS_DEFINE= DOCS @@ -28,8 +27,8 @@ OPTIONS_DEFINE= DOCS USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool -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 xcomposite xcursor xdamage xdmcp \ + xext xfixes xi xinerama xmu xrandr xrender xt xxf86vm USE_GL= glu USES= pathfix pkgconfig gettext iconv USE_GNOME= gdkpixbuf2 gtk20 diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile index 901d382..11183bc 100644 --- a/x11-toolkits/libXaw/Makefile +++ b/x11-toolkits/libXaw/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXaw -# Date Created: 25 Jan, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXaw -PORTVERSION= 1.0.9 +PORTVERSION= 1.0.11 PORTEPOCH= 2 CATEGORIES= x11-toolkits @@ -16,15 +12,7 @@ COMMENT= X Athena Widgets library XORG_CAT= lib USE_XORG= printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt USE_GMAKE= yes -CONFIGURE_ARGS= --without-xmlto - -PORTDOCS= * - -.if defined(NOPORTDOCS) -CONFIGURE_ARGS+=--disable-specs -post-configure: - @${REINPLACE_CMD} -e '/AM_MAKEFLAGS/s/ install-exec-am install-data-am/ install-exec-am/' ${WRKSRC}/specs/Makefile -.endif +CONFIGURE_ARGS+=--without-xmlto MAN3= Xaw.3 diff --git a/x11-toolkits/libXaw/distinfo b/x11-toolkits/libXaw/distinfo index 3e67ebd..e2007b6 100644 --- a/x11-toolkits/libXaw/distinfo +++ b/x11-toolkits/libXaw/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXaw-1.0.9.tar.bz2) = a83977546b78e24ac5dca86affc10b6404a87c16272405b05386feca1a2db037 -SIZE (xorg/lib/libXaw-1.0.9.tar.bz2) = 650634 +SHA256 (xorg/lib/libXaw-1.0.11.tar.bz2) = 87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492 +SIZE (xorg/lib/libXaw-1.0.11.tar.bz2) = 649633 diff --git a/x11-toolkits/libXaw/pkg-plist b/x11-toolkits/libXaw/pkg-plist index 9d2af3b..d8c4c79 100644 --- a/x11-toolkits/libXaw/pkg-plist +++ b/x11-toolkits/libXaw/pkg-plist @@ -82,4 +82,51 @@ lib/libXaw7.so lib/libXaw7.so.7 libdata/pkgconfig/xaw6.pc libdata/pkgconfig/xaw7.pc +%%DOCSDIR%%/AsciiSink.xml +%%DOCSDIR%%/AsciiSource.xml +%%DOCSDIR%%/AsciiText.xml +%%DOCSDIR%%/Box.xml +%%DOCSDIR%%/CH1.xml +%%DOCSDIR%%/CH2.xml +%%DOCSDIR%%/CH3.xml +%%DOCSDIR%%/CH4.xml +%%DOCSDIR%%/CH5.xml +%%DOCSDIR%%/CH6.xml +%%DOCSDIR%%/CH7.xml +%%DOCSDIR%%/Command.xml +%%DOCSDIR%%/Dialog.xml +%%DOCSDIR%%/Form.xml +%%DOCSDIR%%/Grip.xml +%%DOCSDIR%%/Label.xml +%%DOCSDIR%%/List.xml +%%DOCSDIR%%/MenuButton.xml +%%DOCSDIR%%/Paned.xml +%%DOCSDIR%%/Panner.xml +%%DOCSDIR%%/Porthole.xml +%%DOCSDIR%%/Repeater.xml +%%DOCSDIR%%/Scrollbar.xml +%%DOCSDIR%%/Simple.xml +%%DOCSDIR%%/SimpleMenu.xml +%%DOCSDIR%%/Sme.xml +%%DOCSDIR%%/SmeBSB.xml +%%DOCSDIR%%/SmeLine.xml +%%DOCSDIR%%/StripChart.xml +%%DOCSDIR%%/TPage_Credits.xml +%%DOCSDIR%%/Template.xml +%%DOCSDIR%%/Template_private_header_file.xml +%%DOCSDIR%%/Template_public_header_file.xml +%%DOCSDIR%%/Template_widget_source_file.xml +%%DOCSDIR%%/Text.xml +%%DOCSDIR%%/TextActions.xml +%%DOCSDIR%%/TextActions_default_translation_bindings.xml +%%DOCSDIR%%/TextActions_text_widget_actions.xml +%%DOCSDIR%%/TextCustom.xml +%%DOCSDIR%%/TextFuncs.xml +%%DOCSDIR%%/TextSink.xml +%%DOCSDIR%%/TextSource.xml +%%DOCSDIR%%/Toggle.xml +%%DOCSDIR%%/Tree.xml +%%DOCSDIR%%/Viewport.xml +%%DOCSDIR%%/libXaw.xml +@dirrmtry %%DOCSDIR%% @dirrmtry include/X11/Xaw diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile index 7d4ed1c..34b4a8c 100644 --- a/x11-toolkits/libXmu/Makefile +++ b/x11-toolkits/libXmu/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXmu -# Date Created: 25 Jan, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXmu -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 PORTEPOCH= 1 CATEGORIES= x11-toolkits diff --git a/x11-toolkits/libXmu/distinfo b/x11-toolkits/libXmu/distinfo index 45c279a..d6b1abb 100644 --- a/x11-toolkits/libXmu/distinfo +++ b/x11-toolkits/libXmu/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXmu-1.1.0.tar.bz2) = 0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad -SIZE (xorg/lib/libXmu-1.1.0.tar.bz2) = 360663 +SHA256 (xorg/lib/libXmu-1.1.1.tar.bz2) = 709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd +SIZE (xorg/lib/libXmu-1.1.1.tar.bz2) = 383473 diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile index 129c4d1..36742bb 100644 --- a/x11-toolkits/libXt/Makefile +++ b/x11-toolkits/libXt/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXt -# Date Created: 25 Jan, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXt -PORTVERSION= 1.1.1 +PORTVERSION= 1.1.3 PORTEPOCH= 1 CATEGORIES= x11-toolkits @@ -15,6 +11,7 @@ COMMENT= X Toolkit library XORG_CAT= lib USE_XORG= x11 sm xproto:both kbproto +CONFIGURE_ARGS= --disable-specs MAN3= MenuPopdown.3 \ MenuPopup.3 \ diff --git a/x11-toolkits/libXt/distinfo b/x11-toolkits/libXt/distinfo index 57b1aa7..a3c4f12 100644 --- a/x11-toolkits/libXt/distinfo +++ b/x11-toolkits/libXt/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXt-1.1.1.tar.bz2) = a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7 -SIZE (xorg/lib/libXt-1.1.1.tar.bz2) = 715424 +SHA256 (xorg/lib/libXt-1.1.3.tar.bz2) = 8db593c3fc5ffc4e9cd854ba50af1eac9b90d66521ba17802b8f1e0d2d7f05bd +SIZE (xorg/lib/libXt-1.1.3.tar.bz2) = 734679 diff --git a/x11-toolkits/termit/Makefile b/x11-toolkits/termit/Makefile index 838dc28..5564cc6 100644 --- a/x11-toolkits/termit/Makefile +++ b/x11-toolkits/termit/Makefile @@ -18,14 +18,13 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ 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 USE_BZIP2= yes USES= cmake pkgconfig iconv USE_LUA= yes -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= gdkpixbuf2 vte MAKE_JOBS_SAFE= yes diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile index 2ff8824..5909d40 100644 --- a/x11-wm/awesome/Makefile +++ b/x11-wm/awesome/Makefile @@ -27,7 +27,6 @@ LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ freetype:${PORTSDIR}/print/freetype2 \ startup-notification-1:${PORTSDIR}/x11/startup-notification \ xdg-basedir:${PORTSDIR}/x11/libxdg-basedir \ - xcb:${PORTSDIR}/x11/libxcb \ xcb-util:${PORTSDIR}/x11/xcb-util \ xcb-image:${PORTSDIR}/x11/xcb-util-image \ xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \ @@ -40,7 +39,8 @@ CMAKE_ARGS+= -DSYSCONFDIR=${PREFIX}/etc USE_EFL= imlib2 USE_GNOME= glib20 pango USE_LUA= 5.1+ -USE_XORG= pixman x11 xau xdmcp xext xft xinerama xrandr xrender xproto +USE_XORG= pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \ + xproto MAN1= awesome.1 \ awesome-client.1 diff --git a/x11-wm/dwm/Makefile b/x11-wm/dwm/Makefile index 8427a7b..543def1 100644 --- a/x11-wm/dwm/Makefile +++ b/x11-wm/dwm/Makefile @@ -15,13 +15,12 @@ COMMENT= Dynamic, small, fast and simple window manager LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ - xcb:${PORTSDIR}/x11/libxcb +LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs OPTIONS_DEFINE= XINERAMA XFT DOCS OPTIONS_DEFAULT=XINERAMA -USE_XORG= x11 xau xdmcp xext +USE_XORG= x11 xau xcb xdmcp xext MAN1= dwm.1 PLIST_FILES= bin/dwm diff --git a/x11-wm/echinus/Makefile b/x11-wm/echinus/Makefile index 150d96c..7bc6e7b 100644 --- a/x11-wm/echinus/Makefile +++ b/x11-wm/echinus/Makefile @@ -12,11 +12,10 @@ COMMENT= Dynamic window manager for X11 based on dwm LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ - xcb:${PORTSDIR}/x11/libxcb \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig USES= pkgconfig -USE_XORG= x11 xau xdmcp xext xft xrender xrandr +USE_XORG= x11 xau xcb xdmcp xext xft xrender xrandr MAN1= echinus.1 MANCOMPRESSED= no diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile index 9dca8a6..33da6e5 100644 --- a/x11-wm/i3/Makefile +++ b/x11-wm/i3/Makefile @@ -14,8 +14,7 @@ COMMENT= An improved dynamic tiling window manager LICENSE= BSD -LIB_DEPENDS= xcb:${PORTSDIR}/x11/libxcb \ - startup-notification:${PORTSDIR}/x11/startup-notification \ +LIB_DEPENDS= startup-notification:${PORTSDIR}/x11/startup-notification \ xcb-util:${PORTSDIR}/x11/xcb-util \ xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \ xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \ @@ -29,7 +28,7 @@ RUN_DEPENDS= p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \ p5-AnyEvent-I3>=0:${PORTSDIR}/devel/p5-AnyEvent-I3 USE_PERL5_RUN= yes -USE_XORG= x11 xcursor +USE_XORG= x11 xcb xcursor USES= pkgconfig iconv USE_BZIP2= yes USE_GMAKE= yes diff --git a/x11-wm/icewm/files/patch-src_base.h b/x11-wm/icewm/files/patch-src_base.h new file mode 100644 index 0000000..1120fd5 --- /dev/null +++ b/x11-wm/icewm/files/patch-src_base.h @@ -0,0 +1,15 @@ +--- src/base.h.orig 2010-10-31 15:09:36.000000000 +0100 ++++ src/base.h 2013-05-25 12:39:49.498390711 +0200 +@@ -1,12 +1,6 @@ + #ifndef __BASE_H + #define __BASE_H + +-#if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 +-#define deprecated __attribute__((deprecated)) +-#else +-#define deprecated +-#endif +- + /*** Atomar Data Types ********************************************************/ + + #ifdef NEED_BOOL diff --git a/x11-wm/spectrwm/Makefile b/x11-wm/spectrwm/Makefile index c3ec073..e393f93 100644 --- a/x11-wm/spectrwm/Makefile +++ b/x11-wm/spectrwm/Makefile @@ -12,13 +12,12 @@ COMMENT= A small, dynamic tiling window manager for X11 LICENSE= ISCL -LIB_DEPENDS+= xcb:${PORTSDIR}/x11/libxcb \ - xcb-util:${PORTSDIR}/x11/xcb-util \ +LIB_DEPENDS+= xcb-util:${PORTSDIR}/x11/xcb-util \ xcb-icccm:${PORTSDIR}/x11/xcb-util-wm \ xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms RUN_DEPENDS+= dmenu:${PORTSDIR}/x11/dmenu -USE_XORG= x11 xcursor xft xrandr xt +USE_XORG= x11 xcb xcursor xft xrandr xt MAN1= spectrwm.1 USE_LDCONFIG= yes diff --git a/x11-wm/transset/Makefile b/x11-wm/transset/Makefile index 766c95f..46e9d1a 100644 --- a/x11-wm/transset/Makefile +++ b/x11-wm/transset/Makefile @@ -11,7 +11,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Make your windows transparent XORG_CAT= app -USE_XORG= x11 xproto xorg-macros +USE_XORG= x11 xproto MAKE_JOBS_SAFE= yes MAN1= transset.1 diff --git a/x11-wm/twm/Makefile b/x11-wm/twm/Makefile index 0ab7669..f4608f3 100644 --- a/x11-wm/twm/Makefile +++ b/x11-wm/twm/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: twm -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= twm PORTVERSION= 1.0.7 diff --git a/x11-wm/xcompmgr/Makefile b/x11-wm/xcompmgr/Makefile index d9a74eb..f706623 100644 --- a/x11-wm/xcompmgr/Makefile +++ b/x11-wm/xcompmgr/Makefile @@ -9,7 +9,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= A sample X compositing manager XORG_CAT= app -USE_XORG= x11 xcomposite xfixes xdamage xorg-macros xrender +USE_XORG= x11 xcomposite xfixes xdamage xrender PLIST_FILES= bin/${PORTNAME} diff --git a/x11/appres/Makefile b/x11/appres/Makefile index c8428f5..ecb538c 100644 --- a/x11/appres/Makefile +++ b/x11/appres/Makefile @@ -8,7 +8,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Program to list application's resources XORG_CAT= app -USE_XORG= x11 xorg-macros xt +USE_XORG= x11 xt MAN1= appres.1 PLIST_FILES= bin/appres diff --git a/x11/beforelight/Makefile b/x11/beforelight/Makefile index f959c32..ad562a3 100644 --- a/x11/beforelight/Makefile +++ b/x11/beforelight/Makefile @@ -8,7 +8,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= A sample screen saver for X XORG_CAT= app -USE_XORG= x11 xscrnsaver xt xaw7 xt xorg-macros +USE_XORG= x11 xscrnsaver xt xaw7 xt MAN1= beforelight.1 diff --git a/x11/bigreqsproto/Makefile b/x11/bigreqsproto/Makefile index 011b51c..299229c 100644 --- a/x11/bigreqsproto/Makefile +++ b/x11/bigreqsproto/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: bigreqsproto -# Date Created: 07 Aug 2005 -# Whom: Dejan Lesjak <lesi@FreeBSD.org> -# +# Created by: Dejan Lesjak <lesi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= bigreqsproto -PORTVERSION= 1.1.1 +PORTVERSION= 1.1.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/bigreqsproto/distinfo b/x11/bigreqsproto/distinfo index 585c66b..80d243b 100644 --- a/x11/bigreqsproto/distinfo +++ b/x11/bigreqsproto/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 1c3b85872b58d215e8fbfdc7c36bb397d10053324a5df8722227d35254fff09a -SIZE (xorg/proto/bigreqsproto-1.1.1.tar.bz2) = 102069 +SHA256 (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e +SIZE (xorg/proto/bigreqsproto-1.1.2.tar.bz2) = 113218 diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile index 0a5c5ff..8d81b7c 100644 --- a/x11/bitmap/Makefile +++ b/x11/bitmap/Makefile @@ -8,7 +8,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Bitmap editor and converter utilities for X XORG_CAT= app -USE_XORG= x11 xaw xbitmaps xmu xproto xorg-macros +USE_XORG= x11 xaw xbitmaps xmu xproto MAN1= atobm.1 bitmap.1 bmtoa.1 .include <bsd.port.mk> diff --git a/x11/compositeproto/Makefile b/x11/compositeproto/Makefile index a5cd862..0a69b72 100644 --- a/x11/compositeproto/Makefile +++ b/x11/compositeproto/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: compositeproto -# Date Created: 08 Aug 2005 -# Whom: Dejan Lesjak <lesi@FreeBSD.org> -# +# Created by: Dejan Lesjak <lesi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= compositeproto PORTVERSION= 0.4.2 diff --git a/x11/damageproto/Makefile b/x11/damageproto/Makefile index 6073e83..8fc997d 100644 --- a/x11/damageproto/Makefile +++ b/x11/damageproto/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: damageproto -# Date Created: 08 Aug 2005 -# Whom: Dejan Lesjak <lesi@FreeBSD.org> -# +# Created by: Dejan Lesjak <lesi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= damageproto PORTVERSION= 1.2.1 diff --git a/x11/dmxproto/Makefile b/x11/dmxproto/Makefile index c4f5096..b5876e9 100644 --- a/x11/dmxproto/Makefile +++ b/x11/dmxproto/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: dmxproto -# Date Created: 06 Feb 2006 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= dmxproto PORTVERSION= 2.3.1 diff --git a/x11/dri2proto/Makefile b/x11/dri2proto/Makefile index 6693907..dbefded 100644 --- a/x11/dri2proto/Makefile +++ b/x11/dri2proto/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: dri2proto -# Date Created: Jul 28 2008 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= dri2proto -PORTVERSION= 2.6 +PORTVERSION= 2.8 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/dri2proto/distinfo b/x11/dri2proto/distinfo index f791a3e..bdb207e 100644 --- a/x11/dri2proto/distinfo +++ b/x11/dri2proto/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/proto/dri2proto-2.6.tar.bz2) = ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909 -SIZE (xorg/proto/dri2proto-2.6.tar.bz2) = 102188 +SHA256 (xorg/proto/dri2proto-2.8.tar.bz2) = f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04 +SIZE (xorg/proto/dri2proto-2.8.tar.bz2) = 108746 diff --git a/x11/editres/Makefile b/x11/editres/Makefile index 01aeced..b869fce 100644 --- a/x11/editres/Makefile +++ b/x11/editres/Makefile @@ -8,7 +8,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Dynamic resource editor for X Toolkit Applications XORG_CAT= app -USE_XORG= x11 xt xmu xaw xorg-macros +USE_XORG= x11 xt xmu xaw MAN1= editres.1 diff --git a/x11/evieext/Makefile b/x11/evieext/Makefile index 2ec1e91..3ed2745 100644 --- a/x11/evieext/Makefile +++ b/x11/evieext/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: evieext -# Date Created: 25 Apr 2006 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= evieext PORTVERSION= 1.1.1 diff --git a/x11/fixesproto/Makefile b/x11/fixesproto/Makefile index 7df50f2..17f348e 100644 --- a/x11/fixesproto/Makefile +++ b/x11/fixesproto/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: fixesproto -# Date Created: 08 Aug 2005 -# Whom: Dejan Lesjak <lesi@FreeBSD.org> -# +# Created by: Dejan Lesjak <lesi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= fixesproto PORTVERSION= 5.0 diff --git a/x11/fstobdf/Makefile b/x11/fstobdf/Makefile index 7fc569a..13ca8b0 100644 --- a/x11/fstobdf/Makefile +++ b/x11/fstobdf/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: fstobdf -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= fstobdf -PORTVERSION= 1.0.4 +PORTVERSION= 1.0.5 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/fstobdf/distinfo b/x11/fstobdf/distinfo index 97b066d..81014c4 100644 --- a/x11/fstobdf/distinfo +++ b/x11/fstobdf/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/app/fstobdf-1.0.4.tar.bz2) = f1ca8af634656d727d09cc7527f02ba2655eb7a8c217bde36cd44701665ee06b -SIZE (xorg/app/fstobdf-1.0.4.tar.bz2) = 108528 +SHA256 (xorg/app/fstobdf-1.0.5.tar.bz2) = 9c44ef069174ec501fa848fe0dfa41c06c2367df84721e94b3bca670608f15a8 +SIZE (xorg/app/fstobdf-1.0.5.tar.bz2) = 119822 diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile index bf23fc6..5ae9713 100644 --- a/x11/glproto/Makefile +++ b/x11/glproto/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: glproto -# Date Created: 06 Feb 2006 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= glproto -PORTVERSION= 1.4.15 +PORTVERSION= 1.4.16 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/glproto/distinfo b/x11/glproto/distinfo index e7b45bf..53aa21d 100644 --- a/x11/glproto/distinfo +++ b/x11/glproto/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/proto/glproto-1.4.15.tar.bz2) = 990356ebe2e8966aa643287c9a485777957a49299dfb211654df5ff212dec171 -SIZE (xorg/proto/glproto-1.4.15.tar.bz2) = 113671 +SHA256 (xorg/proto/glproto-1.4.16.tar.bz2) = 54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d +SIZE (xorg/proto/glproto-1.4.16.tar.bz2) = 119584 diff --git a/x11/i3lock/Makefile b/x11/i3lock/Makefile index 9809144..881ae90 100644 --- a/x11/i3lock/Makefile +++ b/x11/i3lock/Makefile @@ -16,7 +16,6 @@ COMMENT= Slightly improved screen locker based on slock LICENSE= BSD LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ - xcb.2:${PORTSDIR}/x11/libxcb \ xcb-keysyms:${PORTSDIR}/x11/xcb-util-keysyms \ xcb-image:${PORTSDIR}/x11/xcb-util-image \ ev.4:${PORTSDIR}/devel/libev @@ -32,7 +31,7 @@ MAN1= i3lock.1 LDFLAGS+= -liconv MAKE_JOBS_SAFE= yes -USE_XORG= x11 xt xproto xext +USE_XORG= x11 xcb xt xproto xext USE_BZIP2= yes USE_GMAKE= yes USES= iconv diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile index bb51bc5..6578e99 100644 --- a/x11/iceauth/Makefile +++ b/x11/iceauth/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: iceauth -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= iceauth PORTVERSION= 1.0.5 diff --git a/x11/ico/Makefile b/x11/ico/Makefile index dd46062..85ce808 100644 --- a/x11/ico/Makefile +++ b/x11/ico/Makefile @@ -8,7 +8,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Displays a wire-frame rotating plyhedron XORG_CAT= app -USE_XORG= x11 xorg-macros +USE_XORG= x11 PLIST_FILES= bin/ico diff --git a/x11/inputproto/Makefile b/x11/inputproto/Makefile index 07ddd5d..a3a6b06 100644 --- a/x11/inputproto/Makefile +++ b/x11/inputproto/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: inputproto -# Date Created: 08 Aug 2005 -# Whom: Dejan Lesjak <lesi@FreeBSD.org> -# +# Created by: Dejan Lesjak <lesi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= inputproto -PORTVERSION= 2.0.2 +PORTVERSION= 2.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -14,4 +10,6 @@ COMMENT= Input extension headers XORG_CAT= proto +CONFIGURE_ARGS= --without-asciidoc + .include <bsd.port.mk> diff --git a/x11/inputproto/distinfo b/x11/inputproto/distinfo index 4f78cfd..0499008 100644 --- a/x11/inputproto/distinfo +++ b/x11/inputproto/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/proto/inputproto-2.0.2.tar.bz2) = 64222a590ad4a62a3c8d57805379451769e3329cc5c8c5c1f1fc0d1529ebf005 -SIZE (xorg/proto/inputproto-2.0.2.tar.bz2) = 155535 +SHA256 (xorg/proto/inputproto-2.3.tar.bz2) = 7d26b193f6699f8e9c1e28bf026844b7ecea33dd644402523471be109152c32f +SIZE (xorg/proto/inputproto-2.3.tar.bz2) = 195642 diff --git a/x11/inputproto/pkg-plist b/x11/inputproto/pkg-plist index a08637e..3dab592 100644 --- a/x11/inputproto/pkg-plist +++ b/x11/inputproto/pkg-plist @@ -3,7 +3,4 @@ include/X11/extensions/XI2.h include/X11/extensions/XI2proto.h include/X11/extensions/XIproto.h libdata/pkgconfig/inputproto.pc -%%DOCSDIR%%/XI2proto.txt -%%DOCSDIR%%/XIproto.txt -@dirrm %%DOCSDIR%% @dirrmtry include/X11/extensions diff --git a/x11/kbproto/Makefile b/x11/kbproto/Makefile index 460e113..284c182 100644 --- a/x11/kbproto/Makefile +++ b/x11/kbproto/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: kbproto -# Date Created: 08 Aug 2005 -# Whom: Dejan Lesjak <lesi@FreeBSD.org> -# +# Created by: Dejan Lesjak <lesi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= kbproto -PORTVERSION= 1.0.5 +PORTVERSION= 1.0.6 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/kbproto/distinfo b/x11/kbproto/distinfo index 98d94c3..b899f5c 100644 --- a/x11/kbproto/distinfo +++ b/x11/kbproto/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/proto/kbproto-1.0.5.tar.bz2) = 0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d -SIZE (xorg/proto/kbproto-1.0.5.tar.bz2) = 111270 +SHA256 (xorg/proto/kbproto-1.0.6.tar.bz2) = 037cac0aeb80c4fccf44bf736d791fccb2ff7fd34c558ef8f03ac60b61085479 +SIZE (xorg/proto/kbproto-1.0.6.tar.bz2) = 256988 diff --git a/x11/kbproto/pkg-plist b/x11/kbproto/pkg-plist index ee0808e..b603be3 100644 --- a/x11/kbproto/pkg-plist +++ b/x11/kbproto/pkg-plist @@ -4,4 +4,38 @@ include/X11/extensions/XKBproto.h include/X11/extensions/XKBsrv.h include/X11/extensions/XKBstr.h libdata/pkgconfig/kbproto.pc +%%DOCSDIR%%/XKBproto-1.svg +%%DOCSDIR%%/XKBproto-10.svg +%%DOCSDIR%%/XKBproto-11.svg +%%DOCSDIR%%/XKBproto-2.svg +%%DOCSDIR%%/XKBproto-3.svg +%%DOCSDIR%%/XKBproto-4.svg +%%DOCSDIR%%/XKBproto-5.svg +%%DOCSDIR%%/XKBproto-6.svg +%%DOCSDIR%%/XKBproto-7.svg +%%DOCSDIR%%/XKBproto-8.svg +%%DOCSDIR%%/XKBproto-9.svg +%%DOCSDIR%%/acknowledgements.xml +%%DOCSDIR%%/appA.xml +%%DOCSDIR%%/appB.xml +%%DOCSDIR%%/appC.xml +%%DOCSDIR%%/appD.xml +%%DOCSDIR%%/ch01.xml +%%DOCSDIR%%/ch02.xml +%%DOCSDIR%%/ch03.xml +%%DOCSDIR%%/ch04.xml +%%DOCSDIR%%/ch05.xml +%%DOCSDIR%%/ch06.xml +%%DOCSDIR%%/ch07.xml +%%DOCSDIR%%/ch08.xml +%%DOCSDIR%%/ch09.xml +%%DOCSDIR%%/ch10.xml +%%DOCSDIR%%/ch11.xml +%%DOCSDIR%%/ch12.xml +%%DOCSDIR%%/ch13.xml +%%DOCSDIR%%/ch14.xml +%%DOCSDIR%%/ch15.xml +%%DOCSDIR%%/ch16.xml +%%DOCSDIR%%/xkbproto.xml +@dirrmtry %%DOCSDIR%% @dirrmtry include/X11/extensions diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile index ed3c605..4c0e454 100644 --- a/x11/libICE/Makefile +++ b/x11/libICE/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libICE -# Date Created: 09 Nov, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libICE -PORTVERSION= 1.0.7 +PORTVERSION= 1.0.8 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/libICE/distinfo b/x11/libICE/distinfo index efdbf21..93d40b3 100644 --- a/x11/libICE/distinfo +++ b/x11/libICE/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libICE-1.0.7.tar.bz2) = a8b1692f151a473cee8733df9aefe98f7e5f64dfe6d4213cb6231d7bf855b901 -SIZE (xorg/lib/libICE-1.0.7.tar.bz2) = 323808 +SHA256 (xorg/lib/libICE-1.0.8.tar.bz2) = 24a991284d02ff0c789bc8d11ad2e4dffe144cb70f24e28f9ce3e8b1ee08b71e +SIZE (xorg/lib/libICE-1.0.8.tar.bz2) = 365762 diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile index 1c5fa1d..90ea110 100644 --- a/x11/libSM/Makefile +++ b/x11/libSM/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libSM -PORTVERSION= 1.2.0 +PORTVERSION= 1.2.1 PORTEPOCH= 1 CATEGORIES= x11 @@ -12,7 +12,7 @@ COMMENT= Session Management library for X11 LICENSE= MIT XORG_CAT= lib -USE_XORG= ice xproto:both xtrans xorg-macros +USE_XORG= ice xproto:both xtrans CONFIGURE_ARGS+=--disable-docs --without-xmlto diff --git a/x11/libSM/distinfo b/x11/libSM/distinfo index f9b6a42..ca43847 100644 --- a/x11/libSM/distinfo +++ b/x11/libSM/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libSM-1.2.0.tar.bz2) = 0cd8df1b7067bfda10b05d38279777770677c6fecb5a14e804a28597da7a57cb -SIZE (xorg/lib/libSM-1.2.0.tar.bz2) = 284287 +SHA256 (xorg/lib/libSM-1.2.1.tar.bz2) = 93c11d569c64f40723b93b44af1efb474a0cfe92573b0c8c330343cabb897f1d +SIZE (xorg/lib/libSM-1.2.1.tar.bz2) = 334696 diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index 013052c..5f08639 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libX11 -PORTVERSION= 1.4.4 +PORTVERSION= 1.5.0 PORTEPOCH= 1 CATEGORIES= x11 @@ -11,13 +11,11 @@ COMMENT= X11 library LICENSE= MIT -BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb -RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb - XORG_CAT= lib USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \ kbproto:both inputproto xf86bigfontproto xproto:both \ - xorg-macros + xcb +USE_PERL5_BUILD=yes CONFIGURE_ARGS+= --datadir=${PREFIX}/lib \ --without-xmlto \ diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo index 3b414ea..1c81e74 100644 --- a/x11/libX11/distinfo +++ b/x11/libX11/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libX11-1.4.4.tar.bz2) = 7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d -SIZE (xorg/lib/libX11-1.4.4.tar.bz2) = 2323404 +SHA256 (xorg/lib/libX11-1.5.0.tar.bz2) = c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86 +SIZE (xorg/lib/libX11-1.5.0.tar.bz2) = 2322265 diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile index 8a206ab..abc6f58 100644 --- a/x11/libXScrnSaver/Makefile +++ b/x11/libXScrnSaver/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: libXScrnSaver -# Date Created: 15 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= libXScrnSaver -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXScrnSaver/distinfo b/x11/libXScrnSaver/distinfo index 5b98617..7239ebc 100644 --- a/x11/libXScrnSaver/distinfo +++ b/x11/libXScrnSaver/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a -SIZE (xorg/lib/libXScrnSaver-1.2.1.tar.bz2) = 268322 +SHA256 (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d +SIZE (xorg/lib/libXScrnSaver-1.2.2.tar.bz2) = 290437 diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile index cf5c5b6..5192eda 100644 --- a/x11/libXTrap/Makefile +++ b/x11/libXTrap/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: libXTrap -# Date Created: 21 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= libXTrap -PORTVERSION= 1.0.0 +PORTVERSION= 1.0.1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXTrap/distinfo b/x11/libXTrap/distinfo index 465d883..9d48985 100644 --- a/x11/libXTrap/distinfo +++ b/x11/libXTrap/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXTrap-1.0.0.tar.bz2) = cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba -SIZE (xorg/lib/libXTrap-1.0.0.tar.bz2) = 220148 +SHA256 (xorg/lib/libXTrap-1.0.1.tar.bz2) = 8f373d55985676b893d61bd5a255ec9f214be4682ec1167d30356e6564e7252e +SIZE (xorg/lib/libXTrap-1.0.1.tar.bz2) = 269484 diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile index 73ddb55..76c5600 100644 --- a/x11/libXau/Makefile +++ b/x11/libXau/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXau -# Date Created: 29 Oct, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXau -PORTVERSION= 1.0.6 +PORTVERSION= 1.0.8 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXau/distinfo b/x11/libXau/distinfo index 73f4bc4..c0eadf7 100644 --- a/x11/libXau/distinfo +++ b/x11/libXau/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXau-1.0.6.tar.bz2) = ee84415ffedcc1c0d39b3a39c35d0596c89907bba93d22bf85e24d21f90170fc -SIZE (xorg/lib/libXau-1.0.6.tar.bz2) = 261501 +SHA256 (xorg/lib/libXau-1.0.8.tar.bz2) = fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2 +SIZE (xorg/lib/libXau-1.0.8.tar.bz2) = 295297 diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile index effee31..b171a89 100644 --- a/x11/libXcomposite/Makefile +++ b/x11/libXcomposite/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXext -# Date Created: 29 Oct, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXcomposite -PORTVERSION= 0.4.3 +PORTVERSION= 0.4.4 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/libXcomposite/distinfo b/x11/libXcomposite/distinfo index 48b4eb0..c4e1544 100644 --- a/x11/libXcomposite/distinfo +++ b/x11/libXcomposite/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad -SIZE (xorg/lib/libXcomposite-0.4.3.tar.bz2) = 246715 +SHA256 (xorg/lib/libXcomposite-0.4.4.tar.bz2) = ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178 +SIZE (xorg/lib/libXcomposite-0.4.4.tar.bz2) = 283746 diff --git a/x11/libXcomposite/pkg-plist b/x11/libXcomposite/pkg-plist index 1fe4879..af59654 100644 --- a/x11/libXcomposite/pkg-plist +++ b/x11/libXcomposite/pkg-plist @@ -4,3 +4,4 @@ lib/libXcomposite.la lib/libXcomposite.so lib/libXcomposite.so.1 libdata/pkgconfig/xcomposite.pc +@dirrmtry include/X11/extensions diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile index 31fb214..0bbf537 100644 --- a/x11/libXcursor/Makefile +++ b/x11/libXcursor/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXcursor -# Date Created: 22 Nov, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXcursor -PORTVERSION= 1.1.12 +PORTVERSION= 1.1.13 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXcursor/distinfo b/x11/libXcursor/distinfo index 7161de6..1fe7655 100644 --- a/x11/libXcursor/distinfo +++ b/x11/libXcursor/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXcursor-1.1.12.tar.bz2) = 0c4de165e07ac66b091af50a4db1f07e3c14d1bcf80830013693a21ef03e7ba4 -SIZE (xorg/lib/libXcursor-1.1.12.tar.bz2) = 297332 +SHA256 (xorg/lib/libXcursor-1.1.13.tar.bz2) = f78827de4a1b7ce8cceca24a9ab9d1b1d2f6a61362f505166ffc19b07c0bad8f +SIZE (xorg/lib/libXcursor-1.1.13.tar.bz2) = 302525 diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile index f27b136..0f23abb 100644 --- a/x11/libXdamage/Makefile +++ b/x11/libXdamage/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXdamage -# Date Created: 13 Nov, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXdamage -PORTVERSION= 1.1.3 +PORTVERSION= 1.1.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXdamage/distinfo b/x11/libXdamage/distinfo index dfea034..80739d0 100644 --- a/x11/libXdamage/distinfo +++ b/x11/libXdamage/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXdamage-1.1.3.tar.bz2) = bc6169c826d3cb17435ca84e1b479d65e4b51df1e48bbc3ec39a9cabf842c7a8 -SIZE (xorg/lib/libXdamage-1.1.3.tar.bz2) = 249029 +SHA256 (xorg/lib/libXdamage-1.1.4.tar.bz2) = 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad +SIZE (xorg/lib/libXdamage-1.1.4.tar.bz2) = 278937 diff --git a/x11/libXdamage/pkg-plist b/x11/libXdamage/pkg-plist index 530ce2e..0db2e1e 100644 --- a/x11/libXdamage/pkg-plist +++ b/x11/libXdamage/pkg-plist @@ -4,3 +4,4 @@ lib/libXdamage.la lib/libXdamage.so lib/libXdamage.so.1 libdata/pkgconfig/xdamage.pc +@dirrmtry include/X11/extensions diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile index ad629cf..3e3c7d2 100644 --- a/x11/libXdmcp/Makefile +++ b/x11/libXdmcp/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXdmcp -# Date Created: 28 Oct, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXdmcp -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXdmcp/distinfo b/x11/libXdmcp/distinfo index 6c4ff8c..0f4a04b 100644 --- a/x11/libXdmcp/distinfo +++ b/x11/libXdmcp/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXdmcp-1.1.0.tar.bz2) = b8a0e9a3192a3afddb56eb1d7adf933e423b401b2a492975d776dc0423c10072 -SIZE (xorg/lib/libXdmcp-1.1.0.tar.bz2) = 288256 +SHA256 (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e +SIZE (xorg/lib/libXdmcp-1.1.1.tar.bz2) = 310878 diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile index 11d67e7..dd3ed5c 100644 --- a/x11/libXevie/Makefile +++ b/x11/libXevie/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: libXevie -# Date Created: 21 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= libXevie PORTVERSION= 1.0.3 diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile index 24f7bad..0f046e6 100644 --- a/x11/libXext/Makefile +++ b/x11/libXext/Makefile @@ -1,13 +1,8 @@ -# New ports collection makefile for: libXext -# Date Created: 29 Oct, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXext -PORTVERSION= 1.3.0 -PORTREVISION= 1 +PORTVERSION= 1.3.1 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/libXext/distinfo b/x11/libXext/distinfo index 4b55944..62e30f6 100644 --- a/x11/libXext/distinfo +++ b/x11/libXext/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXext-1.3.0.tar.bz2) = e9daeb400855b9836e328500cec356b2769033174fc1b2be0df4a80f031debc0 -SIZE (xorg/lib/libXext-1.3.0.tar.bz2) = 341172 +SHA256 (xorg/lib/libXext-1.3.1.tar.bz2) = 56229c617eb7bfd6dec40d2805bc4dfb883dfe80f130d99b9a2beb632165e859 +SIZE (xorg/lib/libXext-1.3.1.tar.bz2) = 372728 diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile index 338fe64..35aacb4 100644 --- a/x11/libXfixes/Makefile +++ b/x11/libXfixes/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: libXext -# Date Created: 29 Oct, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXfixes PORTVERSION= 5.0 +PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile index 3aaa023..b36c6f4 100644 --- a/x11/libXi/Makefile +++ b/x11/libXi/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXi -# Date Created: 22 Nov, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXi -PORTVERSION= 1.4.5 +PORTVERSION= 1.7.1 PORTEPOCH= 1 CATEGORIES= x11 @@ -16,9 +12,14 @@ COMMENT= X Input extension library LICENSE= MIT XORG_CAT= lib -USE_XORG= xproto x11 xext xextproto inputproto:both +USE_XORG= xproto x11 xext xextproto xfixes inputproto:both -CONFIGURE_ARGS+=--disable-specs --without-xmlto +CONFIGURE_ARGS+=--disable-docs \ + --disable-specs \ + --without-xmlto \ + --without-fop \ + --without-asciidoc \ + --without-xsltproc MAN3= XAllowDeviceEvents.3 \ XChangeDeviceControl.3 \ @@ -47,6 +48,8 @@ MAN3= XAllowDeviceEvents.3 \ XGrabDevice.3\ XGrabDeviceButton.3\ XGrabDeviceKey.3\ + XIBarrierReleasePointer.3\ + XIBarrierReleasePointers.3\ XIChangeHierarchy.3\ XIChangeProperty.3\ XIDefineCursor.3\ @@ -61,6 +64,7 @@ MAN3= XAllowDeviceEvents.3 \ XIGrabEnter.3\ XIGrabFocusIn.3\ XIGrabKeycode.3\ + XIGrabTouchBegin.3 \ XIListProperties.3\ XIQueryDevice.3\ XIQueryPointer.3\ @@ -74,6 +78,7 @@ MAN3= XAllowDeviceEvents.3 \ XIUngrabEnter.3 \ XIUngrabFocusIn.3 \ XIUngrabKeycode.3 \ + XIUngrabTouchBegin.3 \ XIWarpPointer.3 \ XListDeviceProperties.3 \ XListInputDevices.3 \ diff --git a/x11/libXi/distinfo b/x11/libXi/distinfo index 98b1cb1..10f6fc7 100644 --- a/x11/libXi/distinfo +++ b/x11/libXi/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXi-1.4.5.tar.bz2) = 22a99123229d22e6e1567c4cda0224a744475f427625d61b23d965157a86f1b5 -SIZE (xorg/lib/libXi-1.4.5.tar.bz2) = 416807 +SHA256 (xorg/lib/libXi-1.7.1.tar.bz2) = e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5 +SIZE (xorg/lib/libXi-1.7.1.tar.bz2) = 434569 diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile index fef3e0a..30d0b17 100644 --- a/x11/libXinerama/Makefile +++ b/x11/libXinerama/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXinerama -# Date Created: 7 May, 2004 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXinerama -PORTVERSION= 1.1.1 +PORTVERSION= 1.1.2 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/libXinerama/distinfo b/x11/libXinerama/distinfo index fa6d167..a039aab 100644 --- a/x11/libXinerama/distinfo +++ b/x11/libXinerama/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXinerama-1.1.1.tar.bz2) = bbe2b4a0e8ccf01a40f02c429c8418bd1fe652fd2c6f05d487e1319599d6779f -SIZE (xorg/lib/libXinerama-1.1.1.tar.bz2) = 266086 +SHA256 (xorg/lib/libXinerama-1.1.2.tar.bz2) = a4e77c2fd88372e4ae365f3ca0434a23613da96c5b359b1a64bf43614ec06aac +SIZE (xorg/lib/libXinerama-1.1.2.tar.bz2) = 279682 diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile index 6f99f71..5611994 100644 --- a/x11/libXp/Makefile +++ b/x11/libXp/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: libXp -# Date Created: 4 May 2004 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXp PORTVERSION= 1.0.1 diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile index 3e44c85..de29619 100644 --- a/x11/libXpm/Makefile +++ b/x11/libXpm/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXpm -# Date Created: 25 Jan, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXpm -PORTVERSION= 3.5.9 +PORTVERSION= 3.5.10 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXpm/distinfo b/x11/libXpm/distinfo index f6b9e4d..ee9bb9e 100644 --- a/x11/libXpm/distinfo +++ b/x11/libXpm/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXpm-3.5.9.tar.bz2) = 8add01029cab0598ca86e01a2f7781a636f74b757abe6b50ba61b2a6e2fd621e -SIZE (xorg/lib/libXpm-3.5.9.tar.bz2) = 383818 +SHA256 (xorg/lib/libXpm-3.5.10.tar.bz2) = a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735 +SIZE (xorg/lib/libXpm-3.5.10.tar.bz2) = 431310 diff --git a/x11/libXprintAppUtil/Makefile b/x11/libXprintAppUtil/Makefile index 5815109..b592e9c 100644 --- a/x11/libXprintAppUtil/Makefile +++ b/x11/libXprintAppUtil/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: libXprintAppUtil -# Date Created: 21 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= libXprintAppUtil PORTVERSION= 1.0.1 diff --git a/x11/libXprintUtil/Makefile b/x11/libXprintUtil/Makefile index 1b97469..67b3c48 100644 --- a/x11/libXprintUtil/Makefile +++ b/x11/libXprintUtil/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: libXprintUtil -# Date Created: 21 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= libXprintUtil PORTVERSION= 1.0.1 diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile index 6d5e961..da7abf5 100644 --- a/x11/libXrandr/Makefile +++ b/x11/libXrandr/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXrandr -# Date Created: 9 Nov, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXrandr -PORTVERSION= 1.3.2 +PORTVERSION= 1.4.0 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXrandr/distinfo b/x11/libXrandr/distinfo index e2b60e9..11f3498 100644 --- a/x11/libXrandr/distinfo +++ b/x11/libXrandr/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXrandr-1.3.2.tar.bz2) = 7eaca216ab5233d7396119eb87c1989d350a3efead104d54b55f22cdd1d99b81 -SIZE (xorg/lib/libXrandr-1.3.2.tar.bz2) = 274401 +SHA256 (xorg/lib/libXrandr-1.4.0.tar.bz2) = 033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3 +SIZE (xorg/lib/libXrandr-1.4.0.tar.bz2) = 306649 diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile index 301d1c1..0f60547 100644 --- a/x11/libXrender/Makefile +++ b/x11/libXrender/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: xrender -# Date Created: 2 Jul, 2003 -# Whom: Foxfair Hu <foxfair@FreeBSD.org> -# +# Created by: Foxfair Hu <foxfair@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXrender -PORTVERSION= 0.9.6 +PORTVERSION= 0.9.7 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXrender/distinfo b/x11/libXrender/distinfo index 708a9b2..a0865cc 100644 --- a/x11/libXrender/distinfo +++ b/x11/libXrender/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXrender-0.9.6.tar.bz2) = 7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668 -SIZE (xorg/lib/libXrender-0.9.6.tar.bz2) = 258249 +SHA256 (xorg/lib/libXrender-0.9.7.tar.bz2) = f9b46b93c9bc15d5745d193835ac9ba2a2b411878fad60c504bbb8f98492bbe6 +SIZE (xorg/lib/libXrender-0.9.7.tar.bz2) = 281098 diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile index a3d8221..08f9da9 100644 --- a/x11/libXres/Makefile +++ b/x11/libXres/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXext -# Date Created: 29 Oct, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXres -PORTVERSION= 1.0.5 +PORTVERSION= 1.0.6 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXres/distinfo b/x11/libXres/distinfo index 9f40e7f..f2ddd52 100644 --- a/x11/libXres/distinfo +++ b/x11/libXres/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXres-1.0.5.tar.bz2) = a00b0f464bc0c038db5614513b0e33475db22a7b3cd41e4e56a6c661a518a059 -SIZE (xorg/lib/libXres-1.0.5.tar.bz2) = 240062 +SHA256 (xorg/lib/libXres-1.0.6.tar.bz2) = ff8661c925e8b182f98ae98f02bbd93c55259ef7f34a92c1a126b6074ebde890 +SIZE (xorg/lib/libXres-1.0.6.tar.bz2) = 282035 diff --git a/x11/libXtrans/Makefile b/x11/libXtrans/Makefile index d5bb505..a311d50 100644 --- a/x11/libXtrans/Makefile +++ b/x11/libXtrans/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: libXtrans -# Date Created: 28 Oct, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXtrans PORTVERSION= 0.1 diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile index 1dd0f42..547b575 100644 --- a/x11/libXtst/Makefile +++ b/x11/libXtst/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXtst -# Date Created: 8 Feb 2006 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXtst -PORTVERSION= 1.2.0 +PORTVERSION= 1.2.1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXtst/distinfo b/x11/libXtst/distinfo index 20e9e94..89e0259 100644 --- a/x11/libXtst/distinfo +++ b/x11/libXtst/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXtst-1.2.0.tar.bz2) = 7a2e0912b521f6bd8c392189874ba4a3b8168b0bba4c2143e073de53d8e85408 -SIZE (xorg/lib/libXtst-1.2.0.tar.bz2) = 281922 +SHA256 (xorg/lib/libXtst-1.2.1.tar.bz2) = 7eea3e66e392aca3f9dad6238198753c28e1c32fa4903cbb7739607a2504e5e0 +SIZE (xorg/lib/libXtst-1.2.1.tar.bz2) = 313147 diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile index 333c8d8..d3ee77e 100644 --- a/x11/libXv/Makefile +++ b/x11/libXv/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXv -# Date Created: 13 Nov, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXv -PORTVERSION= 1.0.6 +PORTVERSION= 1.0.7 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/libXv/distinfo b/x11/libXv/distinfo index 3a0b5fc..05bce51 100644 --- a/x11/libXv/distinfo +++ b/x11/libXv/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXv-1.0.6.tar.bz2) = e20f8e594bb0f44f3fbd25996945730391d72acbe5eaac760429fd6579caf5ee -SIZE (xorg/lib/libXv-1.0.6.tar.bz2) = 271504 +SHA256 (xorg/lib/libXv-1.0.7.tar.bz2) = 5d664aeb641f8c867331a0c6b4574a5e7e420f00bf5fcefd874e8d003ea59010 +SIZE (xorg/lib/libXv-1.0.7.tar.bz2) = 285379 diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile index c192a80..c9e9a9e 100644 --- a/x11/libXvMC/Makefile +++ b/x11/libXvMC/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXvMC -# Date Created: 8 Feb 206 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXvMC -PORTVERSION= 1.0.6 +PORTVERSION= 1.0.7 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXvMC/distinfo b/x11/libXvMC/distinfo index 9aa47c4..9749f38 100644 --- a/x11/libXvMC/distinfo +++ b/x11/libXvMC/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXvMC-1.0.6.tar.bz2) = 3dda80e9c71fd14a14f93279c6f661703c5c1c43d104a5db0842377bdf0c3392 -SIZE (xorg/lib/libXvMC-1.0.6.tar.bz2) = 270013 +SHA256 (xorg/lib/libXvMC-1.0.7.tar.bz2) = 28f085fc8518a3dadfe355360705d50153051f09898093e69af806c0b437cea3 +SIZE (xorg/lib/libXvMC-1.0.7.tar.bz2) = 299745 diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile index 6404f97..73e7dcf 100644 --- a/x11/libXxf86dga/Makefile +++ b/x11/libXxf86dga/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXxf86dga -# Date Created: 8 Feb 2006 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXxf86dga -PORTVERSION= 1.1.2 +PORTVERSION= 1.1.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXxf86dga/distinfo b/x11/libXxf86dga/distinfo index 643f927a..d0b4606 100644 --- a/x11/libXxf86dga/distinfo +++ b/x11/libXxf86dga/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 1ba652f562ce3fb3fef092ce5485eb7ef15b521124c901977b56d6f324605a06 -SIZE (xorg/lib/libXxf86dga-1.1.2.tar.bz2) = 270013 +SHA256 (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 551fa374dbef0f977de1f35d005fa9ffe92b7a87e82dbe62d6a4640f5b0b4994 +SIZE (xorg/lib/libXxf86dga-1.1.3.tar.bz2) = 290347 diff --git a/x11/libXxf86dga/files/patch-src_XF86DGA2.c b/x11/libXxf86dga/files/patch-src_XF86DGA2.c new file mode 100644 index 0000000..69ede4e --- /dev/null +++ b/x11/libXxf86dga/files/patch-src_XF86DGA2.c @@ -0,0 +1,20 @@ +--- src/XF86DGA2.c.orig 2013-03-25 20:23:42.796859881 +0100 ++++ src/XF86DGA2.c 2013-03-25 20:23:17.997856725 +0100 +@@ -21,6 +21,8 @@ + #include <X11/extensions/extutil.h> + #include <stdio.h> + ++#include <stdint.h> ++ + + /* If you change this, change the Bases[] array below as well */ + #define MAX_HEADS 16 +@@ -928,7 +930,7 @@ + if ((pMap->fd = open(name, O_RDWR)) < 0) + return False; + pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE, +- MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base); ++ MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base); + if (pMap->virtual == (void *)-1) + return False; + mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE); diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile index fd15d2a..5a267d1 100644 --- a/x11/libXxf86misc/Makefile +++ b/x11/libXxf86misc/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: libXxf86misc -# Date Created: 8 Feb 2006 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXxf86misc PORTVERSION= 1.0.3 diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile index 1385ced..995f210 100644 --- a/x11/libXxf86vm/Makefile +++ b/x11/libXxf86vm/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libXxf86vm -# Date Created: 8 Feb 2006 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXxf86vm -PORTVERSION= 1.1.1 +PORTVERSION= 1.1.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXxf86vm/distinfo b/x11/libXxf86vm/distinfo index 531de86..33220e8 100644 --- a/x11/libXxf86vm/distinfo +++ b/x11/libXxf86vm/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 21cae9239aefd59353a4ddb0d6ed890402b681570ccd4bc977d80a75a020239e -SIZE (xorg/lib/libXxf86vm-1.1.1.tar.bz2) = 252404 +SHA256 (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = a564172fb866b1b587bbccb7d041088931029845245e0d15c32ca7f1bb48fc84 +SIZE (xorg/lib/libXxf86vm-1.1.2.tar.bz2) = 284717 diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile index 5ec77e3..12b60d3 100644 --- a/x11/libdmx/Makefile +++ b/x11/libdmx/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libdmx -# Date Created: 8 Feb 2006 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libdmx -PORTVERSION= 1.1.1 +PORTVERSION= 1.1.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libdmx/distinfo b/x11/libdmx/distinfo index 2d59bf4..292d922 100644 --- a/x11/libdmx/distinfo +++ b/x11/libdmx/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libdmx-1.1.1.tar.bz2) = a6de6e87470bc749de02056fa38758d0e633303789830fdafc56600e75b3de18 -SIZE (xorg/lib/libdmx-1.1.1.tar.bz2) = 265460 +SHA256 (xorg/lib/libdmx-1.1.2.tar.bz2) = a7870b648a8768d65432af76dd11581ff69f3955118540d5967eb1eef43838ba +SIZE (xorg/lib/libdmx-1.1.2.tar.bz2) = 290694 diff --git a/x11/liboldX/Makefile b/x11/liboldX/Makefile index 9cd5448..090dbbe 100644 --- a/x11/liboldX/Makefile +++ b/x11/liboldX/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: liboldX -# Date Created: Dec 16 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= liboldX PORTVERSION= 1.0.1 diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile index 80822da..27a6564 100644 --- a/x11/libxcb/Makefile +++ b/x11/libxcb/Makefile @@ -1,18 +1,17 @@ -# New ports collection makefile for: libxcb -# Date Created: 2006-08-23 -# Whom: Ashish Shukla <wahjava@gmail.com> -# +# Created by: Ashish Shukla <wahjava@gmail.com> # $FreeBSD$ -# PORTNAME= libxcb -PORTVERSION= 1.7 +PORTVERSION= 1.9 CATEGORIES= x11 python MASTER_SITES= http://xcb.freedesktop.org/dist/ MAINTAINER= x11@FreeBSD.org COMMENT= The X protocol C-language Binding (XCB) library +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + BUILD_DEPENDS= ${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \ xsltproc:${PORTSDIR}/textproc/libxslt \ xcb-proto>=1.7:${PORTSDIR}/x11/xcb-proto \ @@ -21,15 +20,12 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/l CONFIGURE_ARGS+= --disable-build-docs --without-doxygen --enable-xinput -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/COPYING - USE_BZIP2= yes -USES= pathfix +USES= pathfix USE_GMAKE= yes USE_LDCONFIG= yes USE_XORG= xau xdmcp -USE_PYTHON_BUILD= 2.5-2.7 +USE_PYTHON_BUILD= 2.5+ GNU_CONFIGURE= yes .for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS @@ -46,8 +42,12 @@ XDMCP_LIBS= -L${LOCALBASE}/lib -lXdmcp XPROTO_CFLAGS= -I${LOCALBASE}/include XPROTO_LIBS= -L${LOCALBASE}/lib +.include "${.CURDIR}/manpages" + +.include <bsd.port.options.mk> + post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MAKE} -C ${WRKSRC}/doc ${INSTALL_TARGET} .endif diff --git a/x11/libxcb/distinfo b/x11/libxcb/distinfo index 6354685..adcd292 100644 --- a/x11/libxcb/distinfo +++ b/x11/libxcb/distinfo @@ -1,2 +1,2 @@ -SHA256 (libxcb-1.7.tar.bz2) = e776dc35e2a66094e7308ce2e045fb4e27cf3ca30ab1813a8fc08538140724df -SIZE (libxcb-1.7.tar.bz2) = 318619 +SHA256 (libxcb-1.9.tar.bz2) = 8857e62b3aae2976c7e10043643e45a85964fd1dcb4469dfde0d04d3d1b12c96 +SIZE (libxcb-1.9.tar.bz2) = 387612 diff --git a/x11/libxcb/manpages b/x11/libxcb/manpages new file mode 100644 index 0000000..64b60b1 --- /dev/null +++ b/x11/libxcb/manpages @@ -0,0 +1,2041 @@ +MAN3 = \ +xcb-examples.3 \ +xcb-requests.3 \ +xcb_alloc_color.3 \ +xcb_alloc_color_cells.3 \ +xcb_alloc_color_cells_masks.3 \ +xcb_alloc_color_cells_masks_end.3 \ +xcb_alloc_color_cells_masks_length.3 \ +xcb_alloc_color_cells_pixels.3 \ +xcb_alloc_color_cells_pixels_end.3 \ +xcb_alloc_color_cells_pixels_length.3 \ +xcb_alloc_color_cells_reply.3 \ +xcb_alloc_color_cells_unchecked.3 \ +xcb_alloc_color_planes.3 \ +xcb_alloc_color_planes_pixels.3 \ +xcb_alloc_color_planes_pixels_end.3 \ +xcb_alloc_color_planes_pixels_length.3 \ +xcb_alloc_color_planes_reply.3 \ +xcb_alloc_color_planes_unchecked.3 \ +xcb_alloc_color_reply.3 \ +xcb_alloc_color_unchecked.3 \ +xcb_alloc_named_color.3 \ +xcb_alloc_named_color_reply.3 \ +xcb_alloc_named_color_unchecked.3 \ +xcb_allow_events.3 \ +xcb_allow_events_checked.3 \ +xcb_bell.3 \ +xcb_bell_checked.3 \ +xcb_big_requests_enable.3 \ +xcb_big_requests_enable_reply.3 \ +xcb_big_requests_enable_unchecked.3 \ +xcb_button_press_event_t.3 \ +xcb_button_release_event_t.3 \ +xcb_change_active_pointer_grab.3 \ +xcb_change_active_pointer_grab_checked.3 \ +xcb_change_gc.3 \ +xcb_change_gc_checked.3 \ +xcb_change_hosts.3 \ +xcb_change_hosts_checked.3 \ +xcb_change_keyboard_control.3 \ +xcb_change_keyboard_control_checked.3 \ +xcb_change_keyboard_mapping.3 \ +xcb_change_keyboard_mapping_checked.3 \ +xcb_change_pointer_control.3 \ +xcb_change_pointer_control_checked.3 \ +xcb_change_property.3 \ +xcb_change_property_checked.3 \ +xcb_change_save_set.3 \ +xcb_change_save_set_checked.3 \ +xcb_change_window_attributes.3 \ +xcb_change_window_attributes_checked.3 \ +xcb_circulate_notify_event_t.3 \ +xcb_circulate_request_event_t.3 \ +xcb_circulate_window.3 \ +xcb_circulate_window_checked.3 \ +xcb_clear_area.3 \ +xcb_clear_area_checked.3 \ +xcb_client_message_event_t.3 \ +xcb_close_font.3 \ +xcb_close_font_checked.3 \ +xcb_colormap_notify_event_t.3 \ +xcb_composite_create_region_from_border_clip.3 \ +xcb_composite_create_region_from_border_clip_checked.3 \ +xcb_composite_get_overlay_window.3 \ +xcb_composite_get_overlay_window_reply.3 \ +xcb_composite_get_overlay_window_unchecked.3 \ +xcb_composite_name_window_pixmap.3 \ +xcb_composite_name_window_pixmap_checked.3 \ +xcb_composite_query_version.3 \ +xcb_composite_query_version_reply.3 \ +xcb_composite_query_version_unchecked.3 \ +xcb_composite_redirect_subwindows.3 \ +xcb_composite_redirect_subwindows_checked.3 \ +xcb_composite_redirect_window.3 \ +xcb_composite_redirect_window_checked.3 \ +xcb_composite_release_overlay_window.3 \ +xcb_composite_release_overlay_window_checked.3 \ +xcb_composite_unredirect_subwindows.3 \ +xcb_composite_unredirect_subwindows_checked.3 \ +xcb_composite_unredirect_window.3 \ +xcb_composite_unredirect_window_checked.3 \ +xcb_configure_notify_event_t.3 \ +xcb_configure_request_event_t.3 \ +xcb_configure_window.3 \ +xcb_configure_window_checked.3 \ +xcb_convert_selection.3 \ +xcb_convert_selection_checked.3 \ +xcb_copy_area.3 \ +xcb_copy_area_checked.3 \ +xcb_copy_colormap_and_free.3 \ +xcb_copy_colormap_and_free_checked.3 \ +xcb_copy_gc.3 \ +xcb_copy_gc_checked.3 \ +xcb_copy_plane.3 \ +xcb_copy_plane_checked.3 \ +xcb_create_colormap.3 \ +xcb_create_colormap_checked.3 \ +xcb_create_cursor.3 \ +xcb_create_cursor_checked.3 \ +xcb_create_gc.3 \ +xcb_create_gc_checked.3 \ +xcb_create_glyph_cursor.3 \ +xcb_create_glyph_cursor_checked.3 \ +xcb_create_notify_event_t.3 \ +xcb_create_pixmap.3 \ +xcb_create_pixmap_checked.3 \ +xcb_create_window.3 \ +xcb_create_window_checked.3 \ +xcb_damage_add.3 \ +xcb_damage_add_checked.3 \ +xcb_damage_create.3 \ +xcb_damage_create_checked.3 \ +xcb_damage_destroy.3 \ +xcb_damage_destroy_checked.3 \ +xcb_damage_notify_event_t.3 \ +xcb_damage_query_version.3 \ +xcb_damage_query_version_reply.3 \ +xcb_damage_query_version_unchecked.3 \ +xcb_damage_subtract.3 \ +xcb_damage_subtract_checked.3 \ +xcb_delete_property.3 \ +xcb_delete_property_checked.3 \ +xcb_destroy_notify_event_t.3 \ +xcb_destroy_subwindows.3 \ +xcb_destroy_subwindows_checked.3 \ +xcb_destroy_window.3 \ +xcb_destroy_window_checked.3 \ +xcb_dpms_capable.3 \ +xcb_dpms_capable_reply.3 \ +xcb_dpms_capable_unchecked.3 \ +xcb_dpms_disable.3 \ +xcb_dpms_disable_checked.3 \ +xcb_dpms_enable.3 \ +xcb_dpms_enable_checked.3 \ +xcb_dpms_force_level.3 \ +xcb_dpms_force_level_checked.3 \ +xcb_dpms_get_timeouts.3 \ +xcb_dpms_get_timeouts_reply.3 \ +xcb_dpms_get_timeouts_unchecked.3 \ +xcb_dpms_get_version.3 \ +xcb_dpms_get_version_reply.3 \ +xcb_dpms_get_version_unchecked.3 \ +xcb_dpms_info.3 \ +xcb_dpms_info_reply.3 \ +xcb_dpms_info_unchecked.3 \ +xcb_dpms_set_timeouts.3 \ +xcb_dpms_set_timeouts_checked.3 \ +xcb_dri2_authenticate.3 \ +xcb_dri2_authenticate_reply.3 \ +xcb_dri2_authenticate_unchecked.3 \ +xcb_dri2_buffer_swap_complete_event_t.3 \ +xcb_dri2_connect.3 \ +xcb_dri2_connect_alignment_pad.3 \ +xcb_dri2_connect_alignment_pad_end.3 \ +xcb_dri2_connect_alignment_pad_length.3 \ +xcb_dri2_connect_device_name.3 \ +xcb_dri2_connect_device_name_end.3 \ +xcb_dri2_connect_device_name_length.3 \ +xcb_dri2_connect_driver_name.3 \ +xcb_dri2_connect_driver_name_end.3 \ +xcb_dri2_connect_driver_name_length.3 \ +xcb_dri2_connect_reply.3 \ +xcb_dri2_connect_unchecked.3 \ +xcb_dri2_copy_region.3 \ +xcb_dri2_copy_region_reply.3 \ +xcb_dri2_copy_region_unchecked.3 \ +xcb_dri2_create_drawable.3 \ +xcb_dri2_create_drawable_checked.3 \ +xcb_dri2_destroy_drawable.3 \ +xcb_dri2_destroy_drawable_checked.3 \ +xcb_dri2_get_buffers.3 \ +xcb_dri2_get_buffers_buffers.3 \ +xcb_dri2_get_buffers_buffers_iterator.3 \ +xcb_dri2_get_buffers_buffers_length.3 \ +xcb_dri2_get_buffers_reply.3 \ +xcb_dri2_get_buffers_unchecked.3 \ +xcb_dri2_get_buffers_with_format.3 \ +xcb_dri2_get_buffers_with_format_buffers.3 \ +xcb_dri2_get_buffers_with_format_buffers_iterator.3 \ +xcb_dri2_get_buffers_with_format_buffers_length.3 \ +xcb_dri2_get_buffers_with_format_reply.3 \ +xcb_dri2_get_buffers_with_format_unchecked.3 \ +xcb_dri2_get_msc.3 \ +xcb_dri2_get_msc_reply.3 \ +xcb_dri2_get_msc_unchecked.3 \ +xcb_dri2_get_param.3 \ +xcb_dri2_get_param_reply.3 \ +xcb_dri2_get_param_unchecked.3 \ +xcb_dri2_invalidate_buffers_event_t.3 \ +xcb_dri2_query_version.3 \ +xcb_dri2_query_version_reply.3 \ +xcb_dri2_query_version_unchecked.3 \ +xcb_dri2_swap_buffers.3 \ +xcb_dri2_swap_buffers_reply.3 \ +xcb_dri2_swap_buffers_unchecked.3 \ +xcb_dri2_swap_interval.3 \ +xcb_dri2_swap_interval_checked.3 \ +xcb_dri2_wait_msc.3 \ +xcb_dri2_wait_msc_reply.3 \ +xcb_dri2_wait_msc_unchecked.3 \ +xcb_dri2_wait_sbc.3 \ +xcb_dri2_wait_sbc_reply.3 \ +xcb_dri2_wait_sbc_unchecked.3 \ +xcb_enter_notify_event_t.3 \ +xcb_expose_event_t.3 \ +xcb_fill_poly.3 \ +xcb_fill_poly_checked.3 \ +xcb_focus_in_event_t.3 \ +xcb_focus_out_event_t.3 \ +xcb_force_screen_saver.3 \ +xcb_force_screen_saver_checked.3 \ +xcb_free_colormap.3 \ +xcb_free_colormap_checked.3 \ +xcb_free_colors.3 \ +xcb_free_colors_checked.3 \ +xcb_free_cursor.3 \ +xcb_free_cursor_checked.3 \ +xcb_free_gc.3 \ +xcb_free_gc_checked.3 \ +xcb_free_pixmap.3 \ +xcb_free_pixmap_checked.3 \ +xcb_get_atom_name.3 \ +xcb_get_atom_name_name.3 \ +xcb_get_atom_name_name_end.3 \ +xcb_get_atom_name_name_length.3 \ +xcb_get_atom_name_reply.3 \ +xcb_get_atom_name_unchecked.3 \ +xcb_get_font_path.3 \ +xcb_get_font_path_path_iterator.3 \ +xcb_get_font_path_path_length.3 \ +xcb_get_font_path_reply.3 \ +xcb_get_font_path_unchecked.3 \ +xcb_get_geometry.3 \ +xcb_get_geometry_reply.3 \ +xcb_get_geometry_unchecked.3 \ +xcb_get_image.3 \ +xcb_get_image_data.3 \ +xcb_get_image_data_end.3 \ +xcb_get_image_data_length.3 \ +xcb_get_image_reply.3 \ +xcb_get_image_unchecked.3 \ +xcb_get_input_focus.3 \ +xcb_get_input_focus_reply.3 \ +xcb_get_input_focus_unchecked.3 \ +xcb_get_keyboard_control.3 \ +xcb_get_keyboard_control_reply.3 \ +xcb_get_keyboard_control_unchecked.3 \ +xcb_get_keyboard_mapping.3 \ +xcb_get_keyboard_mapping_keysyms.3 \ +xcb_get_keyboard_mapping_keysyms_end.3 \ +xcb_get_keyboard_mapping_keysyms_length.3 \ +xcb_get_keyboard_mapping_reply.3 \ +xcb_get_keyboard_mapping_unchecked.3 \ +xcb_get_modifier_mapping.3 \ +xcb_get_modifier_mapping_keycodes.3 \ +xcb_get_modifier_mapping_keycodes_end.3 \ +xcb_get_modifier_mapping_keycodes_length.3 \ +xcb_get_modifier_mapping_reply.3 \ +xcb_get_modifier_mapping_unchecked.3 \ +xcb_get_motion_events.3 \ +xcb_get_motion_events_events.3 \ +xcb_get_motion_events_events_iterator.3 \ +xcb_get_motion_events_events_length.3 \ +xcb_get_motion_events_reply.3 \ +xcb_get_motion_events_unchecked.3 \ +xcb_get_pointer_control.3 \ +xcb_get_pointer_control_reply.3 \ +xcb_get_pointer_control_unchecked.3 \ +xcb_get_pointer_mapping.3 \ +xcb_get_pointer_mapping_map.3 \ +xcb_get_pointer_mapping_map_end.3 \ +xcb_get_pointer_mapping_map_length.3 \ +xcb_get_pointer_mapping_reply.3 \ +xcb_get_pointer_mapping_unchecked.3 \ +xcb_get_property.3 \ +xcb_get_property_reply.3 \ +xcb_get_property_unchecked.3 \ +xcb_get_property_value.3 \ +xcb_get_property_value_end.3 \ +xcb_get_property_value_length.3 \ +xcb_get_screen_saver.3 \ +xcb_get_screen_saver_reply.3 \ +xcb_get_screen_saver_unchecked.3 \ +xcb_get_selection_owner.3 \ +xcb_get_selection_owner_reply.3 \ +xcb_get_selection_owner_unchecked.3 \ +xcb_get_window_attributes.3 \ +xcb_get_window_attributes_reply.3 \ +xcb_get_window_attributes_unchecked.3 \ +xcb_glx_are_textures_resident.3 \ +xcb_glx_are_textures_resident_data.3 \ +xcb_glx_are_textures_resident_data_end.3 \ +xcb_glx_are_textures_resident_data_length.3 \ +xcb_glx_are_textures_resident_reply.3 \ +xcb_glx_are_textures_resident_unchecked.3 \ +xcb_glx_change_drawable_attributes.3 \ +xcb_glx_change_drawable_attributes_checked.3 \ +xcb_glx_client_info.3 \ +xcb_glx_client_info_checked.3 \ +xcb_glx_copy_context.3 \ +xcb_glx_copy_context_checked.3 \ +xcb_glx_create_context.3 \ +xcb_glx_create_context_attribs_arb.3 \ +xcb_glx_create_context_attribs_arb_checked.3 \ +xcb_glx_create_context_checked.3 \ +xcb_glx_create_glx_pixmap.3 \ +xcb_glx_create_glx_pixmap_checked.3 \ +xcb_glx_create_new_context.3 \ +xcb_glx_create_new_context_checked.3 \ +xcb_glx_create_pbuffer.3 \ +xcb_glx_create_pbuffer_checked.3 \ +xcb_glx_create_pixmap.3 \ +xcb_glx_create_pixmap_checked.3 \ +xcb_glx_create_window.3 \ +xcb_glx_create_window_checked.3 \ +xcb_glx_delete_lists.3 \ +xcb_glx_delete_lists_checked.3 \ +xcb_glx_delete_queries_arb.3 \ +xcb_glx_delete_queries_arb_checked.3 \ +xcb_glx_delete_textures.3 \ +xcb_glx_delete_textures_checked.3 \ +xcb_glx_delete_window.3 \ +xcb_glx_delete_window_checked.3 \ +xcb_glx_destroy_context.3 \ +xcb_glx_destroy_context_checked.3 \ +xcb_glx_destroy_glx_pixmap.3 \ +xcb_glx_destroy_glx_pixmap_checked.3 \ +xcb_glx_destroy_pbuffer.3 \ +xcb_glx_destroy_pbuffer_checked.3 \ +xcb_glx_destroy_pixmap.3 \ +xcb_glx_destroy_pixmap_checked.3 \ +xcb_glx_end_list.3 \ +xcb_glx_end_list_checked.3 \ +xcb_glx_feedback_buffer.3 \ +xcb_glx_feedback_buffer_checked.3 \ +xcb_glx_finish.3 \ +xcb_glx_finish_reply.3 \ +xcb_glx_finish_unchecked.3 \ +xcb_glx_flush.3 \ +xcb_glx_flush_checked.3 \ +xcb_glx_gen_lists.3 \ +xcb_glx_gen_lists_reply.3 \ +xcb_glx_gen_lists_unchecked.3 \ +xcb_glx_gen_queries_arb.3 \ +xcb_glx_gen_queries_arb_data.3 \ +xcb_glx_gen_queries_arb_data_end.3 \ +xcb_glx_gen_queries_arb_data_length.3 \ +xcb_glx_gen_queries_arb_reply.3 \ +xcb_glx_gen_queries_arb_unchecked.3 \ +xcb_glx_gen_textures.3 \ +xcb_glx_gen_textures_data.3 \ +xcb_glx_gen_textures_data_end.3 \ +xcb_glx_gen_textures_data_length.3 \ +xcb_glx_gen_textures_reply.3 \ +xcb_glx_gen_textures_unchecked.3 \ +xcb_glx_get_booleanv.3 \ +xcb_glx_get_booleanv_data.3 \ +xcb_glx_get_booleanv_data_end.3 \ +xcb_glx_get_booleanv_data_length.3 \ +xcb_glx_get_booleanv_reply.3 \ +xcb_glx_get_booleanv_unchecked.3 \ +xcb_glx_get_clip_plane.3 \ +xcb_glx_get_clip_plane_data.3 \ +xcb_glx_get_clip_plane_data_end.3 \ +xcb_glx_get_clip_plane_data_length.3 \ +xcb_glx_get_clip_plane_reply.3 \ +xcb_glx_get_clip_plane_unchecked.3 \ +xcb_glx_get_color_table.3 \ +xcb_glx_get_color_table_data.3 \ +xcb_glx_get_color_table_data_end.3 \ +xcb_glx_get_color_table_data_length.3 \ +xcb_glx_get_color_table_parameterfv.3 \ +xcb_glx_get_color_table_parameterfv_data.3 \ +xcb_glx_get_color_table_parameterfv_data_end.3 \ +xcb_glx_get_color_table_parameterfv_data_length.3 \ +xcb_glx_get_color_table_parameterfv_reply.3 \ +xcb_glx_get_color_table_parameterfv_unchecked.3 \ +xcb_glx_get_color_table_parameteriv.3 \ +xcb_glx_get_color_table_parameteriv_data.3 \ +xcb_glx_get_color_table_parameteriv_data_end.3 \ +xcb_glx_get_color_table_parameteriv_data_length.3 \ +xcb_glx_get_color_table_parameteriv_reply.3 \ +xcb_glx_get_color_table_parameteriv_unchecked.3 \ +xcb_glx_get_color_table_reply.3 \ +xcb_glx_get_color_table_unchecked.3 \ +xcb_glx_get_compressed_tex_image_arb.3 \ +xcb_glx_get_compressed_tex_image_arb_data.3 \ +xcb_glx_get_compressed_tex_image_arb_data_end.3 \ +xcb_glx_get_compressed_tex_image_arb_data_length.3 \ +xcb_glx_get_compressed_tex_image_arb_reply.3 \ +xcb_glx_get_compressed_tex_image_arb_unchecked.3 \ +xcb_glx_get_convolution_filter.3 \ +xcb_glx_get_convolution_filter_data.3 \ +xcb_glx_get_convolution_filter_data_end.3 \ +xcb_glx_get_convolution_filter_data_length.3 \ +xcb_glx_get_convolution_filter_reply.3 \ +xcb_glx_get_convolution_filter_unchecked.3 \ +xcb_glx_get_convolution_parameterfv.3 \ +xcb_glx_get_convolution_parameterfv_data.3 \ +xcb_glx_get_convolution_parameterfv_data_end.3 \ +xcb_glx_get_convolution_parameterfv_data_length.3 \ +xcb_glx_get_convolution_parameterfv_reply.3 \ +xcb_glx_get_convolution_parameterfv_unchecked.3 \ +xcb_glx_get_convolution_parameteriv.3 \ +xcb_glx_get_convolution_parameteriv_data.3 \ +xcb_glx_get_convolution_parameteriv_data_end.3 \ +xcb_glx_get_convolution_parameteriv_data_length.3 \ +xcb_glx_get_convolution_parameteriv_reply.3 \ +xcb_glx_get_convolution_parameteriv_unchecked.3 \ +xcb_glx_get_doublev.3 \ +xcb_glx_get_doublev_data.3 \ +xcb_glx_get_doublev_data_end.3 \ +xcb_glx_get_doublev_data_length.3 \ +xcb_glx_get_doublev_reply.3 \ +xcb_glx_get_doublev_unchecked.3 \ +xcb_glx_get_drawable_attributes.3 \ +xcb_glx_get_drawable_attributes_attribs.3 \ +xcb_glx_get_drawable_attributes_attribs_end.3 \ +xcb_glx_get_drawable_attributes_attribs_length.3 \ +xcb_glx_get_drawable_attributes_reply.3 \ +xcb_glx_get_drawable_attributes_unchecked.3 \ +xcb_glx_get_error.3 \ +xcb_glx_get_error_reply.3 \ +xcb_glx_get_error_unchecked.3 \ +xcb_glx_get_fb_configs.3 \ +xcb_glx_get_fb_configs_property_list.3 \ +xcb_glx_get_fb_configs_property_list_end.3 \ +xcb_glx_get_fb_configs_property_list_length.3 \ +xcb_glx_get_fb_configs_reply.3 \ +xcb_glx_get_fb_configs_unchecked.3 \ +xcb_glx_get_floatv.3 \ +xcb_glx_get_floatv_data.3 \ +xcb_glx_get_floatv_data_end.3 \ +xcb_glx_get_floatv_data_length.3 \ +xcb_glx_get_floatv_reply.3 \ +xcb_glx_get_floatv_unchecked.3 \ +xcb_glx_get_histogram.3 \ +xcb_glx_get_histogram_data.3 \ +xcb_glx_get_histogram_data_end.3 \ +xcb_glx_get_histogram_data_length.3 \ +xcb_glx_get_histogram_parameterfv.3 \ +xcb_glx_get_histogram_parameterfv_data.3 \ +xcb_glx_get_histogram_parameterfv_data_end.3 \ +xcb_glx_get_histogram_parameterfv_data_length.3 \ +xcb_glx_get_histogram_parameterfv_reply.3 \ +xcb_glx_get_histogram_parameterfv_unchecked.3 \ +xcb_glx_get_histogram_parameteriv.3 \ +xcb_glx_get_histogram_parameteriv_data.3 \ +xcb_glx_get_histogram_parameteriv_data_end.3 \ +xcb_glx_get_histogram_parameteriv_data_length.3 \ +xcb_glx_get_histogram_parameteriv_reply.3 \ +xcb_glx_get_histogram_parameteriv_unchecked.3 \ +xcb_glx_get_histogram_reply.3 \ +xcb_glx_get_histogram_unchecked.3 \ +xcb_glx_get_integerv.3 \ +xcb_glx_get_integerv_data.3 \ +xcb_glx_get_integerv_data_end.3 \ +xcb_glx_get_integerv_data_length.3 \ +xcb_glx_get_integerv_reply.3 \ +xcb_glx_get_integerv_unchecked.3 \ +xcb_glx_get_lightfv.3 \ +xcb_glx_get_lightfv_data.3 \ +xcb_glx_get_lightfv_data_end.3 \ +xcb_glx_get_lightfv_data_length.3 \ +xcb_glx_get_lightfv_reply.3 \ +xcb_glx_get_lightfv_unchecked.3 \ +xcb_glx_get_lightiv.3 \ +xcb_glx_get_lightiv_data.3 \ +xcb_glx_get_lightiv_data_end.3 \ +xcb_glx_get_lightiv_data_length.3 \ +xcb_glx_get_lightiv_reply.3 \ +xcb_glx_get_lightiv_unchecked.3 \ +xcb_glx_get_mapdv.3 \ +xcb_glx_get_mapdv_data.3 \ +xcb_glx_get_mapdv_data_end.3 \ +xcb_glx_get_mapdv_data_length.3 \ +xcb_glx_get_mapdv_reply.3 \ +xcb_glx_get_mapdv_unchecked.3 \ +xcb_glx_get_mapfv.3 \ +xcb_glx_get_mapfv_data.3 \ +xcb_glx_get_mapfv_data_end.3 \ +xcb_glx_get_mapfv_data_length.3 \ +xcb_glx_get_mapfv_reply.3 \ +xcb_glx_get_mapfv_unchecked.3 \ +xcb_glx_get_mapiv.3 \ +xcb_glx_get_mapiv_data.3 \ +xcb_glx_get_mapiv_data_end.3 \ +xcb_glx_get_mapiv_data_length.3 \ +xcb_glx_get_mapiv_reply.3 \ +xcb_glx_get_mapiv_unchecked.3 \ +xcb_glx_get_materialfv.3 \ +xcb_glx_get_materialfv_data.3 \ +xcb_glx_get_materialfv_data_end.3 \ +xcb_glx_get_materialfv_data_length.3 \ +xcb_glx_get_materialfv_reply.3 \ +xcb_glx_get_materialfv_unchecked.3 \ +xcb_glx_get_materialiv.3 \ +xcb_glx_get_materialiv_data.3 \ +xcb_glx_get_materialiv_data_end.3 \ +xcb_glx_get_materialiv_data_length.3 \ +xcb_glx_get_materialiv_reply.3 \ +xcb_glx_get_materialiv_unchecked.3 \ +xcb_glx_get_minmax.3 \ +xcb_glx_get_minmax_data.3 \ +xcb_glx_get_minmax_data_end.3 \ +xcb_glx_get_minmax_data_length.3 \ +xcb_glx_get_minmax_parameterfv.3 \ +xcb_glx_get_minmax_parameterfv_data.3 \ +xcb_glx_get_minmax_parameterfv_data_end.3 \ +xcb_glx_get_minmax_parameterfv_data_length.3 \ +xcb_glx_get_minmax_parameterfv_reply.3 \ +xcb_glx_get_minmax_parameterfv_unchecked.3 \ +xcb_glx_get_minmax_parameteriv.3 \ +xcb_glx_get_minmax_parameteriv_data.3 \ +xcb_glx_get_minmax_parameteriv_data_end.3 \ +xcb_glx_get_minmax_parameteriv_data_length.3 \ +xcb_glx_get_minmax_parameteriv_reply.3 \ +xcb_glx_get_minmax_parameteriv_unchecked.3 \ +xcb_glx_get_minmax_reply.3 \ +xcb_glx_get_minmax_unchecked.3 \ +xcb_glx_get_pixel_mapfv.3 \ +xcb_glx_get_pixel_mapfv_data.3 \ +xcb_glx_get_pixel_mapfv_data_end.3 \ +xcb_glx_get_pixel_mapfv_data_length.3 \ +xcb_glx_get_pixel_mapfv_reply.3 \ +xcb_glx_get_pixel_mapfv_unchecked.3 \ +xcb_glx_get_pixel_mapuiv.3 \ +xcb_glx_get_pixel_mapuiv_data.3 \ +xcb_glx_get_pixel_mapuiv_data_end.3 \ +xcb_glx_get_pixel_mapuiv_data_length.3 \ +xcb_glx_get_pixel_mapuiv_reply.3 \ +xcb_glx_get_pixel_mapuiv_unchecked.3 \ +xcb_glx_get_pixel_mapusv.3 \ +xcb_glx_get_pixel_mapusv_data.3 \ +xcb_glx_get_pixel_mapusv_data_end.3 \ +xcb_glx_get_pixel_mapusv_data_length.3 \ +xcb_glx_get_pixel_mapusv_reply.3 \ +xcb_glx_get_pixel_mapusv_unchecked.3 \ +xcb_glx_get_polygon_stipple.3 \ +xcb_glx_get_polygon_stipple_data.3 \ +xcb_glx_get_polygon_stipple_data_end.3 \ +xcb_glx_get_polygon_stipple_data_length.3 \ +xcb_glx_get_polygon_stipple_reply.3 \ +xcb_glx_get_polygon_stipple_unchecked.3 \ +xcb_glx_get_query_objectiv_arb.3 \ +xcb_glx_get_query_objectiv_arb_data.3 \ +xcb_glx_get_query_objectiv_arb_data_end.3 \ +xcb_glx_get_query_objectiv_arb_data_length.3 \ +xcb_glx_get_query_objectiv_arb_reply.3 \ +xcb_glx_get_query_objectiv_arb_unchecked.3 \ +xcb_glx_get_query_objectuiv_arb.3 \ +xcb_glx_get_query_objectuiv_arb_data.3 \ +xcb_glx_get_query_objectuiv_arb_data_end.3 \ +xcb_glx_get_query_objectuiv_arb_data_length.3 \ +xcb_glx_get_query_objectuiv_arb_reply.3 \ +xcb_glx_get_query_objectuiv_arb_unchecked.3 \ +xcb_glx_get_queryiv_arb.3 \ +xcb_glx_get_queryiv_arb_data.3 \ +xcb_glx_get_queryiv_arb_data_end.3 \ +xcb_glx_get_queryiv_arb_data_length.3 \ +xcb_glx_get_queryiv_arb_reply.3 \ +xcb_glx_get_queryiv_arb_unchecked.3 \ +xcb_glx_get_separable_filter.3 \ +xcb_glx_get_separable_filter_reply.3 \ +xcb_glx_get_separable_filter_rows_and_cols.3 \ +xcb_glx_get_separable_filter_rows_and_cols_end.3 \ +xcb_glx_get_separable_filter_rows_and_cols_length.3 \ +xcb_glx_get_separable_filter_unchecked.3 \ +xcb_glx_get_string.3 \ +xcb_glx_get_string_reply.3 \ +xcb_glx_get_string_string.3 \ +xcb_glx_get_string_string_end.3 \ +xcb_glx_get_string_string_length.3 \ +xcb_glx_get_string_unchecked.3 \ +xcb_glx_get_tex_envfv.3 \ +xcb_glx_get_tex_envfv_data.3 \ +xcb_glx_get_tex_envfv_data_end.3 \ +xcb_glx_get_tex_envfv_data_length.3 \ +xcb_glx_get_tex_envfv_reply.3 \ +xcb_glx_get_tex_envfv_unchecked.3 \ +xcb_glx_get_tex_enviv.3 \ +xcb_glx_get_tex_enviv_data.3 \ +xcb_glx_get_tex_enviv_data_end.3 \ +xcb_glx_get_tex_enviv_data_length.3 \ +xcb_glx_get_tex_enviv_reply.3 \ +xcb_glx_get_tex_enviv_unchecked.3 \ +xcb_glx_get_tex_gendv.3 \ +xcb_glx_get_tex_gendv_data.3 \ +xcb_glx_get_tex_gendv_data_end.3 \ +xcb_glx_get_tex_gendv_data_length.3 \ +xcb_glx_get_tex_gendv_reply.3 \ +xcb_glx_get_tex_gendv_unchecked.3 \ +xcb_glx_get_tex_genfv.3 \ +xcb_glx_get_tex_genfv_data.3 \ +xcb_glx_get_tex_genfv_data_end.3 \ +xcb_glx_get_tex_genfv_data_length.3 \ +xcb_glx_get_tex_genfv_reply.3 \ +xcb_glx_get_tex_genfv_unchecked.3 \ +xcb_glx_get_tex_geniv.3 \ +xcb_glx_get_tex_geniv_data.3 \ +xcb_glx_get_tex_geniv_data_end.3 \ +xcb_glx_get_tex_geniv_data_length.3 \ +xcb_glx_get_tex_geniv_reply.3 \ +xcb_glx_get_tex_geniv_unchecked.3 \ +xcb_glx_get_tex_image.3 \ +xcb_glx_get_tex_image_data.3 \ +xcb_glx_get_tex_image_data_end.3 \ +xcb_glx_get_tex_image_data_length.3 \ +xcb_glx_get_tex_image_reply.3 \ +xcb_glx_get_tex_image_unchecked.3 \ +xcb_glx_get_tex_level_parameterfv.3 \ +xcb_glx_get_tex_level_parameterfv_data.3 \ +xcb_glx_get_tex_level_parameterfv_data_end.3 \ +xcb_glx_get_tex_level_parameterfv_data_length.3 \ +xcb_glx_get_tex_level_parameterfv_reply.3 \ +xcb_glx_get_tex_level_parameterfv_unchecked.3 \ +xcb_glx_get_tex_level_parameteriv.3 \ +xcb_glx_get_tex_level_parameteriv_data.3 \ +xcb_glx_get_tex_level_parameteriv_data_end.3 \ +xcb_glx_get_tex_level_parameteriv_data_length.3 \ +xcb_glx_get_tex_level_parameteriv_reply.3 \ +xcb_glx_get_tex_level_parameteriv_unchecked.3 \ +xcb_glx_get_tex_parameterfv.3 \ +xcb_glx_get_tex_parameterfv_data.3 \ +xcb_glx_get_tex_parameterfv_data_end.3 \ +xcb_glx_get_tex_parameterfv_data_length.3 \ +xcb_glx_get_tex_parameterfv_reply.3 \ +xcb_glx_get_tex_parameterfv_unchecked.3 \ +xcb_glx_get_tex_parameteriv.3 \ +xcb_glx_get_tex_parameteriv_data.3 \ +xcb_glx_get_tex_parameteriv_data_end.3 \ +xcb_glx_get_tex_parameteriv_data_length.3 \ +xcb_glx_get_tex_parameteriv_reply.3 \ +xcb_glx_get_tex_parameteriv_unchecked.3 \ +xcb_glx_get_visual_configs.3 \ +xcb_glx_get_visual_configs_property_list.3 \ +xcb_glx_get_visual_configs_property_list_end.3 \ +xcb_glx_get_visual_configs_property_list_length.3 \ +xcb_glx_get_visual_configs_reply.3 \ +xcb_glx_get_visual_configs_unchecked.3 \ +xcb_glx_is_direct.3 \ +xcb_glx_is_direct_reply.3 \ +xcb_glx_is_direct_unchecked.3 \ +xcb_glx_is_list.3 \ +xcb_glx_is_list_reply.3 \ +xcb_glx_is_list_unchecked.3 \ +xcb_glx_is_query_arb.3 \ +xcb_glx_is_query_arb_reply.3 \ +xcb_glx_is_query_arb_unchecked.3 \ +xcb_glx_is_texture.3 \ +xcb_glx_is_texture_reply.3 \ +xcb_glx_is_texture_unchecked.3 \ +xcb_glx_make_context_current.3 \ +xcb_glx_make_context_current_reply.3 \ +xcb_glx_make_context_current_unchecked.3 \ +xcb_glx_make_current.3 \ +xcb_glx_make_current_reply.3 \ +xcb_glx_make_current_unchecked.3 \ +xcb_glx_new_list.3 \ +xcb_glx_new_list_checked.3 \ +xcb_glx_pbuffer_clobber_event_t.3 \ +xcb_glx_pixel_storef.3 \ +xcb_glx_pixel_storef_checked.3 \ +xcb_glx_pixel_storei.3 \ +xcb_glx_pixel_storei_checked.3 \ +xcb_glx_query_context.3 \ +xcb_glx_query_context_attribs.3 \ +xcb_glx_query_context_attribs_end.3 \ +xcb_glx_query_context_attribs_length.3 \ +xcb_glx_query_context_reply.3 \ +xcb_glx_query_context_unchecked.3 \ +xcb_glx_query_extensions_string.3 \ +xcb_glx_query_extensions_string_reply.3 \ +xcb_glx_query_extensions_string_unchecked.3 \ +xcb_glx_query_server_string.3 \ +xcb_glx_query_server_string_reply.3 \ +xcb_glx_query_server_string_string.3 \ +xcb_glx_query_server_string_string_end.3 \ +xcb_glx_query_server_string_string_length.3 \ +xcb_glx_query_server_string_unchecked.3 \ +xcb_glx_query_version.3 \ +xcb_glx_query_version_reply.3 \ +xcb_glx_query_version_unchecked.3 \ +xcb_glx_read_pixels.3 \ +xcb_glx_read_pixels_data.3 \ +xcb_glx_read_pixels_data_end.3 \ +xcb_glx_read_pixels_data_length.3 \ +xcb_glx_read_pixels_reply.3 \ +xcb_glx_read_pixels_unchecked.3 \ +xcb_glx_render.3 \ +xcb_glx_render_checked.3 \ +xcb_glx_render_large.3 \ +xcb_glx_render_large_checked.3 \ +xcb_glx_render_mode.3 \ +xcb_glx_render_mode_data.3 \ +xcb_glx_render_mode_data_end.3 \ +xcb_glx_render_mode_data_length.3 \ +xcb_glx_render_mode_reply.3 \ +xcb_glx_render_mode_unchecked.3 \ +xcb_glx_select_buffer.3 \ +xcb_glx_select_buffer_checked.3 \ +xcb_glx_set_client_info_2arb.3 \ +xcb_glx_set_client_info_2arb_checked.3 \ +xcb_glx_set_client_info_arb.3 \ +xcb_glx_set_client_info_arb_checked.3 \ +xcb_glx_swap_buffers.3 \ +xcb_glx_swap_buffers_checked.3 \ +xcb_glx_use_x_font.3 \ +xcb_glx_use_x_font_checked.3 \ +xcb_glx_vendor_private.3 \ +xcb_glx_vendor_private_checked.3 \ +xcb_glx_vendor_private_with_reply.3 \ +xcb_glx_vendor_private_with_reply_data_2.3 \ +xcb_glx_vendor_private_with_reply_data_2_end.3 \ +xcb_glx_vendor_private_with_reply_data_2_length.3 \ +xcb_glx_vendor_private_with_reply_reply.3 \ +xcb_glx_vendor_private_with_reply_unchecked.3 \ +xcb_glx_wait_gl.3 \ +xcb_glx_wait_gl_checked.3 \ +xcb_glx_wait_x.3 \ +xcb_glx_wait_x_checked.3 \ +xcb_grab_button.3 \ +xcb_grab_button_checked.3 \ +xcb_grab_key.3 \ +xcb_grab_key_checked.3 \ +xcb_grab_keyboard.3 \ +xcb_grab_keyboard_reply.3 \ +xcb_grab_keyboard_unchecked.3 \ +xcb_grab_pointer.3 \ +xcb_grab_pointer_reply.3 \ +xcb_grab_pointer_unchecked.3 \ +xcb_grab_server.3 \ +xcb_grab_server_checked.3 \ +xcb_graphics_exposure_event_t.3 \ +xcb_gravity_notify_event_t.3 \ +xcb_image_text_16.3 \ +xcb_image_text_16_checked.3 \ +xcb_image_text_8.3 \ +xcb_image_text_8_checked.3 \ +xcb_input_allow_device_events.3 \ +xcb_input_allow_device_events_checked.3 \ +xcb_input_change_device_dont_propagate_list.3 \ +xcb_input_change_device_dont_propagate_list_checked.3 \ +xcb_input_change_device_key_mapping.3 \ +xcb_input_change_device_key_mapping_checked.3 \ +xcb_input_change_device_notify_event_t.3 \ +xcb_input_change_keyboard_device.3 \ +xcb_input_change_keyboard_device_reply.3 \ +xcb_input_change_keyboard_device_unchecked.3 \ +xcb_input_change_pointer_device.3 \ +xcb_input_change_pointer_device_reply.3 \ +xcb_input_change_pointer_device_unchecked.3 \ +xcb_input_close_device.3 \ +xcb_input_close_device_checked.3 \ +xcb_input_device_bell.3 \ +xcb_input_device_bell_checked.3 \ +xcb_input_device_button_press_event_t.3 \ +xcb_input_device_button_release_event_t.3 \ +xcb_input_device_button_state_notify_event_t.3 \ +xcb_input_device_key_press_event_t.3 \ +xcb_input_device_key_release_event_t.3 \ +xcb_input_device_key_state_notify_event_t.3 \ +xcb_input_device_mapping_notify_event_t.3 \ +xcb_input_device_motion_notify_event_t.3 \ +xcb_input_device_presence_notify_event_t.3 \ +xcb_input_device_state_notify_event_t.3 \ +xcb_input_device_valuator_event_t.3 \ +xcb_input_focus_in_event_t.3 \ +xcb_input_focus_out_event_t.3 \ +xcb_input_get_device_button_mapping.3 \ +xcb_input_get_device_button_mapping_map.3 \ +xcb_input_get_device_button_mapping_map_end.3 \ +xcb_input_get_device_button_mapping_map_length.3 \ +xcb_input_get_device_button_mapping_reply.3 \ +xcb_input_get_device_button_mapping_unchecked.3 \ +xcb_input_get_device_control.3 \ +xcb_input_get_device_control_reply.3 \ +xcb_input_get_device_control_unchecked.3 \ +xcb_input_get_device_dont_propagate_list.3 \ +xcb_input_get_device_dont_propagate_list_classes.3 \ +xcb_input_get_device_dont_propagate_list_classes_end.3 \ +xcb_input_get_device_dont_propagate_list_classes_length.3 \ +xcb_input_get_device_dont_propagate_list_reply.3 \ +xcb_input_get_device_dont_propagate_list_unchecked.3 \ +xcb_input_get_device_focus.3 \ +xcb_input_get_device_focus_reply.3 \ +xcb_input_get_device_focus_unchecked.3 \ +xcb_input_get_device_key_mapping.3 \ +xcb_input_get_device_key_mapping_keysyms.3 \ +xcb_input_get_device_key_mapping_keysyms_end.3 \ +xcb_input_get_device_key_mapping_keysyms_length.3 \ +xcb_input_get_device_key_mapping_reply.3 \ +xcb_input_get_device_key_mapping_unchecked.3 \ +xcb_input_get_device_modifier_mapping.3 \ +xcb_input_get_device_modifier_mapping_keymaps.3 \ +xcb_input_get_device_modifier_mapping_keymaps_end.3 \ +xcb_input_get_device_modifier_mapping_keymaps_length.3 \ +xcb_input_get_device_modifier_mapping_reply.3 \ +xcb_input_get_device_modifier_mapping_unchecked.3 \ +xcb_input_get_device_motion_events.3 \ +xcb_input_get_device_motion_events_reply.3 \ +xcb_input_get_device_motion_events_unchecked.3 \ +xcb_input_get_extension_version.3 \ +xcb_input_get_extension_version_reply.3 \ +xcb_input_get_extension_version_unchecked.3 \ +xcb_input_get_feedback_control.3 \ +xcb_input_get_feedback_control_reply.3 \ +xcb_input_get_feedback_control_unchecked.3 \ +xcb_input_get_selected_extension_events.3 \ +xcb_input_get_selected_extension_events_all_classes.3 \ +xcb_input_get_selected_extension_events_all_classes_end.3 \ +xcb_input_get_selected_extension_events_all_classes_length.3 \ +xcb_input_get_selected_extension_events_reply.3 \ +xcb_input_get_selected_extension_events_this_classes.3 \ +xcb_input_get_selected_extension_events_this_classes_end.3 \ +xcb_input_get_selected_extension_events_this_classes_length.3 \ +xcb_input_get_selected_extension_events_unchecked.3 \ +xcb_input_grab_device.3 \ +xcb_input_grab_device_button.3 \ +xcb_input_grab_device_button_checked.3 \ +xcb_input_grab_device_key.3 \ +xcb_input_grab_device_key_checked.3 \ +xcb_input_grab_device_reply.3 \ +xcb_input_grab_device_unchecked.3 \ +xcb_input_list_input_devices.3 \ +xcb_input_list_input_devices_devices.3 \ +xcb_input_list_input_devices_devices_iterator.3 \ +xcb_input_list_input_devices_devices_length.3 \ +xcb_input_list_input_devices_reply.3 \ +xcb_input_list_input_devices_unchecked.3 \ +xcb_input_open_device.3 \ +xcb_input_open_device_class_info.3 \ +xcb_input_open_device_class_info_iterator.3 \ +xcb_input_open_device_class_info_length.3 \ +xcb_input_open_device_reply.3 \ +xcb_input_open_device_unchecked.3 \ +xcb_input_proximity_in_event_t.3 \ +xcb_input_proximity_out_event_t.3 \ +xcb_input_query_device_state.3 \ +xcb_input_query_device_state_reply.3 \ +xcb_input_query_device_state_unchecked.3 \ +xcb_input_select_extension_event.3 \ +xcb_input_select_extension_event_checked.3 \ +xcb_input_send_extension_event.3 \ +xcb_input_send_extension_event_checked.3 \ +xcb_input_set_device_button_mapping.3 \ +xcb_input_set_device_button_mapping_reply.3 \ +xcb_input_set_device_button_mapping_unchecked.3 \ +xcb_input_set_device_focus.3 \ +xcb_input_set_device_focus_checked.3 \ +xcb_input_set_device_mode.3 \ +xcb_input_set_device_mode_reply.3 \ +xcb_input_set_device_mode_unchecked.3 \ +xcb_input_set_device_modifier_mapping.3 \ +xcb_input_set_device_modifier_mapping_reply.3 \ +xcb_input_set_device_modifier_mapping_unchecked.3 \ +xcb_input_set_device_valuators.3 \ +xcb_input_set_device_valuators_reply.3 \ +xcb_input_set_device_valuators_unchecked.3 \ +xcb_input_ungrab_device.3 \ +xcb_input_ungrab_device_button.3 \ +xcb_input_ungrab_device_button_checked.3 \ +xcb_input_ungrab_device_checked.3 \ +xcb_input_ungrab_device_key.3 \ +xcb_input_ungrab_device_key_checked.3 \ +xcb_install_colormap.3 \ +xcb_install_colormap_checked.3 \ +xcb_intern_atom.3 \ +xcb_intern_atom_reply.3 \ +xcb_intern_atom_unchecked.3 \ +xcb_key_press_event_t.3 \ +xcb_key_release_event_t.3 \ +xcb_keymap_notify_event_t.3 \ +xcb_kill_client.3 \ +xcb_kill_client_checked.3 \ +xcb_leave_notify_event_t.3 \ +xcb_list_extensions.3 \ +xcb_list_extensions_names_iterator.3 \ +xcb_list_extensions_names_length.3 \ +xcb_list_extensions_reply.3 \ +xcb_list_extensions_unchecked.3 \ +xcb_list_fonts.3 \ +xcb_list_fonts_names_iterator.3 \ +xcb_list_fonts_names_length.3 \ +xcb_list_fonts_reply.3 \ +xcb_list_fonts_unchecked.3 \ +xcb_list_fonts_with_info.3 \ +xcb_list_fonts_with_info_name.3 \ +xcb_list_fonts_with_info_name_end.3 \ +xcb_list_fonts_with_info_name_length.3 \ +xcb_list_fonts_with_info_properties.3 \ +xcb_list_fonts_with_info_properties_iterator.3 \ +xcb_list_fonts_with_info_properties_length.3 \ +xcb_list_fonts_with_info_reply.3 \ +xcb_list_fonts_with_info_unchecked.3 \ +xcb_list_hosts.3 \ +xcb_list_hosts_hosts_iterator.3 \ +xcb_list_hosts_hosts_length.3 \ +xcb_list_hosts_reply.3 \ +xcb_list_hosts_unchecked.3 \ +xcb_list_installed_colormaps.3 \ +xcb_list_installed_colormaps_cmaps.3 \ +xcb_list_installed_colormaps_cmaps_end.3 \ +xcb_list_installed_colormaps_cmaps_length.3 \ +xcb_list_installed_colormaps_reply.3 \ +xcb_list_installed_colormaps_unchecked.3 \ +xcb_list_properties.3 \ +xcb_list_properties_atoms.3 \ +xcb_list_properties_atoms_end.3 \ +xcb_list_properties_atoms_length.3 \ +xcb_list_properties_reply.3 \ +xcb_list_properties_unchecked.3 \ +xcb_lookup_color.3 \ +xcb_lookup_color_reply.3 \ +xcb_lookup_color_unchecked.3 \ +xcb_map_notify_event_t.3 \ +xcb_map_request_event_t.3 \ +xcb_map_subwindows.3 \ +xcb_map_subwindows_checked.3 \ +xcb_map_window.3 \ +xcb_map_window_checked.3 \ +xcb_mapping_notify_event_t.3 \ +xcb_motion_notify_event_t.3 \ +xcb_no_exposure_event_t.3 \ +xcb_no_operation.3 \ +xcb_no_operation_checked.3 \ +xcb_open_font.3 \ +xcb_open_font_checked.3 \ +xcb_poly_arc.3 \ +xcb_poly_arc_checked.3 \ +xcb_poly_fill_arc.3 \ +xcb_poly_fill_arc_checked.3 \ +xcb_poly_fill_rectangle.3 \ +xcb_poly_fill_rectangle_checked.3 \ +xcb_poly_line.3 \ +xcb_poly_line_checked.3 \ +xcb_poly_point.3 \ +xcb_poly_point_checked.3 \ +xcb_poly_rectangle.3 \ +xcb_poly_rectangle_checked.3 \ +xcb_poly_segment.3 \ +xcb_poly_segment_checked.3 \ +xcb_poly_text_16.3 \ +xcb_poly_text_16_checked.3 \ +xcb_poly_text_8.3 \ +xcb_poly_text_8_checked.3 \ +xcb_property_notify_event_t.3 \ +xcb_put_image.3 \ +xcb_put_image_checked.3 \ +xcb_query_best_size.3 \ +xcb_query_best_size_reply.3 \ +xcb_query_best_size_unchecked.3 \ +xcb_query_colors.3 \ +xcb_query_colors_colors.3 \ +xcb_query_colors_colors_iterator.3 \ +xcb_query_colors_colors_length.3 \ +xcb_query_colors_reply.3 \ +xcb_query_colors_unchecked.3 \ +xcb_query_extension.3 \ +xcb_query_extension_reply.3 \ +xcb_query_extension_unchecked.3 \ +xcb_query_font.3 \ +xcb_query_font_char_infos.3 \ +xcb_query_font_char_infos_iterator.3 \ +xcb_query_font_char_infos_length.3 \ +xcb_query_font_properties.3 \ +xcb_query_font_properties_iterator.3 \ +xcb_query_font_properties_length.3 \ +xcb_query_font_reply.3 \ +xcb_query_font_unchecked.3 \ +xcb_query_keymap.3 \ +xcb_query_keymap_reply.3 \ +xcb_query_keymap_unchecked.3 \ +xcb_query_pointer.3 \ +xcb_query_pointer_reply.3 \ +xcb_query_pointer_unchecked.3 \ +xcb_query_text_extents.3 \ +xcb_query_text_extents_reply.3 \ +xcb_query_text_extents_unchecked.3 \ +xcb_query_tree.3 \ +xcb_query_tree_children.3 \ +xcb_query_tree_children_end.3 \ +xcb_query_tree_children_length.3 \ +xcb_query_tree_reply.3 \ +xcb_query_tree_unchecked.3 \ +xcb_randr_add_output_mode.3 \ +xcb_randr_add_output_mode_checked.3 \ +xcb_randr_change_output_property.3 \ +xcb_randr_change_output_property_checked.3 \ +xcb_randr_configure_output_property.3 \ +xcb_randr_configure_output_property_checked.3 \ +xcb_randr_create_mode.3 \ +xcb_randr_create_mode_reply.3 \ +xcb_randr_create_mode_unchecked.3 \ +xcb_randr_delete_output_mode.3 \ +xcb_randr_delete_output_mode_checked.3 \ +xcb_randr_delete_output_property.3 \ +xcb_randr_delete_output_property_checked.3 \ +xcb_randr_destroy_mode.3 \ +xcb_randr_destroy_mode_checked.3 \ +xcb_randr_get_crtc_gamma.3 \ +xcb_randr_get_crtc_gamma_blue.3 \ +xcb_randr_get_crtc_gamma_blue_end.3 \ +xcb_randr_get_crtc_gamma_blue_length.3 \ +xcb_randr_get_crtc_gamma_green.3 \ +xcb_randr_get_crtc_gamma_green_end.3 \ +xcb_randr_get_crtc_gamma_green_length.3 \ +xcb_randr_get_crtc_gamma_red.3 \ +xcb_randr_get_crtc_gamma_red_end.3 \ +xcb_randr_get_crtc_gamma_red_length.3 \ +xcb_randr_get_crtc_gamma_reply.3 \ +xcb_randr_get_crtc_gamma_size.3 \ +xcb_randr_get_crtc_gamma_size_reply.3 \ +xcb_randr_get_crtc_gamma_size_unchecked.3 \ +xcb_randr_get_crtc_gamma_unchecked.3 \ +xcb_randr_get_crtc_info.3 \ +xcb_randr_get_crtc_info_outputs.3 \ +xcb_randr_get_crtc_info_outputs_end.3 \ +xcb_randr_get_crtc_info_outputs_length.3 \ +xcb_randr_get_crtc_info_possible.3 \ +xcb_randr_get_crtc_info_possible_end.3 \ +xcb_randr_get_crtc_info_possible_length.3 \ +xcb_randr_get_crtc_info_reply.3 \ +xcb_randr_get_crtc_info_unchecked.3 \ +xcb_randr_get_crtc_transform.3 \ +xcb_randr_get_crtc_transform_current_filter_name.3 \ +xcb_randr_get_crtc_transform_current_filter_name_end.3 \ +xcb_randr_get_crtc_transform_current_filter_name_length.3 \ +xcb_randr_get_crtc_transform_current_params.3 \ +xcb_randr_get_crtc_transform_current_params_end.3 \ +xcb_randr_get_crtc_transform_current_params_length.3 \ +xcb_randr_get_crtc_transform_pending_filter_name.3 \ +xcb_randr_get_crtc_transform_pending_filter_name_end.3 \ +xcb_randr_get_crtc_transform_pending_filter_name_length.3 \ +xcb_randr_get_crtc_transform_pending_params.3 \ +xcb_randr_get_crtc_transform_pending_params_end.3 \ +xcb_randr_get_crtc_transform_pending_params_length.3 \ +xcb_randr_get_crtc_transform_reply.3 \ +xcb_randr_get_crtc_transform_unchecked.3 \ +xcb_randr_get_output_info.3 \ +xcb_randr_get_output_info_clones.3 \ +xcb_randr_get_output_info_clones_end.3 \ +xcb_randr_get_output_info_clones_length.3 \ +xcb_randr_get_output_info_crtcs.3 \ +xcb_randr_get_output_info_crtcs_end.3 \ +xcb_randr_get_output_info_crtcs_length.3 \ +xcb_randr_get_output_info_modes.3 \ +xcb_randr_get_output_info_modes_end.3 \ +xcb_randr_get_output_info_modes_length.3 \ +xcb_randr_get_output_info_name.3 \ +xcb_randr_get_output_info_name_end.3 \ +xcb_randr_get_output_info_name_length.3 \ +xcb_randr_get_output_info_reply.3 \ +xcb_randr_get_output_info_unchecked.3 \ +xcb_randr_get_output_primary.3 \ +xcb_randr_get_output_primary_reply.3 \ +xcb_randr_get_output_primary_unchecked.3 \ +xcb_randr_get_output_property.3 \ +xcb_randr_get_output_property_data.3 \ +xcb_randr_get_output_property_data_end.3 \ +xcb_randr_get_output_property_data_length.3 \ +xcb_randr_get_output_property_reply.3 \ +xcb_randr_get_output_property_unchecked.3 \ +xcb_randr_get_panning.3 \ +xcb_randr_get_panning_reply.3 \ +xcb_randr_get_panning_unchecked.3 \ +xcb_randr_get_screen_info.3 \ +xcb_randr_get_screen_info_rates_iterator.3 \ +xcb_randr_get_screen_info_rates_length.3 \ +xcb_randr_get_screen_info_reply.3 \ +xcb_randr_get_screen_info_sizes.3 \ +xcb_randr_get_screen_info_sizes_iterator.3 \ +xcb_randr_get_screen_info_sizes_length.3 \ +xcb_randr_get_screen_info_unchecked.3 \ +xcb_randr_get_screen_resources.3 \ +xcb_randr_get_screen_resources_crtcs.3 \ +xcb_randr_get_screen_resources_crtcs_end.3 \ +xcb_randr_get_screen_resources_crtcs_length.3 \ +xcb_randr_get_screen_resources_current.3 \ +xcb_randr_get_screen_resources_current_crtcs.3 \ +xcb_randr_get_screen_resources_current_crtcs_end.3 \ +xcb_randr_get_screen_resources_current_crtcs_length.3 \ +xcb_randr_get_screen_resources_current_modes.3 \ +xcb_randr_get_screen_resources_current_modes_iterator.3 \ +xcb_randr_get_screen_resources_current_modes_length.3 \ +xcb_randr_get_screen_resources_current_names.3 \ +xcb_randr_get_screen_resources_current_names_end.3 \ +xcb_randr_get_screen_resources_current_names_length.3 \ +xcb_randr_get_screen_resources_current_outputs.3 \ +xcb_randr_get_screen_resources_current_outputs_end.3 \ +xcb_randr_get_screen_resources_current_outputs_length.3 \ +xcb_randr_get_screen_resources_current_reply.3 \ +xcb_randr_get_screen_resources_current_unchecked.3 \ +xcb_randr_get_screen_resources_modes.3 \ +xcb_randr_get_screen_resources_modes_iterator.3 \ +xcb_randr_get_screen_resources_modes_length.3 \ +xcb_randr_get_screen_resources_names.3 \ +xcb_randr_get_screen_resources_names_end.3 \ +xcb_randr_get_screen_resources_names_length.3 \ +xcb_randr_get_screen_resources_outputs.3 \ +xcb_randr_get_screen_resources_outputs_end.3 \ +xcb_randr_get_screen_resources_outputs_length.3 \ +xcb_randr_get_screen_resources_reply.3 \ +xcb_randr_get_screen_resources_unchecked.3 \ +xcb_randr_get_screen_size_range.3 \ +xcb_randr_get_screen_size_range_reply.3 \ +xcb_randr_get_screen_size_range_unchecked.3 \ +xcb_randr_list_output_properties.3 \ +xcb_randr_list_output_properties_atoms.3 \ +xcb_randr_list_output_properties_atoms_end.3 \ +xcb_randr_list_output_properties_atoms_length.3 \ +xcb_randr_list_output_properties_reply.3 \ +xcb_randr_list_output_properties_unchecked.3 \ +xcb_randr_notify_event_t.3 \ +xcb_randr_query_output_property.3 \ +xcb_randr_query_output_property_reply.3 \ +xcb_randr_query_output_property_unchecked.3 \ +xcb_randr_query_output_property_valid_values.3 \ +xcb_randr_query_output_property_valid_values_end.3 \ +xcb_randr_query_output_property_valid_values_length.3 \ +xcb_randr_query_version.3 \ +xcb_randr_query_version_reply.3 \ +xcb_randr_query_version_unchecked.3 \ +xcb_randr_screen_change_notify_event_t.3 \ +xcb_randr_select_input.3 \ +xcb_randr_select_input_checked.3 \ +xcb_randr_set_crtc_config.3 \ +xcb_randr_set_crtc_config_reply.3 \ +xcb_randr_set_crtc_config_unchecked.3 \ +xcb_randr_set_crtc_gamma.3 \ +xcb_randr_set_crtc_gamma_checked.3 \ +xcb_randr_set_crtc_transform.3 \ +xcb_randr_set_crtc_transform_checked.3 \ +xcb_randr_set_output_primary.3 \ +xcb_randr_set_output_primary_checked.3 \ +xcb_randr_set_panning.3 \ +xcb_randr_set_panning_reply.3 \ +xcb_randr_set_panning_unchecked.3 \ +xcb_randr_set_screen_config.3 \ +xcb_randr_set_screen_config_reply.3 \ +xcb_randr_set_screen_config_unchecked.3 \ +xcb_randr_set_screen_size.3 \ +xcb_randr_set_screen_size_checked.3 \ +xcb_recolor_cursor.3 \ +xcb_recolor_cursor_checked.3 \ +xcb_record_create_context.3 \ +xcb_record_create_context_checked.3 \ +xcb_record_disable_context.3 \ +xcb_record_disable_context_checked.3 \ +xcb_record_enable_context.3 \ +xcb_record_enable_context_data.3 \ +xcb_record_enable_context_data_end.3 \ +xcb_record_enable_context_data_length.3 \ +xcb_record_enable_context_reply.3 \ +xcb_record_enable_context_unchecked.3 \ +xcb_record_free_context.3 \ +xcb_record_free_context_checked.3 \ +xcb_record_get_context.3 \ +xcb_record_get_context_intercepted_clients_iterator.3 \ +xcb_record_get_context_intercepted_clients_length.3 \ +xcb_record_get_context_reply.3 \ +xcb_record_get_context_unchecked.3 \ +xcb_record_query_version.3 \ +xcb_record_query_version_reply.3 \ +xcb_record_query_version_unchecked.3 \ +xcb_record_register_clients.3 \ +xcb_record_register_clients_checked.3 \ +xcb_record_unregister_clients.3 \ +xcb_record_unregister_clients_checked.3 \ +xcb_render_add_glyphs.3 \ +xcb_render_add_glyphs_checked.3 \ +xcb_render_add_traps.3 \ +xcb_render_add_traps_checked.3 \ +xcb_render_change_picture.3 \ +xcb_render_change_picture_checked.3 \ +xcb_render_composite.3 \ +xcb_render_composite_checked.3 \ +xcb_render_composite_glyphs_16.3 \ +xcb_render_composite_glyphs_16_checked.3 \ +xcb_render_composite_glyphs_32.3 \ +xcb_render_composite_glyphs_32_checked.3 \ +xcb_render_composite_glyphs_8.3 \ +xcb_render_composite_glyphs_8_checked.3 \ +xcb_render_create_anim_cursor.3 \ +xcb_render_create_anim_cursor_checked.3 \ +xcb_render_create_conical_gradient.3 \ +xcb_render_create_conical_gradient_checked.3 \ +xcb_render_create_cursor.3 \ +xcb_render_create_cursor_checked.3 \ +xcb_render_create_glyph_set.3 \ +xcb_render_create_glyph_set_checked.3 \ +xcb_render_create_linear_gradient.3 \ +xcb_render_create_linear_gradient_checked.3 \ +xcb_render_create_picture.3 \ +xcb_render_create_picture_checked.3 \ +xcb_render_create_radial_gradient.3 \ +xcb_render_create_radial_gradient_checked.3 \ +xcb_render_create_solid_fill.3 \ +xcb_render_create_solid_fill_checked.3 \ +xcb_render_fill_rectangles.3 \ +xcb_render_fill_rectangles_checked.3 \ +xcb_render_free_glyph_set.3 \ +xcb_render_free_glyph_set_checked.3 \ +xcb_render_free_glyphs.3 \ +xcb_render_free_glyphs_checked.3 \ +xcb_render_free_picture.3 \ +xcb_render_free_picture_checked.3 \ +xcb_render_query_filters.3 \ +xcb_render_query_filters_aliases.3 \ +xcb_render_query_filters_aliases_end.3 \ +xcb_render_query_filters_aliases_length.3 \ +xcb_render_query_filters_filters_iterator.3 \ +xcb_render_query_filters_filters_length.3 \ +xcb_render_query_filters_reply.3 \ +xcb_render_query_filters_unchecked.3 \ +xcb_render_query_pict_formats.3 \ +xcb_render_query_pict_formats_formats.3 \ +xcb_render_query_pict_formats_formats_iterator.3 \ +xcb_render_query_pict_formats_formats_length.3 \ +xcb_render_query_pict_formats_reply.3 \ +xcb_render_query_pict_formats_screens_iterator.3 \ +xcb_render_query_pict_formats_screens_length.3 \ +xcb_render_query_pict_formats_subpixels.3 \ +xcb_render_query_pict_formats_subpixels_end.3 \ +xcb_render_query_pict_formats_subpixels_length.3 \ +xcb_render_query_pict_formats_unchecked.3 \ +xcb_render_query_pict_index_values.3 \ +xcb_render_query_pict_index_values_reply.3 \ +xcb_render_query_pict_index_values_unchecked.3 \ +xcb_render_query_pict_index_values_values.3 \ +xcb_render_query_pict_index_values_values_iterator.3 \ +xcb_render_query_pict_index_values_values_length.3 \ +xcb_render_query_version.3 \ +xcb_render_query_version_reply.3 \ +xcb_render_query_version_unchecked.3 \ +xcb_render_reference_glyph_set.3 \ +xcb_render_reference_glyph_set_checked.3 \ +xcb_render_set_picture_clip_rectangles.3 \ +xcb_render_set_picture_clip_rectangles_checked.3 \ +xcb_render_set_picture_filter.3 \ +xcb_render_set_picture_filter_checked.3 \ +xcb_render_set_picture_transform.3 \ +xcb_render_set_picture_transform_checked.3 \ +xcb_render_trapezoids.3 \ +xcb_render_trapezoids_checked.3 \ +xcb_render_tri_fan.3 \ +xcb_render_tri_fan_checked.3 \ +xcb_render_tri_strip.3 \ +xcb_render_tri_strip_checked.3 \ +xcb_render_triangles.3 \ +xcb_render_triangles_checked.3 \ +xcb_reparent_notify_event_t.3 \ +xcb_reparent_window.3 \ +xcb_reparent_window_checked.3 \ +xcb_res_query_client_pixmap_bytes.3 \ +xcb_res_query_client_pixmap_bytes_reply.3 \ +xcb_res_query_client_pixmap_bytes_unchecked.3 \ +xcb_res_query_client_resources.3 \ +xcb_res_query_client_resources_reply.3 \ +xcb_res_query_client_resources_types.3 \ +xcb_res_query_client_resources_types_iterator.3 \ +xcb_res_query_client_resources_types_length.3 \ +xcb_res_query_client_resources_unchecked.3 \ +xcb_res_query_clients.3 \ +xcb_res_query_clients_clients.3 \ +xcb_res_query_clients_clients_iterator.3 \ +xcb_res_query_clients_clients_length.3 \ +xcb_res_query_clients_reply.3 \ +xcb_res_query_clients_unchecked.3 \ +xcb_res_query_version.3 \ +xcb_res_query_version_reply.3 \ +xcb_res_query_version_unchecked.3 \ +xcb_resize_request_event_t.3 \ +xcb_rotate_properties.3 \ +xcb_rotate_properties_checked.3 \ +xcb_screensaver_notify_event_t.3 \ +xcb_screensaver_query_info.3 \ +xcb_screensaver_query_info_reply.3 \ +xcb_screensaver_query_info_unchecked.3 \ +xcb_screensaver_query_version.3 \ +xcb_screensaver_query_version_reply.3 \ +xcb_screensaver_query_version_unchecked.3 \ +xcb_screensaver_select_input.3 \ +xcb_screensaver_select_input_checked.3 \ +xcb_screensaver_set_attributes.3 \ +xcb_screensaver_set_attributes_checked.3 \ +xcb_screensaver_suspend.3 \ +xcb_screensaver_suspend_checked.3 \ +xcb_screensaver_unset_attributes.3 \ +xcb_screensaver_unset_attributes_checked.3 \ +xcb_selection_clear_event_t.3 \ +xcb_selection_notify_event_t.3 \ +xcb_selection_request_event_t.3 \ +xcb_selinux_get_client_context.3 \ +xcb_selinux_get_client_context_context.3 \ +xcb_selinux_get_client_context_context_end.3 \ +xcb_selinux_get_client_context_context_length.3 \ +xcb_selinux_get_client_context_reply.3 \ +xcb_selinux_get_client_context_unchecked.3 \ +xcb_selinux_get_device_context.3 \ +xcb_selinux_get_device_context_context.3 \ +xcb_selinux_get_device_context_context_end.3 \ +xcb_selinux_get_device_context_context_length.3 \ +xcb_selinux_get_device_context_reply.3 \ +xcb_selinux_get_device_context_unchecked.3 \ +xcb_selinux_get_device_create_context.3 \ +xcb_selinux_get_device_create_context_context.3 \ +xcb_selinux_get_device_create_context_context_end.3 \ +xcb_selinux_get_device_create_context_context_length.3 \ +xcb_selinux_get_device_create_context_reply.3 \ +xcb_selinux_get_device_create_context_unchecked.3 \ +xcb_selinux_get_property_context.3 \ +xcb_selinux_get_property_context_context.3 \ +xcb_selinux_get_property_context_context_end.3 \ +xcb_selinux_get_property_context_context_length.3 \ +xcb_selinux_get_property_context_reply.3 \ +xcb_selinux_get_property_context_unchecked.3 \ +xcb_selinux_get_property_create_context.3 \ +xcb_selinux_get_property_create_context_context.3 \ +xcb_selinux_get_property_create_context_context_end.3 \ +xcb_selinux_get_property_create_context_context_length.3 \ +xcb_selinux_get_property_create_context_reply.3 \ +xcb_selinux_get_property_create_context_unchecked.3 \ +xcb_selinux_get_property_data_context.3 \ +xcb_selinux_get_property_data_context_context.3 \ +xcb_selinux_get_property_data_context_context_end.3 \ +xcb_selinux_get_property_data_context_context_length.3 \ +xcb_selinux_get_property_data_context_reply.3 \ +xcb_selinux_get_property_data_context_unchecked.3 \ +xcb_selinux_get_property_use_context.3 \ +xcb_selinux_get_property_use_context_context.3 \ +xcb_selinux_get_property_use_context_context_end.3 \ +xcb_selinux_get_property_use_context_context_length.3 \ +xcb_selinux_get_property_use_context_reply.3 \ +xcb_selinux_get_property_use_context_unchecked.3 \ +xcb_selinux_get_selection_context.3 \ +xcb_selinux_get_selection_context_context.3 \ +xcb_selinux_get_selection_context_context_end.3 \ +xcb_selinux_get_selection_context_context_length.3 \ +xcb_selinux_get_selection_context_reply.3 \ +xcb_selinux_get_selection_context_unchecked.3 \ +xcb_selinux_get_selection_create_context.3 \ +xcb_selinux_get_selection_create_context_context.3 \ +xcb_selinux_get_selection_create_context_context_end.3 \ +xcb_selinux_get_selection_create_context_context_length.3 \ +xcb_selinux_get_selection_create_context_reply.3 \ +xcb_selinux_get_selection_create_context_unchecked.3 \ +xcb_selinux_get_selection_data_context.3 \ +xcb_selinux_get_selection_data_context_context.3 \ +xcb_selinux_get_selection_data_context_context_end.3 \ +xcb_selinux_get_selection_data_context_context_length.3 \ +xcb_selinux_get_selection_data_context_reply.3 \ +xcb_selinux_get_selection_data_context_unchecked.3 \ +xcb_selinux_get_selection_use_context.3 \ +xcb_selinux_get_selection_use_context_context.3 \ +xcb_selinux_get_selection_use_context_context_end.3 \ +xcb_selinux_get_selection_use_context_context_length.3 \ +xcb_selinux_get_selection_use_context_reply.3 \ +xcb_selinux_get_selection_use_context_unchecked.3 \ +xcb_selinux_get_window_context.3 \ +xcb_selinux_get_window_context_context.3 \ +xcb_selinux_get_window_context_context_end.3 \ +xcb_selinux_get_window_context_context_length.3 \ +xcb_selinux_get_window_context_reply.3 \ +xcb_selinux_get_window_context_unchecked.3 \ +xcb_selinux_get_window_create_context.3 \ +xcb_selinux_get_window_create_context_context.3 \ +xcb_selinux_get_window_create_context_context_end.3 \ +xcb_selinux_get_window_create_context_context_length.3 \ +xcb_selinux_get_window_create_context_reply.3 \ +xcb_selinux_get_window_create_context_unchecked.3 \ +xcb_selinux_list_properties.3 \ +xcb_selinux_list_properties_properties_iterator.3 \ +xcb_selinux_list_properties_properties_length.3 \ +xcb_selinux_list_properties_reply.3 \ +xcb_selinux_list_properties_unchecked.3 \ +xcb_selinux_list_selections.3 \ +xcb_selinux_list_selections_reply.3 \ +xcb_selinux_list_selections_selections_iterator.3 \ +xcb_selinux_list_selections_selections_length.3 \ +xcb_selinux_list_selections_unchecked.3 \ +xcb_selinux_query_version.3 \ +xcb_selinux_query_version_reply.3 \ +xcb_selinux_query_version_unchecked.3 \ +xcb_selinux_set_device_context.3 \ +xcb_selinux_set_device_context_checked.3 \ +xcb_selinux_set_device_create_context.3 \ +xcb_selinux_set_device_create_context_checked.3 \ +xcb_selinux_set_property_create_context.3 \ +xcb_selinux_set_property_create_context_checked.3 \ +xcb_selinux_set_property_use_context.3 \ +xcb_selinux_set_property_use_context_checked.3 \ +xcb_selinux_set_selection_create_context.3 \ +xcb_selinux_set_selection_create_context_checked.3 \ +xcb_selinux_set_selection_use_context.3 \ +xcb_selinux_set_selection_use_context_checked.3 \ +xcb_selinux_set_window_create_context.3 \ +xcb_selinux_set_window_create_context_checked.3 \ +xcb_send_event.3 \ +xcb_send_event_checked.3 \ +xcb_set_access_control.3 \ +xcb_set_access_control_checked.3 \ +xcb_set_clip_rectangles.3 \ +xcb_set_clip_rectangles_checked.3 \ +xcb_set_close_down_mode.3 \ +xcb_set_close_down_mode_checked.3 \ +xcb_set_dashes.3 \ +xcb_set_dashes_checked.3 \ +xcb_set_font_path.3 \ +xcb_set_font_path_checked.3 \ +xcb_set_input_focus.3 \ +xcb_set_input_focus_checked.3 \ +xcb_set_modifier_mapping.3 \ +xcb_set_modifier_mapping_reply.3 \ +xcb_set_modifier_mapping_unchecked.3 \ +xcb_set_pointer_mapping.3 \ +xcb_set_pointer_mapping_reply.3 \ +xcb_set_pointer_mapping_unchecked.3 \ +xcb_set_screen_saver.3 \ +xcb_set_screen_saver_checked.3 \ +xcb_set_selection_owner.3 \ +xcb_set_selection_owner_checked.3 \ +xcb_shape_combine.3 \ +xcb_shape_combine_checked.3 \ +xcb_shape_get_rectangles.3 \ +xcb_shape_get_rectangles_rectangles.3 \ +xcb_shape_get_rectangles_rectangles_iterator.3 \ +xcb_shape_get_rectangles_rectangles_length.3 \ +xcb_shape_get_rectangles_reply.3 \ +xcb_shape_get_rectangles_unchecked.3 \ +xcb_shape_input_selected.3 \ +xcb_shape_input_selected_reply.3 \ +xcb_shape_input_selected_unchecked.3 \ +xcb_shape_mask.3 \ +xcb_shape_mask_checked.3 \ +xcb_shape_notify_event_t.3 \ +xcb_shape_offset.3 \ +xcb_shape_offset_checked.3 \ +xcb_shape_query_extents.3 \ +xcb_shape_query_extents_reply.3 \ +xcb_shape_query_extents_unchecked.3 \ +xcb_shape_query_version.3 \ +xcb_shape_query_version_reply.3 \ +xcb_shape_query_version_unchecked.3 \ +xcb_shape_rectangles.3 \ +xcb_shape_rectangles_checked.3 \ +xcb_shape_select_input.3 \ +xcb_shape_select_input_checked.3 \ +xcb_shm_attach.3 \ +xcb_shm_attach_checked.3 \ +xcb_shm_completion_event_t.3 \ +xcb_shm_create_pixmap.3 \ +xcb_shm_create_pixmap_checked.3 \ +xcb_shm_detach.3 \ +xcb_shm_detach_checked.3 \ +xcb_shm_get_image.3 \ +xcb_shm_get_image_reply.3 \ +xcb_shm_get_image_unchecked.3 \ +xcb_shm_put_image.3 \ +xcb_shm_put_image_checked.3 \ +xcb_shm_query_version.3 \ +xcb_shm_query_version_reply.3 \ +xcb_shm_query_version_unchecked.3 \ +xcb_store_colors.3 \ +xcb_store_colors_checked.3 \ +xcb_store_named_color.3 \ +xcb_store_named_color_checked.3 \ +xcb_sync_alarm_notify_event_t.3 \ +xcb_sync_await.3 \ +xcb_sync_await_checked.3 \ +xcb_sync_await_fence.3 \ +xcb_sync_await_fence_checked.3 \ +xcb_sync_change_alarm.3 \ +xcb_sync_change_alarm_checked.3 \ +xcb_sync_change_counter.3 \ +xcb_sync_change_counter_checked.3 \ +xcb_sync_counter_notify_event_t.3 \ +xcb_sync_create_alarm.3 \ +xcb_sync_create_alarm_checked.3 \ +xcb_sync_create_counter.3 \ +xcb_sync_create_counter_checked.3 \ +xcb_sync_create_fence.3 \ +xcb_sync_create_fence_checked.3 \ +xcb_sync_destroy_alarm.3 \ +xcb_sync_destroy_alarm_checked.3 \ +xcb_sync_destroy_counter.3 \ +xcb_sync_destroy_counter_checked.3 \ +xcb_sync_destroy_fence.3 \ +xcb_sync_destroy_fence_checked.3 \ +xcb_sync_get_priority.3 \ +xcb_sync_get_priority_reply.3 \ +xcb_sync_get_priority_unchecked.3 \ +xcb_sync_initialize.3 \ +xcb_sync_initialize_reply.3 \ +xcb_sync_initialize_unchecked.3 \ +xcb_sync_list_system_counters.3 \ +xcb_sync_list_system_counters_counters_iterator.3 \ +xcb_sync_list_system_counters_counters_length.3 \ +xcb_sync_list_system_counters_reply.3 \ +xcb_sync_list_system_counters_unchecked.3 \ +xcb_sync_query_alarm.3 \ +xcb_sync_query_alarm_reply.3 \ +xcb_sync_query_alarm_unchecked.3 \ +xcb_sync_query_counter.3 \ +xcb_sync_query_counter_reply.3 \ +xcb_sync_query_counter_unchecked.3 \ +xcb_sync_query_fence.3 \ +xcb_sync_query_fence_reply.3 \ +xcb_sync_query_fence_unchecked.3 \ +xcb_sync_reset_fence.3 \ +xcb_sync_reset_fence_checked.3 \ +xcb_sync_set_counter.3 \ +xcb_sync_set_counter_checked.3 \ +xcb_sync_set_priority.3 \ +xcb_sync_set_priority_checked.3 \ +xcb_sync_trigger_fence.3 \ +xcb_sync_trigger_fence_checked.3 \ +xcb_test_compare_cursor.3 \ +xcb_test_compare_cursor_reply.3 \ +xcb_test_compare_cursor_unchecked.3 \ +xcb_test_fake_input.3 \ +xcb_test_fake_input_checked.3 \ +xcb_test_get_version.3 \ +xcb_test_get_version_reply.3 \ +xcb_test_get_version_unchecked.3 \ +xcb_test_grab_control.3 \ +xcb_test_grab_control_checked.3 \ +xcb_translate_coordinates.3 \ +xcb_translate_coordinates_reply.3 \ +xcb_translate_coordinates_unchecked.3 \ +xcb_ungrab_button.3 \ +xcb_ungrab_button_checked.3 \ +xcb_ungrab_key.3 \ +xcb_ungrab_key_checked.3 \ +xcb_ungrab_keyboard.3 \ +xcb_ungrab_keyboard_checked.3 \ +xcb_ungrab_pointer.3 \ +xcb_ungrab_pointer_checked.3 \ +xcb_ungrab_server.3 \ +xcb_ungrab_server_checked.3 \ +xcb_uninstall_colormap.3 \ +xcb_uninstall_colormap_checked.3 \ +xcb_unmap_notify_event_t.3 \ +xcb_unmap_subwindows.3 \ +xcb_unmap_subwindows_checked.3 \ +xcb_unmap_window.3 \ +xcb_unmap_window_checked.3 \ +xcb_visibility_notify_event_t.3 \ +xcb_warp_pointer.3 \ +xcb_warp_pointer_checked.3 \ +xcb_x_print_attribut_notify_event_t.3 \ +xcb_x_print_create_context.3 \ +xcb_x_print_create_context_checked.3 \ +xcb_x_print_notify_event_t.3 \ +xcb_x_print_print_destroy_context.3 \ +xcb_x_print_print_destroy_context_checked.3 \ +xcb_x_print_print_end_doc.3 \ +xcb_x_print_print_end_doc_checked.3 \ +xcb_x_print_print_end_job.3 \ +xcb_x_print_print_end_job_checked.3 \ +xcb_x_print_print_end_page.3 \ +xcb_x_print_print_end_page_checked.3 \ +xcb_x_print_print_get_attributes.3 \ +xcb_x_print_print_get_attributes_reply.3 \ +xcb_x_print_print_get_attributes_unchecked.3 \ +xcb_x_print_print_get_context.3 \ +xcb_x_print_print_get_context_reply.3 \ +xcb_x_print_print_get_context_unchecked.3 \ +xcb_x_print_print_get_document_data.3 \ +xcb_x_print_print_get_document_data_data.3 \ +xcb_x_print_print_get_document_data_data_end.3 \ +xcb_x_print_print_get_document_data_data_length.3 \ +xcb_x_print_print_get_document_data_reply.3 \ +xcb_x_print_print_get_document_data_unchecked.3 \ +xcb_x_print_print_get_image_resolution.3 \ +xcb_x_print_print_get_image_resolution_reply.3 \ +xcb_x_print_print_get_image_resolution_unchecked.3 \ +xcb_x_print_print_get_one_attributes.3 \ +xcb_x_print_print_get_one_attributes_reply.3 \ +xcb_x_print_print_get_one_attributes_unchecked.3 \ +xcb_x_print_print_get_one_attributes_value.3 \ +xcb_x_print_print_get_one_attributes_value_end.3 \ +xcb_x_print_print_get_one_attributes_value_length.3 \ +xcb_x_print_print_get_page_dimensions.3 \ +xcb_x_print_print_get_page_dimensions_reply.3 \ +xcb_x_print_print_get_page_dimensions_unchecked.3 \ +xcb_x_print_print_get_printer_list.3 \ +xcb_x_print_print_get_printer_list_printers_iterator.3 \ +xcb_x_print_print_get_printer_list_printers_length.3 \ +xcb_x_print_print_get_printer_list_reply.3 \ +xcb_x_print_print_get_printer_list_unchecked.3 \ +xcb_x_print_print_get_screen_of_context.3 \ +xcb_x_print_print_get_screen_of_context_reply.3 \ +xcb_x_print_print_get_screen_of_context_unchecked.3 \ +xcb_x_print_print_input_selected.3 \ +xcb_x_print_print_input_selected_all_events_list.3 \ +xcb_x_print_print_input_selected_all_events_list_end.3 \ +xcb_x_print_print_input_selected_all_events_list_length.3 \ +xcb_x_print_print_input_selected_event_list.3 \ +xcb_x_print_print_input_selected_event_list_end.3 \ +xcb_x_print_print_input_selected_event_list_length.3 \ +xcb_x_print_print_input_selected_reply.3 \ +xcb_x_print_print_input_selected_unchecked.3 \ +xcb_x_print_print_put_document_data.3 \ +xcb_x_print_print_put_document_data_checked.3 \ +xcb_x_print_print_query_screens.3 \ +xcb_x_print_print_query_screens_reply.3 \ +xcb_x_print_print_query_screens_roots.3 \ +xcb_x_print_print_query_screens_roots_end.3 \ +xcb_x_print_print_query_screens_roots_length.3 \ +xcb_x_print_print_query_screens_unchecked.3 \ +xcb_x_print_print_query_version.3 \ +xcb_x_print_print_query_version_reply.3 \ +xcb_x_print_print_query_version_unchecked.3 \ +xcb_x_print_print_rehash_printer_list.3 \ +xcb_x_print_print_rehash_printer_list_checked.3 \ +xcb_x_print_print_select_input.3 \ +xcb_x_print_print_select_input_checked.3 \ +xcb_x_print_print_set_attributes.3 \ +xcb_x_print_print_set_attributes_checked.3 \ +xcb_x_print_print_set_context.3 \ +xcb_x_print_print_set_context_checked.3 \ +xcb_x_print_print_set_image_resolution.3 \ +xcb_x_print_print_set_image_resolution_reply.3 \ +xcb_x_print_print_set_image_resolution_unchecked.3 \ +xcb_x_print_print_start_doc.3 \ +xcb_x_print_print_start_doc_checked.3 \ +xcb_x_print_print_start_job.3 \ +xcb_x_print_print_start_job_checked.3 \ +xcb_x_print_print_start_page.3 \ +xcb_x_print_print_start_page_checked.3 \ +xcb_xc_misc_get_version.3 \ +xcb_xc_misc_get_version_reply.3 \ +xcb_xc_misc_get_version_unchecked.3 \ +xcb_xc_misc_get_xid_list.3 \ +xcb_xc_misc_get_xid_list_ids.3 \ +xcb_xc_misc_get_xid_list_ids_end.3 \ +xcb_xc_misc_get_xid_list_ids_length.3 \ +xcb_xc_misc_get_xid_list_reply.3 \ +xcb_xc_misc_get_xid_list_unchecked.3 \ +xcb_xc_misc_get_xid_range.3 \ +xcb_xc_misc_get_xid_range_reply.3 \ +xcb_xc_misc_get_xid_range_unchecked.3 \ +xcb_xevie_end.3 \ +xcb_xevie_end_reply.3 \ +xcb_xevie_end_unchecked.3 \ +xcb_xevie_query_version.3 \ +xcb_xevie_query_version_reply.3 \ +xcb_xevie_query_version_unchecked.3 \ +xcb_xevie_select_input.3 \ +xcb_xevie_select_input_reply.3 \ +xcb_xevie_select_input_unchecked.3 \ +xcb_xevie_send.3 \ +xcb_xevie_send_reply.3 \ +xcb_xevie_send_unchecked.3 \ +xcb_xevie_start.3 \ +xcb_xevie_start_reply.3 \ +xcb_xevie_start_unchecked.3 \ +xcb_xf86dri_auth_connection.3 \ +xcb_xf86dri_auth_connection_reply.3 \ +xcb_xf86dri_auth_connection_unchecked.3 \ +xcb_xf86dri_close_connection.3 \ +xcb_xf86dri_close_connection_checked.3 \ +xcb_xf86dri_create_context.3 \ +xcb_xf86dri_create_context_reply.3 \ +xcb_xf86dri_create_context_unchecked.3 \ +xcb_xf86dri_create_drawable.3 \ +xcb_xf86dri_create_drawable_reply.3 \ +xcb_xf86dri_create_drawable_unchecked.3 \ +xcb_xf86dri_destroy_context.3 \ +xcb_xf86dri_destroy_context_checked.3 \ +xcb_xf86dri_destroy_drawable.3 \ +xcb_xf86dri_destroy_drawable_checked.3 \ +xcb_xf86dri_get_client_driver_name.3 \ +xcb_xf86dri_get_client_driver_name_client_driver_name.3 \ +xcb_xf86dri_get_client_driver_name_client_driver_name_end.3 \ +xcb_xf86dri_get_client_driver_name_client_driver_name_length.3 \ +xcb_xf86dri_get_client_driver_name_reply.3 \ +xcb_xf86dri_get_client_driver_name_unchecked.3 \ +xcb_xf86dri_get_device_info.3 \ +xcb_xf86dri_get_device_info_device_private.3 \ +xcb_xf86dri_get_device_info_device_private_end.3 \ +xcb_xf86dri_get_device_info_device_private_length.3 \ +xcb_xf86dri_get_device_info_reply.3 \ +xcb_xf86dri_get_device_info_unchecked.3 \ +xcb_xf86dri_get_drawable_info.3 \ +xcb_xf86dri_get_drawable_info_back_clip_rects.3 \ +xcb_xf86dri_get_drawable_info_back_clip_rects_iterator.3 \ +xcb_xf86dri_get_drawable_info_back_clip_rects_length.3 \ +xcb_xf86dri_get_drawable_info_clip_rects.3 \ +xcb_xf86dri_get_drawable_info_clip_rects_iterator.3 \ +xcb_xf86dri_get_drawable_info_clip_rects_length.3 \ +xcb_xf86dri_get_drawable_info_reply.3 \ +xcb_xf86dri_get_drawable_info_unchecked.3 \ +xcb_xf86dri_open_connection.3 \ +xcb_xf86dri_open_connection_bus_id.3 \ +xcb_xf86dri_open_connection_bus_id_end.3 \ +xcb_xf86dri_open_connection_bus_id_length.3 \ +xcb_xf86dri_open_connection_reply.3 \ +xcb_xf86dri_open_connection_unchecked.3 \ +xcb_xf86dri_query_direct_rendering_capable.3 \ +xcb_xf86dri_query_direct_rendering_capable_reply.3 \ +xcb_xf86dri_query_direct_rendering_capable_unchecked.3 \ +xcb_xf86dri_query_version.3 \ +xcb_xf86dri_query_version_reply.3 \ +xcb_xf86dri_query_version_unchecked.3 \ +xcb_xfixes_change_cursor.3 \ +xcb_xfixes_change_cursor_by_name.3 \ +xcb_xfixes_change_cursor_by_name_checked.3 \ +xcb_xfixes_change_cursor_checked.3 \ +xcb_xfixes_change_save_set.3 \ +xcb_xfixes_change_save_set_checked.3 \ +xcb_xfixes_copy_region.3 \ +xcb_xfixes_copy_region_checked.3 \ +xcb_xfixes_create_region.3 \ +xcb_xfixes_create_region_checked.3 \ +xcb_xfixes_create_region_from_bitmap.3 \ +xcb_xfixes_create_region_from_bitmap_checked.3 \ +xcb_xfixes_create_region_from_gc.3 \ +xcb_xfixes_create_region_from_gc_checked.3 \ +xcb_xfixes_create_region_from_picture.3 \ +xcb_xfixes_create_region_from_picture_checked.3 \ +xcb_xfixes_create_region_from_window.3 \ +xcb_xfixes_create_region_from_window_checked.3 \ +xcb_xfixes_cursor_notify_event_t.3 \ +xcb_xfixes_destroy_region.3 \ +xcb_xfixes_destroy_region_checked.3 \ +xcb_xfixes_expand_region.3 \ +xcb_xfixes_expand_region_checked.3 \ +xcb_xfixes_fetch_region.3 \ +xcb_xfixes_fetch_region_rectangles.3 \ +xcb_xfixes_fetch_region_rectangles_iterator.3 \ +xcb_xfixes_fetch_region_rectangles_length.3 \ +xcb_xfixes_fetch_region_reply.3 \ +xcb_xfixes_fetch_region_unchecked.3 \ +xcb_xfixes_get_cursor_image.3 \ +xcb_xfixes_get_cursor_image_and_name.3 \ +xcb_xfixes_get_cursor_image_and_name_cursor_image.3 \ +xcb_xfixes_get_cursor_image_and_name_cursor_image_end.3 \ +xcb_xfixes_get_cursor_image_and_name_cursor_image_length.3 \ +xcb_xfixes_get_cursor_image_and_name_name.3 \ +xcb_xfixes_get_cursor_image_and_name_name_end.3 \ +xcb_xfixes_get_cursor_image_and_name_name_length.3 \ +xcb_xfixes_get_cursor_image_and_name_reply.3 \ +xcb_xfixes_get_cursor_image_and_name_unchecked.3 \ +xcb_xfixes_get_cursor_image_cursor_image.3 \ +xcb_xfixes_get_cursor_image_cursor_image_end.3 \ +xcb_xfixes_get_cursor_image_cursor_image_length.3 \ +xcb_xfixes_get_cursor_image_reply.3 \ +xcb_xfixes_get_cursor_image_unchecked.3 \ +xcb_xfixes_get_cursor_name.3 \ +xcb_xfixes_get_cursor_name_name.3 \ +xcb_xfixes_get_cursor_name_name_end.3 \ +xcb_xfixes_get_cursor_name_name_length.3 \ +xcb_xfixes_get_cursor_name_reply.3 \ +xcb_xfixes_get_cursor_name_unchecked.3 \ +xcb_xfixes_hide_cursor.3 \ +xcb_xfixes_hide_cursor_checked.3 \ +xcb_xfixes_intersect_region.3 \ +xcb_xfixes_intersect_region_checked.3 \ +xcb_xfixes_invert_region.3 \ +xcb_xfixes_invert_region_checked.3 \ +xcb_xfixes_query_version.3 \ +xcb_xfixes_query_version_reply.3 \ +xcb_xfixes_query_version_unchecked.3 \ +xcb_xfixes_region_extents.3 \ +xcb_xfixes_region_extents_checked.3 \ +xcb_xfixes_select_cursor_input.3 \ +xcb_xfixes_select_cursor_input_checked.3 \ +xcb_xfixes_select_selection_input.3 \ +xcb_xfixes_select_selection_input_checked.3 \ +xcb_xfixes_selection_notify_event_t.3 \ +xcb_xfixes_set_cursor_name.3 \ +xcb_xfixes_set_cursor_name_checked.3 \ +xcb_xfixes_set_gc_clip_region.3 \ +xcb_xfixes_set_gc_clip_region_checked.3 \ +xcb_xfixes_set_picture_clip_region.3 \ +xcb_xfixes_set_picture_clip_region_checked.3 \ +xcb_xfixes_set_region.3 \ +xcb_xfixes_set_region_checked.3 \ +xcb_xfixes_set_window_shape_region.3 \ +xcb_xfixes_set_window_shape_region_checked.3 \ +xcb_xfixes_show_cursor.3 \ +xcb_xfixes_show_cursor_checked.3 \ +xcb_xfixes_subtract_region.3 \ +xcb_xfixes_subtract_region_checked.3 \ +xcb_xfixes_translate_region.3 \ +xcb_xfixes_translate_region_checked.3 \ +xcb_xfixes_union_region.3 \ +xcb_xfixes_union_region_checked.3 \ +xcb_xinerama_get_screen_count.3 \ +xcb_xinerama_get_screen_count_reply.3 \ +xcb_xinerama_get_screen_count_unchecked.3 \ +xcb_xinerama_get_screen_size.3 \ +xcb_xinerama_get_screen_size_reply.3 \ +xcb_xinerama_get_screen_size_unchecked.3 \ +xcb_xinerama_get_state.3 \ +xcb_xinerama_get_state_reply.3 \ +xcb_xinerama_get_state_unchecked.3 \ +xcb_xinerama_is_active.3 \ +xcb_xinerama_is_active_reply.3 \ +xcb_xinerama_is_active_unchecked.3 \ +xcb_xinerama_query_screens.3 \ +xcb_xinerama_query_screens_reply.3 \ +xcb_xinerama_query_screens_screen_info.3 \ +xcb_xinerama_query_screens_screen_info_iterator.3 \ +xcb_xinerama_query_screens_screen_info_length.3 \ +xcb_xinerama_query_screens_unchecked.3 \ +xcb_xinerama_query_version.3 \ +xcb_xinerama_query_version_reply.3 \ +xcb_xinerama_query_version_unchecked.3 \ +xcb_xkb_access_x_notify_event_t.3 \ +xcb_xkb_action_message_event_t.3 \ +xcb_xkb_bell.3 \ +xcb_xkb_bell_checked.3 \ +xcb_xkb_bell_notify_event_t.3 \ +xcb_xkb_compat_map_notify_event_t.3 \ +xcb_xkb_controls_notify_event_t.3 \ +xcb_xkb_extension_device_notify_event_t.3 \ +xcb_xkb_get_compat_map.3 \ +xcb_xkb_get_compat_map_group_rtrn.3 \ +xcb_xkb_get_compat_map_group_rtrn_iterator.3 \ +xcb_xkb_get_compat_map_group_rtrn_length.3 \ +xcb_xkb_get_compat_map_reply.3 \ +xcb_xkb_get_compat_map_si_rtrn.3 \ +xcb_xkb_get_compat_map_si_rtrn_end.3 \ +xcb_xkb_get_compat_map_si_rtrn_length.3 \ +xcb_xkb_get_compat_map_unchecked.3 \ +xcb_xkb_get_controls.3 \ +xcb_xkb_get_controls_reply.3 \ +xcb_xkb_get_controls_unchecked.3 \ +xcb_xkb_get_device_info.3 \ +xcb_xkb_get_device_info_btn_actions.3 \ +xcb_xkb_get_device_info_btn_actions_iterator.3 \ +xcb_xkb_get_device_info_btn_actions_length.3 \ +xcb_xkb_get_device_info_leds_iterator.3 \ +xcb_xkb_get_device_info_leds_length.3 \ +xcb_xkb_get_device_info_name.3 \ +xcb_xkb_get_device_info_name_end.3 \ +xcb_xkb_get_device_info_name_length.3 \ +xcb_xkb_get_device_info_reply.3 \ +xcb_xkb_get_device_info_unchecked.3 \ +xcb_xkb_get_geometry.3 \ +xcb_xkb_get_geometry_colors_iterator.3 \ +xcb_xkb_get_geometry_colors_length.3 \ +xcb_xkb_get_geometry_doodads_iterator.3 \ +xcb_xkb_get_geometry_doodads_length.3 \ +xcb_xkb_get_geometry_key_aliases.3 \ +xcb_xkb_get_geometry_key_aliases_iterator.3 \ +xcb_xkb_get_geometry_key_aliases_length.3 \ +xcb_xkb_get_geometry_label_font.3 \ +xcb_xkb_get_geometry_properties_iterator.3 \ +xcb_xkb_get_geometry_properties_length.3 \ +xcb_xkb_get_geometry_reply.3 \ +xcb_xkb_get_geometry_sections_iterator.3 \ +xcb_xkb_get_geometry_sections_length.3 \ +xcb_xkb_get_geometry_shapes_iterator.3 \ +xcb_xkb_get_geometry_shapes_length.3 \ +xcb_xkb_get_geometry_unchecked.3 \ +xcb_xkb_get_indicator_map.3 \ +xcb_xkb_get_indicator_map_maps.3 \ +xcb_xkb_get_indicator_map_maps_iterator.3 \ +xcb_xkb_get_indicator_map_maps_length.3 \ +xcb_xkb_get_indicator_map_reply.3 \ +xcb_xkb_get_indicator_map_unchecked.3 \ +xcb_xkb_get_indicator_state.3 \ +xcb_xkb_get_indicator_state_reply.3 \ +xcb_xkb_get_indicator_state_unchecked.3 \ +xcb_xkb_get_kbd_by_name.3 \ +xcb_xkb_get_kbd_by_name_replies.3 \ +xcb_xkb_get_kbd_by_name_reply.3 \ +xcb_xkb_get_kbd_by_name_unchecked.3 \ +xcb_xkb_get_map.3 \ +xcb_xkb_get_map_map.3 \ +xcb_xkb_get_map_reply.3 \ +xcb_xkb_get_map_unchecked.3 \ +xcb_xkb_get_named_indicator.3 \ +xcb_xkb_get_named_indicator_reply.3 \ +xcb_xkb_get_named_indicator_unchecked.3 \ +xcb_xkb_get_names.3 \ +xcb_xkb_get_names_reply.3 \ +xcb_xkb_get_names_unchecked.3 \ +xcb_xkb_get_names_value_list.3 \ +xcb_xkb_get_state.3 \ +xcb_xkb_get_state_reply.3 \ +xcb_xkb_get_state_unchecked.3 \ +xcb_xkb_indicator_map_notify_event_t.3 \ +xcb_xkb_indicator_state_notify_event_t.3 \ +xcb_xkb_latch_lock_state.3 \ +xcb_xkb_latch_lock_state_checked.3 \ +xcb_xkb_list_components.3 \ +xcb_xkb_list_components_compat_maps_iterator.3 \ +xcb_xkb_list_components_compat_maps_length.3 \ +xcb_xkb_list_components_geometries_iterator.3 \ +xcb_xkb_list_components_geometries_length.3 \ +xcb_xkb_list_components_keycodes_iterator.3 \ +xcb_xkb_list_components_keycodes_length.3 \ +xcb_xkb_list_components_keymaps_iterator.3 \ +xcb_xkb_list_components_keymaps_length.3 \ +xcb_xkb_list_components_reply.3 \ +xcb_xkb_list_components_symbols_iterator.3 \ +xcb_xkb_list_components_symbols_length.3 \ +xcb_xkb_list_components_types_iterator.3 \ +xcb_xkb_list_components_types_length.3 \ +xcb_xkb_list_components_unchecked.3 \ +xcb_xkb_map_notify_event_t.3 \ +xcb_xkb_names_notify_event_t.3 \ +xcb_xkb_new_keyboard_notify_event_t.3 \ +xcb_xkb_per_client_flags.3 \ +xcb_xkb_per_client_flags_reply.3 \ +xcb_xkb_per_client_flags_unchecked.3 \ +xcb_xkb_select_events.3 \ +xcb_xkb_select_events_checked.3 \ +xcb_xkb_set_compat_map.3 \ +xcb_xkb_set_compat_map_checked.3 \ +xcb_xkb_set_controls.3 \ +xcb_xkb_set_controls_checked.3 \ +xcb_xkb_set_debugging_flags.3 \ +xcb_xkb_set_debugging_flags_reply.3 \ +xcb_xkb_set_debugging_flags_unchecked.3 \ +xcb_xkb_set_device_info.3 \ +xcb_xkb_set_device_info_checked.3 \ +xcb_xkb_set_geometry.3 \ +xcb_xkb_set_geometry_checked.3 \ +xcb_xkb_set_indicator_map.3 \ +xcb_xkb_set_indicator_map_checked.3 \ +xcb_xkb_set_map.3 \ +xcb_xkb_set_map_checked.3 \ +xcb_xkb_set_named_indicator.3 \ +xcb_xkb_set_named_indicator_checked.3 \ +xcb_xkb_set_names.3 \ +xcb_xkb_set_names_checked.3 \ +xcb_xkb_state_notify_event_t.3 \ +xcb_xkb_use_extension.3 \ +xcb_xkb_use_extension_reply.3 \ +xcb_xkb_use_extension_unchecked.3 \ +xcb_xv_get_port_attribute.3 \ +xcb_xv_get_port_attribute_reply.3 \ +xcb_xv_get_port_attribute_unchecked.3 \ +xcb_xv_get_still.3 \ +xcb_xv_get_still_checked.3 \ +xcb_xv_get_video.3 \ +xcb_xv_get_video_checked.3 \ +xcb_xv_grab_port.3 \ +xcb_xv_grab_port_reply.3 \ +xcb_xv_grab_port_unchecked.3 \ +xcb_xv_list_image_formats.3 \ +xcb_xv_list_image_formats_format.3 \ +xcb_xv_list_image_formats_format_iterator.3 \ +xcb_xv_list_image_formats_format_length.3 \ +xcb_xv_list_image_formats_reply.3 \ +xcb_xv_list_image_formats_unchecked.3 \ +xcb_xv_port_notify_event_t.3 \ +xcb_xv_put_image.3 \ +xcb_xv_put_image_checked.3 \ +xcb_xv_put_still.3 \ +xcb_xv_put_still_checked.3 \ +xcb_xv_put_video.3 \ +xcb_xv_put_video_checked.3 \ +xcb_xv_query_adaptors.3 \ +xcb_xv_query_adaptors_info_iterator.3 \ +xcb_xv_query_adaptors_info_length.3 \ +xcb_xv_query_adaptors_reply.3 \ +xcb_xv_query_adaptors_unchecked.3 \ +xcb_xv_query_best_size.3 \ +xcb_xv_query_best_size_reply.3 \ +xcb_xv_query_best_size_unchecked.3 \ +xcb_xv_query_encodings.3 \ +xcb_xv_query_encodings_info_iterator.3 \ +xcb_xv_query_encodings_info_length.3 \ +xcb_xv_query_encodings_reply.3 \ +xcb_xv_query_encodings_unchecked.3 \ +xcb_xv_query_extension.3 \ +xcb_xv_query_extension_reply.3 \ +xcb_xv_query_extension_unchecked.3 \ +xcb_xv_query_image_attributes.3 \ +xcb_xv_query_image_attributes_offsets.3 \ +xcb_xv_query_image_attributes_offsets_end.3 \ +xcb_xv_query_image_attributes_offsets_length.3 \ +xcb_xv_query_image_attributes_pitches.3 \ +xcb_xv_query_image_attributes_pitches_end.3 \ +xcb_xv_query_image_attributes_pitches_length.3 \ +xcb_xv_query_image_attributes_reply.3 \ +xcb_xv_query_image_attributes_unchecked.3 \ +xcb_xv_query_port_attributes.3 \ +xcb_xv_query_port_attributes_attributes_iterator.3 \ +xcb_xv_query_port_attributes_attributes_length.3 \ +xcb_xv_query_port_attributes_reply.3 \ +xcb_xv_query_port_attributes_unchecked.3 \ +xcb_xv_select_port_notify.3 \ +xcb_xv_select_port_notify_checked.3 \ +xcb_xv_select_video_notify.3 \ +xcb_xv_select_video_notify_checked.3 \ +xcb_xv_set_port_attribute.3 \ +xcb_xv_set_port_attribute_checked.3 \ +xcb_xv_shm_put_image.3 \ +xcb_xv_shm_put_image_checked.3 \ +xcb_xv_stop_video.3 \ +xcb_xv_stop_video_checked.3 \ +xcb_xv_ungrab_port.3 \ +xcb_xv_ungrab_port_checked.3 \ +xcb_xv_video_notify_event_t.3 \ +xcb_xvmc_create_context.3 \ +xcb_xvmc_create_context_priv_data.3 \ +xcb_xvmc_create_context_priv_data_end.3 \ +xcb_xvmc_create_context_priv_data_length.3 \ +xcb_xvmc_create_context_reply.3 \ +xcb_xvmc_create_context_unchecked.3 \ +xcb_xvmc_create_subpicture.3 \ +xcb_xvmc_create_subpicture_priv_data.3 \ +xcb_xvmc_create_subpicture_priv_data_end.3 \ +xcb_xvmc_create_subpicture_priv_data_length.3 \ +xcb_xvmc_create_subpicture_reply.3 \ +xcb_xvmc_create_subpicture_unchecked.3 \ +xcb_xvmc_create_surface.3 \ +xcb_xvmc_create_surface_priv_data.3 \ +xcb_xvmc_create_surface_priv_data_end.3 \ +xcb_xvmc_create_surface_priv_data_length.3 \ +xcb_xvmc_create_surface_reply.3 \ +xcb_xvmc_create_surface_unchecked.3 \ +xcb_xvmc_destroy_context.3 \ +xcb_xvmc_destroy_context_checked.3 \ +xcb_xvmc_destroy_subpicture.3 \ +xcb_xvmc_destroy_subpicture_checked.3 \ +xcb_xvmc_destroy_surface.3 \ +xcb_xvmc_destroy_surface_checked.3 \ +xcb_xvmc_list_subpicture_types.3 \ +xcb_xvmc_list_subpicture_types_reply.3 \ +xcb_xvmc_list_subpicture_types_types.3 \ +xcb_xvmc_list_subpicture_types_types_iterator.3 \ +xcb_xvmc_list_subpicture_types_types_length.3 \ +xcb_xvmc_list_subpicture_types_unchecked.3 \ +xcb_xvmc_list_surface_types.3 \ +xcb_xvmc_list_surface_types_reply.3 \ +xcb_xvmc_list_surface_types_surfaces.3 \ +xcb_xvmc_list_surface_types_surfaces_iterator.3 \ +xcb_xvmc_list_surface_types_surfaces_length.3 \ +xcb_xvmc_list_surface_types_unchecked.3 \ +xcb_xvmc_query_version.3 \ +xcb_xvmc_query_version_reply.3 \ +xcb_xvmc_query_version_unchecked.3 \ diff --git a/x11/libxcb/pkg-plist b/x11/libxcb/pkg-plist index dc30e21..80bc7ab 100644 --- a/x11/libxcb/pkg-plist +++ b/x11/libxcb/pkg-plist @@ -18,6 +18,7 @@ include/xcb/xcbext.h include/xcb/xevie.h include/xcb/xf86dri.h include/xcb/xfixes.h +include/xcb/xkb.h include/xcb/xinerama.h include/xcb/xinput.h include/xcb/xprint.h diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile index c957f78..304bde7 100644 --- a/x11/libxkbfile/Makefile +++ b/x11/libxkbfile/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: libxkbfile -# Date Created: 7 May 2004 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libxkbfile -PORTVERSION= 1.0.7 +PORTVERSION= 1.0.8 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libxkbfile/distinfo b/x11/libxkbfile/distinfo index 52a82f0..5d954fc 100644 --- a/x11/libxkbfile/distinfo +++ b/x11/libxkbfile/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 667e370a733b96b647a40211430cfc41dd2160c9a2aa701d0c839c626d0f2ae5 -SIZE (xorg/lib/libxkbfile-1.0.7.tar.bz2) = 317847 +SHA256 (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a +SIZE (xorg/lib/libxkbfile-1.0.8.tar.bz2) = 335788 diff --git a/x11/libxkbui/Makefile b/x11/libxkbui/Makefile index c4cb335..0be3234 100644 --- a/x11/libxkbui/Makefile +++ b/x11/libxkbui/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: libxkbui -# Date Created: 8 Feb 2006 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libxkbui PORTVERSION= 1.0.2 diff --git a/x11/listres/Makefile b/x11/listres/Makefile index ddba419..6423f48 100644 --- a/x11/listres/Makefile +++ b/x11/listres/Makefile @@ -8,7 +8,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= List resources in widgets XORG_CAT= app -USE_XORG= xproto xt xmu xaw xorg-macros +USE_XORG= xproto xt xmu xaw PLIST_FILES= bin/listres diff --git a/x11/luit/Makefile b/x11/luit/Makefile index b9e1a3c..7fe634d 100644 --- a/x11/luit/Makefile +++ b/x11/luit/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: luit -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= luit PORTVERSION= 1.1.0 diff --git a/x11/mkcomposecache/Makefile b/x11/mkcomposecache/Makefile index 14e4ee2..e630296b 100644 --- a/x11/mkcomposecache/Makefile +++ b/x11/mkcomposecache/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: mkcomposecache -# Date Created: 30 Jan 2007 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= mkcomposecache PORTVERSION= 1.2.1 diff --git a/x11/ooxcb/Makefile b/x11/ooxcb/Makefile index 810702e..923d739 100644 --- a/x11/ooxcb/Makefile +++ b/x11/ooxcb/Makefile @@ -1,9 +1,5 @@ -# New ports collection Makefile for: ooxcb -# Date created: 26 June 2009 -# Whom: gahr -# +# Created by: gahr # $FreeBSD$ -# PORTNAME= ooxcb PORTVERSION= 1.1 @@ -13,9 +9,8 @@ MASTER_SITES= http://samurai-x.org/downloads/ MAINTAINER= gahr@FreeBSD.org COMMENT= Python binding to the X server using xcb -LIB_DEPENDS= xcb.2:${PORTSDIR}/x11/libxcb - USE_PYTHON= yes +USE_XORG= xcb USE_PYDISTUTILS=easy_install PLIST_FILES= ${PYTHON_SITELIBDIR:S/${LOCALBASE}\///}/${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile index 4d57c99..dd8745a 100644 --- a/x11/pixman/Makefile +++ b/x11/pixman/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pixman -PORTVERSION= 0.24.2 +PORTVERSION= 0.28.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -17,7 +17,7 @@ OPTIONS_DEFINE= SIMD .include <bsd.port.options.mk> -.if !${PORT_OPTIONS:MSIMD} +.if ! {PORT_OPTIONS:MSIMD} CONFIGURE_ARGS= --disable-vmx --disable-arm-simd . if ! ${MACHINE_CPU:Mmmx} CONFIGURE_ARGS+= --disable-mmx diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo index c94445c..60b30c8 100644 --- a/x11/pixman/distinfo +++ b/x11/pixman/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/pixman-0.24.2.tar.bz2) = 32f74f3e3c1feea33e6ad3e2fd66cb3eb816805c384b346ea1636a87c9057dbf -SIZE (xorg/lib/pixman-0.24.2.tar.bz2) = 467979 +SHA256 (xorg/lib/pixman-0.28.2.tar.bz2) = 583686afbfa5a1dfc40a21e888a3eacf31fe0e02469d20b821b5d8f719165a51 +SIZE (xorg/lib/pixman-0.28.2.tar.bz2) = 625655 diff --git a/x11/printproto/Makefile b/x11/printproto/Makefile index afb368e..a7366ca 100644 --- a/x11/printproto/Makefile +++ b/x11/printproto/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: printproto -# Date Created: 08 Aug 2005 -# Whom: Dejan Lesjak <lesi@FreeBSD.org> -# +# Created by: Dejan Lesjak <lesi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= printproto PORTVERSION= 1.0.5 diff --git a/x11/randrproto/Makefile b/x11/randrproto/Makefile index 532c6da..e1d3b5f 100644 --- a/x11/randrproto/Makefile +++ b/x11/randrproto/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: randrproto -# Date Created: 08 Aug 2005 -# Whom: Dejan Lesjak <lesi@FreeBSD.org> -# +# Created by: Dejan Lesjak <lesi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= randrproto -PORTVERSION= 1.3.2 +PORTVERSION= 1.4.0 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/randrproto/distinfo b/x11/randrproto/distinfo index 5224562..0069318 100644 --- a/x11/randrproto/distinfo +++ b/x11/randrproto/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/proto/randrproto-1.3.2.tar.bz2) = d90d00612cc49292bd8d9dc19efb1c9187385fbe87590d7279a02e5e1066dc71 -SIZE (xorg/proto/randrproto-1.3.2.tar.bz2) = 122915 +SHA256 (xorg/proto/randrproto-1.4.0.tar.bz2) = 85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf +SIZE (xorg/proto/randrproto-1.4.0.tar.bz2) = 133300 diff --git a/x11/recordproto/Makefile b/x11/recordproto/Makefile index 8da0e5b..9985790 100644 --- a/x11/recordproto/Makefile +++ b/x11/recordproto/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: recordproto -# Date Created: 06 Feb 2006 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= recordproto -PORTVERSION= 1.14.1 +PORTVERSION= 1.14.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/recordproto/distinfo b/x11/recordproto/distinfo index e425cf2..6c42289 100644 --- a/x11/recordproto/distinfo +++ b/x11/recordproto/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/proto/recordproto-1.14.1.tar.bz2) = b27eb043d3e618bc1f8b704a64f8ae218ea00e7f36f9107ac41d41940773098d -SIZE (xorg/proto/recordproto-1.14.1.tar.bz2) = 112238 +SHA256 (xorg/proto/recordproto-1.14.2.tar.bz2) = a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370 +SIZE (xorg/proto/recordproto-1.14.2.tar.bz2) = 123033 diff --git a/x11/renderproto/Makefile b/x11/renderproto/Makefile index 47bd933..ff5359f 100644 --- a/x11/renderproto/Makefile +++ b/x11/renderproto/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: renderproto -# Date Created: 08 Aug 2005 -# Whom: Dejan Lesjak <lesi@FreeBSD.org> -# +# Created by: Dejan Lesjak <lesi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= renderproto PORTVERSION= 0.11.1 diff --git a/x11/resourceproto/Makefile b/x11/resourceproto/Makefile index 13fc552..7f0d91b 100644 --- a/x11/resourceproto/Makefile +++ b/x11/resourceproto/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: resourceproto -# Date Created: 08 Aug 2005 -# Whom: Dejan Lesjak <lesi@FreeBSD.org> -# +# Created by: Dejan Lesjak <lesi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= resourceproto PORTVERSION= 1.2.0 diff --git a/x11/rstart/Makefile b/x11/rstart/Makefile index 0925acc..1be4387 100644 --- a/x11/rstart/Makefile +++ b/x11/rstart/Makefile @@ -8,7 +8,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Sample implementation of a Remote Start client XORG_CAT= app -USE_XORG= x11 xorg-macros +USE_XORG= x11 MAN1= rstart.1 rstartd.1 diff --git a/x11/scripts/Makefile b/x11/scripts/Makefile index e6342c3..38861cc 100644 --- a/x11/scripts/Makefile +++ b/x11/scripts/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: scripts -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= scripts PORTVERSION= 1.0.1 diff --git a/x11/scrnsaverproto/Makefile b/x11/scrnsaverproto/Makefile index 194f8ec..7427974 100644 --- a/x11/scrnsaverproto/Makefile +++ b/x11/scrnsaverproto/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: scrnsaverproto -# Date Created: 21 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= scrnsaverproto -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/scrnsaverproto/distinfo b/x11/scrnsaverproto/distinfo index 3ee8c29..3d1e15e 100644 --- a/x11/scrnsaverproto/distinfo +++ b/x11/scrnsaverproto/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = fad2f73cac136fcddd311d27a14ac7e519a9bec6ab272490d9c9b363556024f1 -SIZE (xorg/proto/scrnsaverproto-1.2.1.tar.bz2) = 107997 +SHA256 (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65 +SIZE (xorg/proto/scrnsaverproto-1.2.2.tar.bz2) = 118820 diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile index ee1b12a..88bc9e0 100644 --- a/x11/sessreg/Makefile +++ b/x11/sessreg/Makefile @@ -8,7 +8,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Manage utmp/wtmp entries for non-init X clients XORG_CAT= app -USE_XORG= x11 xorg-macros +USE_XORG= x11 PLIST_FILES= bin/sessreg diff --git a/x11/slim/Makefile b/x11/slim/Makefile index cfd7211..23378c3 100644 --- a/x11/slim/Makefile +++ b/x11/slim/Makefile @@ -19,11 +19,10 @@ LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \ freetype:${PORTSDIR}/print/freetype2 \ ck-connector:${PORTSDIR}/sysutils/consolekit \ expat:${PORTSDIR}/textproc/expat2 \ - xcb:${PORTSDIR}/x11/libxcb \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig USES= cmake pkgconfig -USE_XORG= ice sm x11 xau xdmcp xext xft xmu xorg-server xrender xt +USE_XORG= ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrender xt USE_RC_SUBR= slim SUB_FILES= pkg-message diff --git a/x11/smproxy/Makefile b/x11/smproxy/Makefile index 76d204e..3f12ed8 100644 --- a/x11/smproxy/Makefile +++ b/x11/smproxy/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: smproxy -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= smproxy PORTVERSION= 1.0.5 diff --git a/x11/trapproto/Makefile b/x11/trapproto/Makefile index c9fbcd9..dd42adb 100644 --- a/x11/trapproto/Makefile +++ b/x11/trapproto/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: trapproto -# Date Created: 06 Feb 2006 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= trapproto PORTVERSION= 3.4.3 diff --git a/x11/videoproto/Makefile b/x11/videoproto/Makefile index f3119f2..58ee66a 100644 --- a/x11/videoproto/Makefile +++ b/x11/videoproto/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: videoproto -# Date Created: 09 Aug 2005 -# Whom: Dejan Lesjak <lesi@FreeBSD.org> -# +# Created by: Dejan Lesjak <lesi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= videoproto PORTVERSION= 2.3.1 diff --git a/x11/viewres/Makefile b/x11/viewres/Makefile index 36cc6cf..5949e60 100644 --- a/x11/viewres/Makefile +++ b/x11/viewres/Makefile @@ -8,7 +8,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Graphical class browser for Xt XORG_CAT= app -USE_XORG= xt xaw xorg-macros +USE_XORG= xt xaw MAN1= viewres.1 diff --git a/x11/x11perf/Makefile b/x11/x11perf/Makefile index b2cf649..d09031b 100644 --- a/x11/x11perf/Makefile +++ b/x11/x11perf/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: x11perf -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= x11perf PORTVERSION= 1.5.4 diff --git a/x11/xbacklight/Makefile b/x11/xbacklight/Makefile index ef35bf6..f1e0f6e 100644 --- a/x11/xbacklight/Makefile +++ b/x11/xbacklight/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xbacklight -# Date Created: 11 Sep 2007 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xbacklight PORTVERSION= 1.1.2 diff --git a/x11/xbiff/Makefile b/x11/xbiff/Makefile index b62dabd..1350b0e 100644 --- a/x11/xbiff/Makefile +++ b/x11/xbiff/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xbiff -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xbiff PORTVERSION= 1.0.3 diff --git a/x11/xbitmaps/Makefile b/x11/xbitmaps/Makefile index f0e5681..872fb52 100644 --- a/x11/xbitmaps/Makefile +++ b/x11/xbitmaps/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xbitmaps -# Date Created: 17 Feb 2006 -# Whom: Dejan Lesjak <lesi@FreeBSD.org> -# +# Created by: Dejan Lesjak <lesi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xbitmaps PORTVERSION= 1.1.1 diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile index ecbc560..eba3f6d 100644 --- a/x11/xcb-proto/Makefile +++ b/x11/xcb-proto/Makefile @@ -1,25 +1,18 @@ -# New ports collection makefile for: xcb-proto -# Date Created: 2006-08-23 -# Whom: Ashish Shukla <wahjava@gmail.com> -# +# Created by: Ashish Shukla <wahjava@gmail.com> # $FreeBSD$ -# PORTNAME= xcb-proto -PORTVERSION= 1.7.1 +PORTVERSION= 1.8 CATEGORIES= x11 python -MASTER_SITES= http://xcb.freedesktop.org/dist/ \ - http://distfiles.pirateparty.in/%SUBDIR%/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= ashish +MASTER_SITES= http://xcb.freedesktop.org/dist/ -MAINTAINER= ashish@FreeBSD.org +MAINTAINER= x11@FreeBSD.org COMMENT= The X protocol C-language Binding (XCB) protocol BUILD_DEPENDS= xmllint:${PORTSDIR}/textproc/libxml2 USE_BZIP2= yes -USES= pathfix +USES= pathfix USE_PYTHON= 2.5+ GNU_CONFIGURE= yes diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo index b9618da..e92e4ee 100644 --- a/x11/xcb-proto/distinfo +++ b/x11/xcb-proto/distinfo @@ -1,2 +1,2 @@ -SHA256 (xcb-proto-1.7.1.tar.bz2) = ad5d99887d811c9817f1916d7b3f5dc6c21414c093256cbeffb945aacdc34437 -SIZE (xcb-proto-1.7.1.tar.bz2) = 106040 +SHA256 (xcb-proto-1.8.tar.bz2) = 233d16c7a019235b3092111e7c11429119357eb13754a607b75eea04453121b0 +SIZE (xcb-proto-1.8.tar.bz2) = 125072 diff --git a/x11/xcb-util-image/Makefile b/x11/xcb-util-image/Makefile index e5cc172..b5d61a1 100644 --- a/x11/xcb-util-image/Makefile +++ b/x11/xcb-util-image/Makefile @@ -8,13 +8,13 @@ MASTER_SITES= http://xcb.freedesktop.org/dist/ MAINTAINER= garga@FreeBSD.org COMMENT= A port of Xlib's XImage and XShmImage functions -LIB_DEPENDS= xcb:${PORTSDIR}/x11/libxcb \ - xcb-util:${PORTSDIR}/x11/xcb-util +LIB_DEPENDS= xcb-util:${PORTSDIR}/x11/xcb-util #BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes +USE_XORG= xcb xorg-macros #USE_XORG= xau xdmcp #USE_AUTOTOOLS= libtool diff --git a/x11/xcb-util-keysyms/Makefile b/x11/xcb-util-keysyms/Makefile index 5d2be47..007e87b 100644 --- a/x11/xcb-util-keysyms/Makefile +++ b/x11/xcb-util-keysyms/Makefile @@ -8,13 +8,13 @@ MASTER_SITES= http://xcb.freedesktop.org/dist/ MAINTAINER= garga@FreeBSD.org COMMENT= Standard X key constants and conversion to/from keycodes -LIB_DEPENDS= xcb:${PORTSDIR}/x11/libxcb \ - xcb-util:${PORTSDIR}/x11/xcb-util +LIB_DEPENDS= xcb-util:${PORTSDIR}/x11/xcb-util #BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes +USE_XORG= xcb xorg-macros #USE_XORG= xau xdmcp #USE_AUTOTOOLS= libtool diff --git a/x11/xcb-util-renderutil/Makefile b/x11/xcb-util-renderutil/Makefile index c8749e9..b8c3014 100644 --- a/x11/xcb-util-renderutil/Makefile +++ b/x11/xcb-util-renderutil/Makefile @@ -8,12 +8,12 @@ MASTER_SITES= http://xcb.freedesktop.org/dist/ MAINTAINER= garga@FreeBSD.org COMMENT= Convenience functions for the Render extension -LIB_DEPENDS= xcb:${PORTSDIR}/x11/libxcb \ - xcb-util:${PORTSDIR}/x11/xcb-util +LIB_DEPENDS= xcb-util:${PORTSDIR}/x11/xcb-util #BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf USE_BZIP2= yes USE_GMAKE= yes +USE_XORG= xcb xorg-macros USE_LDCONFIG= yes #USE_XORG= xau xdmcp #USE_AUTOTOOLS= libtool diff --git a/x11/xcb-util-wm/Makefile b/x11/xcb-util-wm/Makefile index aa44f5e..5fa88f6 100644 --- a/x11/xcb-util-wm/Makefile +++ b/x11/xcb-util-wm/Makefile @@ -8,13 +8,13 @@ MASTER_SITES= http://xcb.freedesktop.org/dist/ MAINTAINER= garga@FreeBSD.org COMMENT= Framework for window manager implementation -LIB_DEPENDS= xcb:${PORTSDIR}/x11/libxcb \ - xcb-util:${PORTSDIR}/x11/xcb-util +LIB_DEPENDS= xcb-util:${PORTSDIR}/x11/xcb-util #BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes +USE_XORG= xcb xorg-macros #USE_XORG= xau xdmcp #USE_AUTOTOOLS= libtool diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile index 59e252f..6499b05 100644 --- a/x11/xcb-util/Makefile +++ b/x11/xcb-util/Makefile @@ -11,12 +11,10 @@ MASTER_SITES= http://xcb.freedesktop.org/dist/ MAINTAINER= garga@FreeBSD.org COMMENT= A module with libxcb/libX11 extension/replacement libraries -LIB_DEPENDS= xcb:${PORTSDIR}/x11/libxcb - USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes -USE_XORG= xau xdmcp +USE_XORG= xau xcb xdmcp xorg-macros USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes diff --git a/x11/xclipboard/Makefile b/x11/xclipboard/Makefile index aac2518..883ec17 100644 --- a/x11/xclipboard/Makefile +++ b/x11/xclipboard/Makefile @@ -11,7 +11,7 @@ COMMENT= X clipboard client LICENSE= MIT XORG_CAT= app -USE_XORG= xt xaw xorg-macros +USE_XORG= xt xaw MAN1= xclipboard.1 xcutsel.1 diff --git a/x11/xcmiscproto/Makefile b/x11/xcmiscproto/Makefile index 2785200..73b3e5e 100644 --- a/x11/xcmiscproto/Makefile +++ b/x11/xcmiscproto/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: xcmiscproto -# Date Created: 08 Aug 2005 -# Whom: Dejan Lesjak <lesi@FreeBSD.org> -# +# Created by: Dejan Lesjak <lesi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xcmiscproto -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xcmiscproto/distinfo b/x11/xcmiscproto/distinfo index 8570cf6..b38fec5 100644 --- a/x11/xcmiscproto/distinfo +++ b/x11/xcmiscproto/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 730e27e22bfb99409bc364233f3f766f5163de0cbf2edad33738cfdf55f04c15 -SIZE (xorg/proto/xcmiscproto-1.2.1.tar.bz2) = 101926 +SHA256 (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df +SIZE (xorg/proto/xcmiscproto-1.2.2.tar.bz2) = 112486 diff --git a/x11/xdbedizzy/Makefile b/x11/xdbedizzy/Makefile index 676e3fe..e8c0681 100644 --- a/x11/xdbedizzy/Makefile +++ b/x11/xdbedizzy/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xdbedizzy -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xdbedizzy PORTVERSION= 1.1.0 diff --git a/x11/xditview/Makefile b/x11/xditview/Makefile index 3df19f2..6f79c72 100644 --- a/x11/xditview/Makefile +++ b/x11/xditview/Makefile @@ -10,7 +10,7 @@ COMMENT= Display ditroff output LICENSE= MIT XORG_CAT= app -USE_XORG= xt xaw xorg-macros +USE_XORG= xt xaw MAN1= xditview.1 diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile index b75e4ea..68affd5 100644 --- a/x11/xdpyinfo/Makefile +++ b/x11/xdpyinfo/Makefile @@ -10,8 +10,7 @@ COMMENT= Display information utility for X LICENSE= MIT XORG_CAT= app -LIB_DEPENDS= xcb:${PORTSDIR}/x11/libxcb -USE_XORG= dmx x11 xcomposite xext xinerama xorg-macros xproto xrender \ +USE_XORG= dmx x11 xcb xcomposite xext xinerama xproto xrender \ xtst xxf86dga xxf86misc xxf86vm PLIST_FILES= bin/xdpyinfo diff --git a/x11/xdriinfo/Makefile b/x11/xdriinfo/Makefile index 429a606..8f636c3 100644 --- a/x11/xdriinfo/Makefile +++ b/x11/xdriinfo/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xdriinfo -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xdriinfo PORTVERSION= 1.0.4 diff --git a/x11/xedit/Makefile b/x11/xedit/Makefile index 1937584..d4b828c 100644 --- a/x11/xedit/Makefile +++ b/x11/xedit/Makefile @@ -8,7 +8,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Simple text editor for X XORG_CAT= app -USE_XORG= xt xaw7 xorg-macros +USE_XORG= xt xaw7 MAN1= xedit.1 diff --git a/x11/xextproto/Makefile b/x11/xextproto/Makefile index 7c69b65..2777cf8 100644 --- a/x11/xextproto/Makefile +++ b/x11/xextproto/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: xextproto -# Date Created: 07 Aug 2005 -# Whom: Dejan Lesjak <lesi@FreeBSD.org> -# +# Created by: Dejan Lesjak <lesi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xextproto -PORTVERSION= 7.2.0 +PORTVERSION= 7.2.1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xextproto/distinfo b/x11/xextproto/distinfo index 1d242d9..cadb3db 100644 --- a/x11/xextproto/distinfo +++ b/x11/xextproto/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/proto/xextproto-7.2.0.tar.bz2) = d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5 -SIZE (xorg/proto/xextproto-7.2.0.tar.bz2) = 207724 +SHA256 (xorg/proto/xextproto-7.2.1.tar.bz2) = 7c53b105407ef3b2eb180a361bd672c1814524a600166a0a7dbbe76b97556d1a +SIZE (xorg/proto/xextproto-7.2.1.tar.bz2) = 229282 diff --git a/x11/xeyes/Makefile b/x11/xeyes/Makefile index 2054a22..7555ffc 100644 --- a/x11/xeyes/Makefile +++ b/x11/xeyes/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xeyes -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xeyes PORTVERSION= 1.1.1 diff --git a/x11/xf86dga/Makefile b/x11/xf86dga/Makefile index 7d75259..878cd5e 100644 --- a/x11/xf86dga/Makefile +++ b/x11/xf86dga/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xf86dga -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xf86dga PORTVERSION= 1.0.3 diff --git a/x11/xf86dgaproto/Makefile b/x11/xf86dgaproto/Makefile index f264ab5..2c5db9a 100644 --- a/x11/xf86dgaproto/Makefile +++ b/x11/xf86dgaproto/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xf86bigfontproto -# Date Created: 06 Feb 2006 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xf86dgaproto PORTVERSION= 2.1 diff --git a/x11/xf86driproto/Makefile b/x11/xf86driproto/Makefile index d1f9d2f..faf570d 100644 --- a/x11/xf86driproto/Makefile +++ b/x11/xf86driproto/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xf86bigfontproto -# Date Created: 06 Feb 2006 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xf86driproto PORTVERSION= 2.1.1 diff --git a/x11/xf86miscproto/Makefile b/x11/xf86miscproto/Makefile index db9b6a2..45415f2 100644 --- a/x11/xf86miscproto/Makefile +++ b/x11/xf86miscproto/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xf86bigfontproto -# Date Created: 06 Feb 2006 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xf86miscproto PORTVERSION= 0.9.3 diff --git a/x11/xf86rushproto/Makefile b/x11/xf86rushproto/Makefile index 95916a3..ced306f 100644 --- a/x11/xf86rushproto/Makefile +++ b/x11/xf86rushproto/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xf86rushproto -# Date Created: 06 Feb 2006 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xf86rushproto PORTVERSION= 1.1.2 diff --git a/x11/xf86vidmodeproto/Makefile b/x11/xf86vidmodeproto/Makefile index 951d509..c892870 100644 --- a/x11/xf86vidmodeproto/Makefile +++ b/x11/xf86vidmodeproto/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xf86vidmodeproto -# Date Created: 06 Feb 2006 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xf86vidmodeproto PORTVERSION= 2.3.1 diff --git a/x11/xfd/Makefile b/x11/xfd/Makefile index 275411b..8a910f5 100644 --- a/x11/xfd/Makefile +++ b/x11/xfd/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xfd -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xfd -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xfd/distinfo b/x11/xfd/distinfo index ca9b01d..87220a4 100644 --- a/x11/xfd/distinfo +++ b/x11/xfd/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/app/xfd-1.1.0.tar.bz2) = e76db409ac46bd81c80348bea816d72065f36c2ef3d78a0da37ada7ffbeaea1a -SIZE (xorg/app/xfd-1.1.0.tar.bz2) = 121204 +SHA256 (xorg/app/xfd-1.1.1.tar.bz2) = 3fbef0d5ed6dc088017df156e748d187b2d1aaedc3de7ea96e505ea6d1af7b73 +SIZE (xorg/app/xfd-1.1.1.tar.bz2) = 130547 diff --git a/x11/xfindproxy/Makefile b/x11/xfindproxy/Makefile index 82ef177..6f3bce5 100644 --- a/x11/xfindproxy/Makefile +++ b/x11/xfindproxy/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xfindproxy -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xfindproxy PORTVERSION= 1.0.2 diff --git a/x11/xfwp/Makefile b/x11/xfwp/Makefile index 85ed265..96d82b7 100644 --- a/x11/xfwp/Makefile +++ b/x11/xfwp/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xfwp -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xfwp PORTVERSION= 1.0.2 diff --git a/x11/xineramaproto/Makefile b/x11/xineramaproto/Makefile index 28a39cb..89d9efa 100644 --- a/x11/xineramaproto/Makefile +++ b/x11/xineramaproto/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xineramaproto -# Date Created: 06 Feb 2006 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xineramaproto PORTVERSION= 1.2.1 diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile index 52d388f..dd6ca00 100644 --- a/x11/xinit/Makefile +++ b/x11/xinit/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xinit -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xinit PORTVERSION= 1.3.2 diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile index 35050d5..460806b 100644 --- a/x11/xinput/Makefile +++ b/x11/xinput/Makefile @@ -1,19 +1,15 @@ -# New ports collection makefile for: xinput -# Date created: 05 July 2003 -# Whom: Martin Ranne <gasp@ridcully.dnsalias.org> -# +# Created by: Martin Ranne <gasp@ridcully.dnsalias.org> # $FreeBSD$ -# PORTNAME= xinput -PORTVERSION= 1.5.4 +PORTVERSION= 1.6.0 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Very useful utility for configuring and testing XInput devices XORG_CAT= app -USE_XORG= inputproto x11 xi xext +USE_XORG= inputproto x11 xi xext xrandr xinerama PLIST_FILES= bin/xinput diff --git a/x11/xinput/distinfo b/x11/xinput/distinfo index bc8aba2..2ed8d9d 100644 --- a/x11/xinput/distinfo +++ b/x11/xinput/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/app/xinput-1.5.4.tar.bz2) = a8da86f0d7c8ac0c4434e3140ae7f208fc2b35869e5adf10971eef7cb77f4360 -SIZE (xorg/app/xinput-1.5.4.tar.bz2) = 134702 +SHA256 (xorg/app/xinput-1.6.0.tar.bz2) = 4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e +SIZE (xorg/app/xinput-1.6.0.tar.bz2) = 146209 diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile index 9434ca6..72f340e 100644 --- a/x11/xkbcomp/Makefile +++ b/x11/xkbcomp/Makefile @@ -10,7 +10,7 @@ COMMENT= Compile XKB keyboard description LICENSE= MIT XORG_CAT= app -USE_XORG= x11 xkbfile xorg-macros +USE_XORG= x11 xkbfile USES= pathfix PLIST_FILES= bin/xkbcomp \ diff --git a/x11/xkbprint/Makefile b/x11/xkbprint/Makefile index 56f1935..36282db 100644 --- a/x11/xkbprint/Makefile +++ b/x11/xkbprint/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xkbprint -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xkbprint PORTVERSION= 1.0.3 diff --git a/x11/xkbutils/Makefile b/x11/xkbutils/Makefile index 66fa645..964182b 100644 --- a/x11/xkbutils/Makefile +++ b/x11/xkbutils/Makefile @@ -10,7 +10,7 @@ COMMENT= XKB utility demos LICENSE= MIT XORG_CAT= app -USE_XORG= xkbfile x11 xaw inputproto xorg-macros +USE_XORG= xkbfile x11 xaw inputproto MAN1= xkbbell.1 xkbvleds.1 xkbwatch.1 diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile index c92b694..412970b 100644 --- a/x11/xkeyboard-config/Makefile +++ b/x11/xkeyboard-config/Makefile @@ -1,12 +1,12 @@ -# Created by: Florent Thoumie <flz@FreeBSD.org> # $FreeBSD$ PORTNAME= xkeyboard-config -PORTVERSION= 2.5.1 +PORTVERSION= 2.8 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X Keyboard Configuration Database +MASTER_SITE_SUBDIR= individual/${XORG_CAT}/${PORTNAME} LICENSE= MIT @@ -14,12 +14,14 @@ BUILD_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp \ xsltproc:${PORTSDIR}/textproc/libxslt XORG_CAT= data -USES= pathfix USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= intlhack +USES= pathfix USE_PERL5_BUILD=yes GNU_CONFIGURE= yes +MAKE_JOBS_UNSAFE=yes + CONFIGURE_ARGS= --with-xkb-base=${PREFIX}/share/X11/xkb \ --with-xkb-rules-symlink=xorg CPPFLAGS+= -I${LOCALBASE}/include @@ -33,10 +35,7 @@ MAN7= xkeyboard-config.7 USES+= gettext iconv PLIST_SUB+= NLS="" .else -CONFIGURE_ARGS+= --disable-nls -CONFIGURE_ENV+= MSGFMT="/bin/echo '(GNU '" \ - XGETTEXT="/bin/echo '(GNU '" \ - MSGMERGE="/bin/echo '(GNU '" +CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo index a1b7661..683ece1 100644 --- a/x11/xkeyboard-config/distinfo +++ b/x11/xkeyboard-config/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92 -SIZE (xorg/data/xkeyboard-config-2.5.1.tar.bz2) = 833871 +SHA256 (xorg/data/xkeyboard-config-2.8.tar.bz2) = 4e1cf5468d488aaf320ddfd439e03cbda0b213550fd734026d23138e4b2078ae +SIZE (xorg/data/xkeyboard-config-2.8.tar.bz2) = 862678 diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist index b36678f..6529344 100644 --- a/x11/xkeyboard-config/pkg-plist +++ b/x11/xkeyboard-config/pkg-plist @@ -1,28 +1,23 @@ libdata/pkgconfig/xkeyboard-config.pc -share/X11/xkb/compat.dir share/X11/xkb/compat/README share/X11/xkb/compat/accessx share/X11/xkb/compat/basic share/X11/xkb/compat/caps 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/olpc share/X11/xkb/compat/pc share/X11/xkb/compat/pc98 share/X11/xkb/compat/xfree86 share/X11/xkb/compat/xtest share/X11/xkb/compiled -share/X11/xkb/geometry.dir share/X11/xkb/geometry/README share/X11/xkb/geometry/amiga share/X11/xkb/geometry/ataritt @@ -52,7 +47,6 @@ share/X11/xkb/geometry/sun share/X11/xkb/geometry/thinkpad share/X11/xkb/geometry/typematrix share/X11/xkb/geometry/winbook -share/X11/xkb/keycodes.dir share/X11/xkb/keycodes/README share/X11/xkb/keycodes/aliases share/X11/xkb/keycodes/amiga @@ -72,49 +66,6 @@ share/X11/xkb/keycodes/sony share/X11/xkb/keycodes/sun share/X11/xkb/keycodes/xfree86 share/X11/xkb/keycodes/xfree98 -share/X11/xkb/keymap.dir -share/X11/xkb/keymap/README -share/X11/xkb/keymap/amiga -share/X11/xkb/keymap/ataritt -share/X11/xkb/keymap/digital_vndr/us -share/X11/xkb/keymap/macintosh -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/sony -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/xfree86 -share/X11/xkb/keymap/xfree98 share/X11/xkb/rules/README share/X11/xkb/rules/base share/X11/xkb/rules/base.extras.xml @@ -129,13 +80,6 @@ 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/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.dir -share/X11/xkb/symbols/ad share/X11/xkb/symbols/af share/X11/xkb/symbols/al share/X11/xkb/symbols/altwin @@ -230,6 +174,7 @@ 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/mao +share/X11/xkb/symbols/md share/X11/xkb/symbols/me share/X11/xkb/symbols/mk share/X11/xkb/symbols/ml @@ -258,6 +203,11 @@ share/X11/xkb/symbols/ru share/X11/xkb/symbols/rupeesign share/X11/xkb/symbols/se share/X11/xkb/symbols/sgi_vndr/jp +share/X11/xkb/symbols/sharp_vndr/sl-c3x00 +share/X11/xkb/symbols/sharp_vndr/ws003sh +share/X11/xkb/symbols/sharp_vndr/ws007sh +share/X11/xkb/symbols/sharp_vndr/ws011sh +share/X11/xkb/symbols/sharp_vndr/ws020sh share/X11/xkb/symbols/shift share/X11/xkb/symbols/si share/X11/xkb/symbols/sk @@ -293,7 +243,6 @@ share/X11/xkb/symbols/sun_vndr/se share/X11/xkb/symbols/sun_vndr/sk share/X11/xkb/symbols/sun_vndr/solaris 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/ua share/X11/xkb/symbols/sun_vndr/us @@ -313,7 +262,6 @@ share/X11/xkb/symbols/vn share/X11/xkb/symbols/xfree68_vndr/amiga share/X11/xkb/symbols/xfree68_vndr/ataritt share/X11/xkb/symbols/za -share/X11/xkb/types.dir share/X11/xkb/types/README share/X11/xkb/types/basic share/X11/xkb/types/cancel @@ -343,6 +291,7 @@ share/X11/xkb/types/pc %%NLS%%share/locale/fr/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/gl/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/hu/LC_MESSAGES/xkeyboard-config.mo +%%NLS%%share/locale/hr/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/id/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/it/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/ja/LC_MESSAGES/xkeyboard-config.mo @@ -366,17 +315,18 @@ share/X11/xkb/types/pc %%NLS%%share/locale/vi/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrmtry share/locale/ky/LC_MESSAGES -@dirrmtry share/locale/ky -@dirrmtry share/locale/crh/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/rw +%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ky +%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/crh @exec mkdir -p /var/lib/xkb -@dirrmtry share/locale/crh @dirrm share/X11/xkb/types @dirrm share/X11/xkb/symbols/xfree68_vndr @dirrm share/X11/xkb/symbols/sun_vndr @dirrm share/X11/xkb/symbols/sony_vndr +@dirrm share/X11/xkb/symbols/sharp_vndr @dirrm share/X11/xkb/symbols/sgi_vndr @dirrm share/X11/xkb/symbols/nokia_vndr @dirrm share/X11/xkb/symbols/nec_vndr @@ -385,12 +335,7 @@ share/X11/xkb/types/pc @dirrm share/X11/xkb/symbols/fujitsu_vndr @dirrm share/X11/xkb/symbols/digital_vndr @dirrm share/X11/xkb/symbols -@dirrm share/X11/xkb/semantics @dirrm share/X11/xkb/rules -@dirrm share/X11/xkb/keymap/sun_vndr -@dirrm share/X11/xkb/keymap/sgi_vndr -@dirrm share/X11/xkb/keymap/digital_vndr -@dirrm share/X11/xkb/keymap @dirrm share/X11/xkb/keycodes/sgi_vndr @dirrm share/X11/xkb/keycodes/digital_vndr @dirrm share/X11/xkb/keycodes diff --git a/x11/xkill/Makefile b/x11/xkill/Makefile index 812062c..23019a4 100644 --- a/x11/xkill/Makefile +++ b/x11/xkill/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xkill -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xkill PORTVERSION= 1.0.3 diff --git a/x11/xload/Makefile b/x11/xload/Makefile index 5d6a86a..cc3038c 100644 --- a/x11/xload/Makefile +++ b/x11/xload/Makefile @@ -10,7 +10,7 @@ COMMENT= System load average display for X LICENSE= MIT XORG_CAT= app -USE_XORG= xt xaw xorg-macros +USE_XORG= xt xaw MAN1= xload.1 diff --git a/x11/xlogo/Makefile b/x11/xlogo/Makefile index c43f5ea..1004607 100644 --- a/x11/xlogo/Makefile +++ b/x11/xlogo/Makefile @@ -10,7 +10,7 @@ COMMENT= Displays the X Window System logo LICENSE= MIT XORG_CAT= app -USE_XORG= xrender xft xext xt xaw xp xprintutil xorg-macros +USE_XORG= xrender xft xext xt xaw xp xprintutil MAN1= xlogo.1 diff --git a/x11/xlsclients/Makefile b/x11/xlsclients/Makefile index 21d2739..a2cb524 100644 --- a/x11/xlsclients/Makefile +++ b/x11/xlsclients/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xlsclients -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xlsclients PORTVERSION= 1.1.2 diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile index da27d37d..361c1a2 100644 --- a/x11/xmag/Makefile +++ b/x11/xmag/Makefile @@ -10,7 +10,7 @@ COMMENT= X application for screen magnifying LICENSE= MIT XORG_CAT= app -USE_XORG= xt xaw xorg-macros +USE_XORG= xt xaw MAN1= xmag.1 diff --git a/x11/xman/Makefile b/x11/xman/Makefile index 9438095..eace83f 100644 --- a/x11/xman/Makefile +++ b/x11/xman/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xman -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xman PORTVERSION= 1.1.2 diff --git a/x11/xmh/Makefile b/x11/xmh/Makefile index e1f2d6a..2f38a2d 100644 --- a/x11/xmh/Makefile +++ b/x11/xmh/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xmh -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xmh PORTVERSION= 1.0.2 diff --git a/x11/xmore/Makefile b/x11/xmore/Makefile index 5b1a7c3..fb88a02 100644 --- a/x11/xmore/Makefile +++ b/x11/xmore/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xmore -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xmore PORTVERSION= 1.0.2 diff --git a/x11/xnee/Makefile b/x11/xnee/Makefile index f1a0036..797567e 100644 --- a/x11/xnee/Makefile +++ b/x11/xnee/Makefile @@ -10,14 +10,13 @@ MASTER_SITES= GNU MAINTAINER= pawel@FreeBSD.org COMMENT= X events recorder and player -LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ - xcb:${PORTSDIR}/x11/libxcb +LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs LICENSE= GPLv3 GNU_CONFIGURE= yes USE_GMAKE= yes -USE_XORG= x11 xau xdmcp xext xi xtst +USE_XORG= x11 xau xcb xdmcp xext xi xtst USE_GNOME= gnomehack MAKE_JOBS_SAFE= yes diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile index d7e84dc..d844aad 100644 --- a/x11/xorg-apps/Makefile +++ b/x11/xorg-apps/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xorg-apps -PORTVERSION= 7.5.2 -PORTREVISION= 1 +PORTVERSION= 7.7 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile index fdeae03..3e3bd6a 100644 --- a/x11/xorg-cf-files/Makefile +++ b/x11/xorg-cf-files/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xorg-cf-files -# Date created: Nov 18 2006 -# Whom: Dave Grochowski -# +# Created by: Dave Grochowski # $FreeBSD$ -# PORTNAME= xorg-cf-files PORTVERSION= 1.0.4 diff --git a/x11/xorg-docs/Makefile b/x11/xorg-docs/Makefile index fecfece..f2349d5 100644 --- a/x11/xorg-docs/Makefile +++ b/x11/xorg-docs/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xorg-docs -# Date Created: Nov 2 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xorg-docs -PORTVERSION= 1.6 +PORTVERSION= 1.7 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/xorg-docs/distinfo b/x11/xorg-docs/distinfo index b915a55..003a619 100644 --- a/x11/xorg-docs/distinfo +++ b/x11/xorg-docs/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/doc/xorg-docs-1.6.tar.bz2) = f6b21bc486ab10fdf2bf1dfdf08f0aba22a4b87542165eeb395d0a6202f19d32 -SIZE (xorg/doc/xorg-docs-1.6.tar.bz2) = 345028 +SHA256 (xorg/doc/xorg-docs-1.7.tar.bz2) = b9b1918bd365e9eb29c325e76bb8c4d774d37be707e433fb0af94da35683375f +SIZE (xorg/doc/xorg-docs-1.7.tar.bz2) = 370482 diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile index 585f829..c296e02 100644 --- a/x11/xorg-libraries/Makefile +++ b/x11/xorg-libraries/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: xorg-libraries -# Date created: 29 May 2004 -# Whom: anholt@FreeBSD.org -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xorg-libraries -PORTVERSION= 7.5.1 +PORTVERSION= 7.7 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile index 500b64c..87adc57 100644 --- a/x11/xorg/Makefile +++ b/x11/xorg/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: xorg -# Date created: 18 Jun 2004 -# Whom: anholt -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xorg -PORTVERSION= 7.5.2 +PORTVERSION= 7.7 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none @@ -23,8 +19,10 @@ RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \ ${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes +.include <bsd.port.options.mk> + # doc -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} RUN_DEPENDS+= ${LOCALBASE}/share/doc/xorg-docs/README.xml:${PORTSDIR}/x11/xorg-docs .endif @@ -57,8 +55,4 @@ DEPENDS_TARGET="package" .endif .endif -.if ${ARCH} != "alpha" -RUN_DEPENDS+= ${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server -.endif - .include <bsd.port.post.mk> diff --git a/x11/xplsprinters/Makefile b/x11/xplsprinters/Makefile index 004d78f2..090ce79 100644 --- a/x11/xplsprinters/Makefile +++ b/x11/xplsprinters/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xplsprinters -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xplsprinters PORTVERSION= 1.0.1 diff --git a/x11/xprehashprinterlist/Makefile b/x11/xprehashprinterlist/Makefile index bc93bd5..1b8fee0 100644 --- a/x11/xprehashprinterlist/Makefile +++ b/x11/xprehashprinterlist/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xprehashprinterlist -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xprehashprinterlist PORTVERSION= 1.0.1 diff --git a/x11/xprop/Makefile b/x11/xprop/Makefile index c2aa6d8..1fc162f 100644 --- a/x11/xprop/Makefile +++ b/x11/xprop/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xprop -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xprop PORTVERSION= 1.2.1 diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile index ae97d28..3fbb50b 100644 --- a/x11/xproto/Makefile +++ b/x11/xproto/Makefile @@ -1,20 +1,15 @@ -# New ports collection makefile for: xproto -# Date Created: 29 Oct, 2003 -# Whom: Eric Anholt <anholt@FreeBSD.org> -# +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xproto -PORTVERSION= 7.0.22 +PORTVERSION= 7.0.24 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X11 protocol headers XORG_CAT= proto -USE_GNOME= pkgconfig -CONFIGURE_ARGS+=--disable-specs +CONFIGURE_ARGS+=--disable-specs --without-fop --without-xmlto --without-xsltproc .include <bsd.port.mk> diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo index f8a8892..88deba2 100644 --- a/x11/xproto/distinfo +++ b/x11/xproto/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/proto/xproto-7.0.22.tar.bz2) = ad8397dd2a3de7249d2f3fb3a49444fef71483d43681285936c11911663817a8 -SIZE (xorg/proto/xproto-7.0.22.tar.bz2) = 281763 +SHA256 (xorg/proto/xproto-7.0.24.tar.bz2) = 3698a1c7e3b734bc1139a7eb694ed8c66188658d6b4dea3d567066fe4e88b2fc +SIZE (xorg/proto/xproto-7.0.24.tar.bz2) = 292795 diff --git a/x11/xproxymanagementprotocol/Makefile b/x11/xproxymanagementprotocol/Makefile index 56ba5be..68fdb37d 100644 --- a/x11/xproxymanagementprotocol/Makefile +++ b/x11/xproxymanagementprotocol/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xproxymanagementprotocol -# Date Created: Jun 21 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xproxymanagementprotocol PORTVERSION= 1.0.3 diff --git a/x11/xpyb/Makefile b/x11/xpyb/Makefile index a7f8d5f..ba19c97 100644 --- a/x11/xpyb/Makefile +++ b/x11/xpyb/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xpyb -# Date created: 2008-08-27 -# Whom: Ashish Shukla <wahjava@gmail.com> -# +# Created by: Ashish Shukla <wahjava@gmail.com> # $FreeBSD$ -# PORTNAME= xpyb PORTVERSION= 1.3.1 @@ -17,10 +13,10 @@ COMMENT= Python bindings to access X Window System protocol via libxcb BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:${PORTSDIR}/x11/xcb-proto \ xcb-proto>=1.7.1:${PORTSDIR}/x11/xcb-proto -LIB_DEPENDS= xcb.2:${PORTSDIR}/x11/libxcb USE_BZIP2= yes USE_PYTHON= 2.5+ +USE_XORG= xcb USES= pathfix PORTDOCS= README COPYING INSTALL NEWS XcbPythonBinding.txt diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile index 7e7b70d..8d6107f 100644 --- a/x11/xrandr/Makefile +++ b/x11/xrandr/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xrandr -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xrandr -PORTVERSION= 1.3.5 +PORTVERSION= 1.4.0 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xrandr/distinfo b/x11/xrandr/distinfo index 93465a5..752235d 100644 --- a/x11/xrandr/distinfo +++ b/x11/xrandr/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/app/xrandr-1.3.5.tar.bz2) = 1059ff7a9ad0df8e00a765ffa4e08a505304c02663112da370ac7082030b980e -SIZE (xorg/app/xrandr-1.3.5.tar.bz2) = 152891 +SHA256 (xorg/app/xrandr-1.4.0.tar.bz2) = a76b004abe6fd7606eba9ad161ac6391fe5c665708cc5fb7c7ea7d36459d9693 +SIZE (xorg/app/xrandr-1.4.0.tar.bz2) = 165459 diff --git a/x11/xrdb/Makefile b/x11/xrdb/Makefile index 2ebf34c..2459750 100644 --- a/x11/xrdb/Makefile +++ b/x11/xrdb/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xrdb -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xrdb PORTVERSION= 1.0.9 diff --git a/x11/xrefresh/Makefile b/x11/xrefresh/Makefile index 9eb7d9e..8f699ff 100644 --- a/x11/xrefresh/Makefile +++ b/x11/xrefresh/Makefile @@ -10,7 +10,7 @@ COMMENT= Refresh all or part of an X screen LICENSE= MIT XORG_CAT= app -USE_XORG= x11 xorg-macros +USE_XORG= x11 PLIST_FILES= bin/xrefresh diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile index fa77684..b77507d 100644 --- a/x11/xrx/Makefile +++ b/x11/xrx/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xrx -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xrx PORTVERSION= 1.0.4 diff --git a/x11/xset/Makefile b/x11/xset/Makefile index 7d59398..37192ba 100644 --- a/x11/xset/Makefile +++ b/x11/xset/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xset -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xset PORTVERSION= 1.2.2 diff --git a/x11/xsetmode/Makefile b/x11/xsetmode/Makefile index 58297f5..7d954d0 100644 --- a/x11/xsetmode/Makefile +++ b/x11/xsetmode/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xsetmode -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xsetmode PORTVERSION= 1.0.0 diff --git a/x11/xsetpointer/Makefile b/x11/xsetpointer/Makefile index 5e38412..a971390 100644 --- a/x11/xsetpointer/Makefile +++ b/x11/xsetpointer/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xsetpointer -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xsetpointer PORTVERSION= 1.0.1 diff --git a/x11/xsm/Makefile b/x11/xsm/Makefile index 43f7139..3a5e5a0 100644 --- a/x11/xsm/Makefile +++ b/x11/xsm/Makefile @@ -8,7 +8,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X Session Manager XORG_CAT= app -USE_XORG= xt xaw xorg-macros +USE_XORG= xt xaw MAN1= xsm.1 diff --git a/x11/xstdcmap/Makefile b/x11/xstdcmap/Makefile index e5780f9..cb92d34 100644 --- a/x11/xstdcmap/Makefile +++ b/x11/xstdcmap/Makefile @@ -10,7 +10,7 @@ COMMENT= X standard colormap utility LICENSE= MIT XORG_CAT= app -USE_XORG= xmu x11 xorg-macros +USE_XORG= xmu x11 PLIST_FILES= bin/xstdcmap diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile index fa0e9ce..6a268d8 100644 --- a/x11/xtrans/Makefile +++ b/x11/xtrans/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: xtrans -# Date Created: 08 Aug 2005 -# Whom: Dejan Lesjak <lesi@FreeBSD.org> -# +# Created by: Dejan Lesjak <lesi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xtrans -PORTVERSION= 1.2.6 +PORTVERSION= 1.2.7 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xtrans/distinfo b/x11/xtrans/distinfo index a74a739..1555706 100644 --- a/x11/xtrans/distinfo +++ b/x11/xtrans/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/xtrans-1.2.6.tar.bz2) = c5f9a73705ddbb8c9b8f16c4fac33b4b9ba7661b8305474b4c1549e48d9ca5c6 -SIZE (xorg/lib/xtrans-1.2.6.tar.bz2) = 156600 +SHA256 (xorg/lib/xtrans-1.2.7.tar.bz2) = 7f811191ba70a34a9994d165ea11a239e52c527f039b6e7f5011588f075fe1a6 +SIZE (xorg/lib/xtrans-1.2.7.tar.bz2) = 173025 diff --git a/x11/xtrans/pkg-plist b/x11/xtrans/pkg-plist index d14b3a3..e0184a4 100644 --- a/x11/xtrans/pkg-plist +++ b/x11/xtrans/pkg-plist @@ -8,5 +8,4 @@ include/X11/Xtrans/Xtransutil.c include/X11/Xtrans/transport.c libdata/pkgconfig/xtrans.pc share/aclocal/xtrans.m4 -@dirrmtry %%DOCSDIR%% @dirrm include/X11/Xtrans diff --git a/x11/xtrap/Makefile b/x11/xtrap/Makefile index c222d03..ad3c507 100644 --- a/x11/xtrap/Makefile +++ b/x11/xtrap/Makefile @@ -1,9 +1,4 @@ -# New ports collection makefile for: xtrap -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xtrap PORTVERSION= 1.0.2 diff --git a/x11/xvidtune/Makefile b/x11/xvidtune/Makefile index e7e9cc2..48d7b0a 100644 --- a/x11/xvidtune/Makefile +++ b/x11/xvidtune/Makefile @@ -1,12 +1,7 @@ -# New ports collection makefile for: xvidtune -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xvidtune -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xvidtune/distinfo b/x11/xvidtune/distinfo index 35a6538..cf17910 100644 --- a/x11/xvidtune/distinfo +++ b/x11/xvidtune/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/app/xvidtune-1.0.2.tar.bz2) = 73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53 -SIZE (xorg/app/xvidtune-1.0.2.tar.bz2) = 113117 +SHA256 (xorg/app/xvidtune-1.0.3.tar.bz2) = 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01 +SIZE (xorg/app/xvidtune-1.0.3.tar.bz2) = 128492 diff --git a/x11/xvinfo/Makefile b/x11/xvinfo/Makefile index d053e29..868797a 100644 --- a/x11/xvinfo/Makefile +++ b/x11/xvinfo/Makefile @@ -8,7 +8,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Print out X-Video extension adaptor information XORG_CAT= app -USE_XORG= xv x11 xorg-macros +USE_XORG= xv x11 PLIST_FILES= bin/xvinfo diff --git a/x11/xvmcinfo/Makefile b/x11/xvmcinfo/Makefile index 0c42332..67cc32c 100644 --- a/x11/xvmcinfo/Makefile +++ b/x11/xvmcinfo/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: xvmcinfo -# Date Created: 6 Dec 2008 -# Whom: bms -# +# Created by: Bruce M Simpson <bms@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xvmcinfo PORTVERSION= 0.1 diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile index dcc8578..a4484f7 100644 --- a/x11/xwininfo/Makefile +++ b/x11/xwininfo/Makefile @@ -1,19 +1,15 @@ -# New ports collection makefile for: xwininfo -# Date Created: 17 Feb 2006 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= xwininfo -PORTVERSION= 1.1.2 +PORTVERSION= 1.1.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Window information utility for X XORG_CAT= app -USE_XORG= xmuu xext x11 +USES= iconv +USE_XORG= x11 xcb xproto xorg-macros PLIST_FILES= bin/xwininfo diff --git a/x11/xwininfo/distinfo b/x11/xwininfo/distinfo index 4c403c4..c50dd3e 100644 --- a/x11/xwininfo/distinfo +++ b/x11/xwininfo/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/app/xwininfo-1.1.2.tar.bz2) = 8fa66c9ce02da257613fa428137ab9efc89c8f9939c074513dbc0f407dc9ac3a -SIZE (xorg/app/xwininfo-1.1.2.tar.bz2) = 135415 +SHA256 (xorg/app/xwininfo-1.1.3.tar.bz2) = 218eb0ea95bd8de7903dfaa26423820c523ad1598be0751d2d8b6a2c23b23ff8 +SIZE (xorg/app/xwininfo-1.1.3.tar.bz2) = 157512 |
