diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 85ec297..f6f04b0 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1371,7 +1371,7 @@ FILESDIR?= ${MASTERDIR}/files SCRIPTDIR?= ${MASTERDIR}/scripts PKGDIR?= ${MASTERDIR} -.if defined(USE_IMAKE) && !defined(USE_X_PREFIX) +.if defined(USE_IMAKE) && !defined(USE_X_PREFIX) && !defined(USE_XORG) USE_X_PREFIX= yes .endif .if defined(USE_X_PREFIX) && ${USE_X_PREFIX} == "no" @@ -1883,7 +1883,7 @@ PLIST_SUB+= XAWVER=${XAWVER} _GL_gl_LIB_DEPENDS= GL.1:${PORTSDIR}/graphics/libGL _GL_glu_LIB_DEPENDS= GLU.1:${PORTSDIR}/graphics/libGLU _GL_glw_LIB_DEPENDS= GLw.1:${PORTSDIR}/graphics/libGLw -_GL_glut_LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut +_GL_glut_LIB_DEPENDS= glut.3:${PORTSDIR}/graphics/libglut _GL_linux_RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri .if defined(USE_GL) diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk index 1957377..21f13e1 100644 --- a/Mk/bsd.xorg.mk +++ b/Mk/bsd.xorg.mk @@ -133,6 +133,9 @@ DISTFILES?= xorg-server-${PORTVERSION}.tar.bz2 WRKSRC= ${WRKDIR}/xorg-server-${PORTVERSION} USE_GNOME+= gnomehack CONFIGURE_ARGS+= --with-xkb-path=${LOCALBASE}/share/X11/xkb + +LIB_PC_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri +USE_XORG+= pciaccess . endif .endif @@ -146,13 +149,14 @@ Xorg_Post_Include= bsd.xorg.mk # Register all xorg .pc files here. # foo_LIB_PC_DEPENDS means it should go to BUILD_DEPENDS *and* RUN_DEPENDS. -XORG_MODULES= bigreqsproto compositeproto damageproto dmx dmxproto evieproto fixesproto fontcacheproto fontenc fontsproto fontutil glproto ice inputproto kbproto libfs oldx pixman printproto randrproto recordproto renderproto resourceproto scrnsaverproto sm trapproto videoproto x11 xau xaw xaw6 xaw7 xaw8 xbitmaps xcmiscproto xcomposite xcursor xdamage xdmcp xevie xext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86rushproto xf86vidmodeproto xfixes xfont xfontcache xft xi xinerama xineramaproto xkbfile xkbui xmu xmuu xorg-server xp xpm xprintapputil xprintutil xproto xproxymngproto xrandr xrender xres xscrnsaver xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm +XORG_MODULES= bigreqsproto compositeproto damageproto dmx dmxproto dri2proto evieproto fixesproto fontcacheproto fontenc fontsproto fontutil glproto ice inputproto kbproto libfs oldx pciaccess pixman printproto randrproto recordproto renderproto resourceproto scrnsaverproto sm trapproto videoproto x11 xau xaw xaw6 xaw7 xaw8 xbitmaps xcmiscproto xcomposite xcursor xdamage xdmcp xevie xext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86rushproto xf86vidmodeproto xfixes xfont xfontcache xft xi xinerama xineramaproto xkbfile xkbui xmu xmuu xorg-server xp xpm xprintapputil xprintutil xproto xproxymngproto xrandr xrender xres xscrnsaver xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm bigreqsproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/bigreqsproto.pc:${PORTSDIR}/x11/bigreqsproto compositeproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/compositeproto.pc:${PORTSDIR}/x11/compositeproto damageproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/damageproto.pc:${PORTSDIR}/x11/damageproto dmx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx dmxproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmxproto.pc:${PORTSDIR}/x11/dmxproto +dri2proto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dri2proto.pc:${PORTSDIR}/x11/dri2proto evieproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/evieproto.pc:${PORTSDIR}/x11/evieext fixesproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fixesproto.pc:${PORTSDIR}/x11/fixesproto fontcacheproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontcacheproto.pc:${PORTSDIR}/x11-fonts/fontcacheproto @@ -165,6 +169,7 @@ inputproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/inputproto.pc:${PORTSDI kbproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/kbproto.pc:${PORTSDIR}/x11/kbproto libfs_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS oldx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX +pciaccess_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pciaccess.pc:${PORTSDIR}/devel/libpciaccess pixman_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman printproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto randrproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/randrproto.pc:${PORTSDIR}/x11/randrproto diff --git a/devel/Makefile b/devel/Makefile index c98b2f4..f9f44c2 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -681,6 +681,7 @@ SUBDIR += libowfat SUBDIR += libpasori SUBDIR += libpci + SUBDIR += libpciaccess SUBDIR += libpdel SUBDIR += libpeak SUBDIR += libphish diff --git a/devel/libpciaccess/Makefile b/devel/libpciaccess/Makefile new file mode 100644 index 0000000..f637194 --- /dev/null +++ b/devel/libpciaccess/Makefile @@ -0,0 +1,23 @@ +# New ports collection makefile for: libpciaccess +# Date Created: May 11 2008 +# Whom: Florent Thoumie +# +# $FreeBSD$ +# + +PORTNAME= libpciaccess +PORTVERSION= 0.10.5 +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 + +XORG_CAT= lib + +.include diff --git a/devel/libpciaccess/distinfo b/devel/libpciaccess/distinfo new file mode 100644 index 0000000..e7bf982 --- /dev/null +++ b/devel/libpciaccess/distinfo @@ -0,0 +1,3 @@ +MD5 (xorg/lib/libpciaccess-0.10.5.tar.bz2) = 617bebf31e5685c83f935009aeae5f38 +SHA256 (xorg/lib/libpciaccess-0.10.5.tar.bz2) = b6c5765a3994e59053cb3b46741b858bb56ea868baa5c48fba7e5c36ca4ae95d +SIZE (xorg/lib/libpciaccess-0.10.5.tar.bz2) = 260817 diff --git a/devel/libpciaccess/pkg-descr b/devel/libpciaccess/pkg-descr new file mode 100644 index 0000000..77dbb55 --- /dev/null +++ b/devel/libpciaccess/pkg-descr @@ -0,0 +1,6 @@ +This package contains the pciaccess library. + +WWW: http://www.freedesktop.org/Software/xlibs + +- Florent Thoumie +flz@FreeBSD.org diff --git a/devel/libpciaccess/pkg-plist b/devel/libpciaccess/pkg-plist new file mode 100644 index 0000000..4fe963b --- /dev/null +++ b/devel/libpciaccess/pkg-plist @@ -0,0 +1,6 @@ +include/pciaccess.h +lib/libpciaccess.a +lib/libpciaccess.la +lib/libpciaccess.so +lib/libpciaccess.so.0 +libdata/pkgconfig/pciaccess.pc diff --git a/devel/xorg-macros/Makefile b/devel/xorg-macros/Makefile index 49e742d..958347c 100644 --- a/devel/xorg-macros/Makefile +++ b/devel/xorg-macros/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-macros -PORTVERSION= 1.1.5 +PORTVERSION= 1.1.6 CATEGORIES= devel x11 DISTNAME= util-macros-$(PORTVERSION) diff --git a/devel/xorg-macros/distinfo b/devel/xorg-macros/distinfo index 9ceb007..4511ec6 100644 --- a/devel/xorg-macros/distinfo +++ b/devel/xorg-macros/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/util/util-macros-1.1.5.tar.bz2) = 51952682d8b42aeda3af5cee0133ce2c -SHA256 (xorg/util/util-macros-1.1.5.tar.bz2) = 75939790e16b8bcc122e83f3f060d6f000ed1a98e97b4972fac0903142f5651b -SIZE (xorg/util/util-macros-1.1.5.tar.bz2) = 47165 +MD5 (xorg/util/util-macros-1.1.6.tar.bz2) = 5b82bf7c25112f2ce7e2a3638a91a83c +SHA256 (xorg/util/util-macros-1.1.6.tar.bz2) = b03fcc1ef5c4811fda69ff15c60d5afac4b60a3f25ea6c31e58be71df51e4c66 +SIZE (xorg/util/util-macros-1.1.6.tar.bz2) = 48366 diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile index a32dd5c..622a21f 100644 --- a/graphics/dri/Makefile +++ b/graphics/dri/Makefile @@ -7,7 +7,6 @@ PORTNAME= dri PORTVERSION= ${MESAVERSION} -PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= graphics @@ -19,40 +18,10 @@ BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend CONFLICTS= dri-6.2.2005* dri-6.5.2006* -MAKE_ENV+= FBSDCC="${CC}" FBSDCXX="${CXX}" \ - FBSDCFLAGS="${CFLAGS}" FBSDCXXFLAGS="${CXXFLAGS}" \ - PTHREAD_LIBS=${PTHREAD_LIBS} - -USE_XORG= x11 - -DRIMODDIR= ${PREFIX}/lib/dri -SRCDIR= mesa - -.if !defined(ARCH) -ARCH!= uname -p -.endif +USE_XORG= glproto x11 xext xxf86vm xdamage xfixes do-install: - ${MKDIR} ${DRIMODDIR} -.if ${ARCH} == i386 - ${INSTALL_PROGRAM} ${WRKSRC}/lib/i810_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/i965_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/unichrome_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/tdfx_dri.so ${DRIMODDIR} -.elif ${ARCH} == amd64 - ${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/i965_dri.so ${DRIMODDIR} -.endif - ${INSTALL_PROGRAM} ${WRKSRC}/lib/mach64_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/mga_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/r128_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/r200_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/r300_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/radeon_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/savage_dri.so ${DRIMODDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/lib/sis_dri.so ${DRIMODDIR} + cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" - .include diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo index c5fcdf9..da68c3a 100644 --- a/graphics/dri/distinfo +++ b/graphics/dri/distinfo @@ -1,3 +1,3 @@ -MD5 (MesaLib-7.0.3.tar.bz2) = e6e6379d7793af40a6bc3ce1bace572e -SHA256 (MesaLib-7.0.3.tar.bz2) = ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22 -SIZE (MesaLib-7.0.3.tar.bz2) = 3389327 +MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5 +SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2 +SIZE (MesaLib-7.2.tar.bz2) = 3341919 diff --git a/graphics/dri/files/patch-sis_context.h b/graphics/dri/files/patch-sis_context.h index 1d79d5f..3152e2d 100644 --- a/graphics/dri/files/patch-sis_context.h +++ b/graphics/dri/files/patch-sis_context.h @@ -1,16 +1,16 @@ ---- src/mesa/drivers/dri/sis/sis_context.h.orig Tue Apr 11 13:41:11 2006 -+++ src/mesa/drivers/dri/sis/sis_context.h Wed Dec 20 18:32:46 2006 -@@ -401,8 +401,20 @@ +--- src/mesa/drivers/dri/sis/sis_context.h.orig 2008-09-22 13:38:53.000000000 +0100 ++++ src/mesa/drivers/dri/sis/sis_context.h 2008-09-22 13:40:51.000000000 +0100 +@@ -401,10 +401,20 @@ #define MMIO_READ(reg) *(volatile GLint *)(smesa->IOBase + (reg)) #define MMIO_READf(reg) *(volatile GLfloat *)(smesa->IOBase + (reg)) --#if defined(__i386__) || defined(__amd64__) +-#if defined(__i386__) || defined(__x86_64__) +#if defined(__alpha__) +#define MMIO_WMB() __asm __volatile("wmb" : : : "memory") -+#elif defined(__amd64__) || defined(__i386__) ++#elif 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(__ia64__) + #define MMIO_WMB() __asm __volatile("mf" : : : "memory") +#elif defined(__powerpc__) +#define MMIO_WMB() __asm __volatile("eieio" : : : "memory") +#elif defined(__sparc64__) diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist index 10f31ec..5da5f31 100644 --- a/graphics/dri/pkg-plist +++ b/graphics/dri/pkg-plist @@ -1,6 +1,8 @@ -%%I386%%lib/dri/i810_dri.so -%%I386_AMD64%%lib/dri/i915_dri.so -%%I386_AMD64%%lib/dri/i965_dri.so +include/GL/internal/dri_interface.h +include/GL/internal/dri_sarea.h +lib/dri/i810_dri.so +lib/dri/i915_dri.so +lib/dri/i965_dri.so lib/dri/mach64_dri.so lib/dri/mga_dri.so lib/dri/r128_dri.so @@ -9,6 +11,10 @@ lib/dri/r300_dri.so lib/dri/radeon_dri.so lib/dri/savage_dri.so lib/dri/sis_dri.so -%%I386%%lib/dri/tdfx_dri.so -%%I386%%lib/dri/unichrome_dri.so +lib/dri/swrast_dri.so +lib/dri/tdfx_dri.so +lib/dri/unichrome_dri.so +libdata/pkgconfig/dri.pc @dirrm lib/dri +@dirrmtry include/GL/internal +@dirrmtry include/GL diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile index 09b8e53..7ad5e0f 100644 --- a/graphics/libGL/Makefile +++ b/graphics/libGL/Makefile @@ -12,14 +12,14 @@ CATEGORIES= graphics COMMENT= OpenGL library that renders using GLX or DRI BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend -LIB_DEPENDS+= drm:${PORTSDIR}/graphics/libdrm +LIB_DEPENDS+= drm:${PORTSDIR}/graphics/libdrm \ + expat.6:${PORTSDIR}/textproc/expat2 -USE_XORG= glproto xxf86vm xext xfixes xdamage -CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/drm +USE_XORG= glproto x11 xext xxf86vm xdamage xfixes -SRCDIR= glx/x11 -HEADERS= gl.h glext.h glx.h glxext.h -HEADERSDIR= include/GL +do-install: + ${RM} ${WRKSRC}/include/GL/glu*.h + cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" .include diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk index 0bd3753..1d65a60 100644 --- a/graphics/libGL/bsd.mesalib.mk +++ b/graphics/libGL/bsd.mesalib.mk @@ -12,80 +12,99 @@ # - graphics/libGL # - graphics/libGLU # - graphics/libGLw +# - graphics/libOSMesa # - graphics/dri # # $FreeBSD: ports/graphics/libGL/bsd.mesalib.mk,v 1.5 2008/04/29 15:05:42 flz Exp $ # -MESAVERSION= 7.0.3 +MESAVERSION= 7.2 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/ MASTER_SITE_SUBDIR= mesa3d -DISTFILES= MesaLib-${PORTVERSION}${EXTRACT_SUFX} +DISTFILES= MesaLib-${MESAVERSION}${EXTRACT_SUFX} MAINTAINER= x11@FreeBSD.org USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes +GNU_CONFIGURE= yes -MAKE_ARGS= SHELL=${SH} -CFLAGS+= -DUSE_XSHM -DHZ=100 +CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \ + LDFLAGS=-L${LOCALBASE}/lib -PREFIX= ${LOCALBASE} -FILESDIR= ${.CURDIR}/../../graphics/libGL/files -WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION} -CONFDIR= ${WRKSRC}/configs +ALL_TARGET= default -SHVER?= 1 +#MAKE_ARGS= SHELL=${SH} +#CFLAGS+= -DUSE_XSHM -DHZ=100 + +#FILESDIR= ${.CURDIR}/../../graphics/libGL/files +WRKSRC= ${WRKDIR}/Mesa-${MESAVERSION} .if !defined(ARCH) ARCH!= uname -p .endif -.if ${ARCH} == i386 -PLIST_SUB+= I386="" -PLIST_SUB+= I386_AMD64="" -ALL_TARGET= freebsd-dri-x86 -.elif ${ARCH} == amd64 -PLIST_SUB+= I386="@comment " -PLIST_SUB+= I386_AMD64="" -ALL_TARGET= freebsd-dri-amd64 +.if ${ARCH} == alpha +FAST_MATH= .else -PLIST_SUB+= I386="@comment " -PLIST_SUB+= I386_AMD64="@comment " -ALL_TARGET= freebsd-dri +FAST_MATH= -ffast-math .endif -.if ${ARCH} == alpha -FAST_MATH= +COMPONENT= ${PORTNAME:L:C/^lib//:C/mesa-//} + +.if ${COMPONENT:Mglut} == "" +. if ${COMPONENT:Mglu} == "" +CONFIGURE_ARGS+= --disable-glu --disable-glut +. else +CONFIGURE_ARGS+= --disable-glut +. endif +.else +DISTFILES+= MesaGLUT-${MESAVERSION}${EXTRACT_SUFX} +.endif + +.if ${COMPONENT:Mglw} == "" +CONFIGURE_ARGS+= --disable-glw +.else +CONFIGURE_ARGS+= --enable-motif +.endif + +.if ${COMPONENT:Mosmesa} == "osmesa" +CONFIGURE_ARGS+= --with-driver=osmesa --with-osmesa-bits=32 +.endif + +.if ${COMPONENT:Mdemos} == "" +CONFIGURE_ARGS+= --with-demos=no .else -FAST_MATH= -ffast-math +DISTFILES+= MesaDemos-${MESAVERSION}${EXTRACT_SUFX} +CONFIGURE_ARGS+= --with-demos=demos,xdemos +.endif + +.if ${COMPONENT:Mdri} == "" +CONFIGURE_ARGS+= --with-dri-drivers=no .endif -pre-patch: - @${REINPLACE_CMD} \ - -e '/^CC =/d' -e '/^CXX =/d' \ - -e 's|/usr/X11R6|${LOCALBASE}|g' \ - -e 's|/usr/local|${LOCALBASE}|g' \ - -e 's|-lpthread|${PTHREAD_LIBS}|g' \ - -e 's|-ffast-math|${FAST_MATH}|g' \ - -e 's|CFLAGS = |CFLAGS = ${CFLAGS} |g' \ - -e 's|OPT_FLAGS = .*|OPT_FLAGS = ${CFLAGS}|g' \ - -e "s|SRC_DIRS = .*|SRC_DIRS = ${SRCDIR}|g" \ - -e 's|-DHAVE_POSIX_MEMALIGN||' \ - ${CONFDIR}/freebsd-dri - @${REINPLACE_CMD} \ - -e 's|^\(MKDEP_OPTIONS.*\)|\1 -- -I${LOCALBASE}/include|' \ - -e 's|^\(MKLIB_OPTIONS.*\)|\1 -L${LOCALBASE}/lib|' \ - -e 's|^DRI_DRIVER_INSTALL_DIR.*|DRI_DRIVER_INSTALL_DIR = ${LOCALBASE}/lib/dri|' \ - ${CONFDIR}/default - -.if !target(do-install) -do-install: - ${MKDIR} ${PREFIX}/include/GL/ -.for i in ${HEADERS} - ${INSTALL_DATA} ${WRKSRC}/${HEADERSDIR}/${i} ${PREFIX}/include/GL/ -.endfor - ${INSTALL_PROGRAM} ${WRKSRC}/lib/${PORTNAME}.so.${SHVER} ${PREFIX}/lib - ${LN} -sf ${PORTNAME}.so.${SHVER} ${PREFIX}/lib/${PORTNAME}.so +.if defined(WITHOUT_XCB) +CONFIGURE_ARGS+= --disable-xcb +.else +CONFIGURE_ARGS+= --enable-xcb +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' ${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 ${COMPONENT:Mglut} != "" + @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ + ${WRKSRC}/src/glut/glx/Makefile +.endif +.if ${COMPONENT:Mdemos} != "" + @${REINPLACE_CMD} -e 's|../images/|${DATADIR}/images/|g' \ + -e 's|geartrain.dat|${DATADIR}/data/geartrain.dat|g' \ + -e 's|terrain.dat|${DATADIR}/data/terrain.dat|g' \ + -e 's|isosurf.dat|${DATADIR}/data/isosurf.dat|g' \ + ${WRKSRC}/progs/demos/*.c ${WRKSRC}/progs/xdemos/*.c .endif diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo index c5fcdf9..da68c3a 100644 --- a/graphics/libGL/distinfo +++ b/graphics/libGL/distinfo @@ -1,3 +1,3 @@ -MD5 (MesaLib-7.0.3.tar.bz2) = e6e6379d7793af40a6bc3ce1bace572e -SHA256 (MesaLib-7.0.3.tar.bz2) = ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22 -SIZE (MesaLib-7.0.3.tar.bz2) = 3389327 +MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5 +SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2 +SIZE (MesaLib-7.2.tar.bz2) = 3341919 diff --git a/graphics/libGL/pkg-plist b/graphics/libGL/pkg-plist index f3fd7c6..e3ab0eb 100644 --- a/graphics/libGL/pkg-plist +++ b/graphics/libGL/pkg-plist @@ -1,7 +1,26 @@ +include/GL/amesa.h +include/GL/dmesa.h +include/GL/fxmesa.h +include/GL/ggimesa.h +include/GL/gl_mangle.h include/GL/gl.h include/GL/glext.h +include/GL/glfbdev.h +include/GL/glx_mangle.h include/GL/glx.h include/GL/glxext.h +include/GL/mesa_wgl.h +include/GL/mglmesa.h +include/GL/osmesa.h +include/GL/svgamesa.h +include/GL/uglglutshapes.h +include/GL/uglmesa.h +include/GL/vms_x_fix.h +include/GL/wmesa.h +include/GL/xmesa.h +include/GL/xmesa_x.h +include/GL/xmesa_xf86.h lib/libGL.so lib/libGL.so.1 +libdata/pkgconfig/gl.pc @dirrmtry include/GL diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile index b0d556e..b0e7a25 100644 --- a/graphics/libGLU/Makefile +++ b/graphics/libGLU/Makefile @@ -12,11 +12,12 @@ CATEGORIES= graphics COMMENT= OpenGL utility library USE_GL= gl -USE_XORG= xmu xi +USE_XORG= glproto x11 xext xxf86vm xdamage xfixes -SRCDIR= glu/sgi -HEADERS= glu.h -HEADERSDIR= include/GL +do-install: + cd ${WRKSRC}/src/glu; ${GMAKE} install + ${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/ + cd ${WRKSRC}/src/glu; ${GMAKE} install .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" .include diff --git a/graphics/libGLU/distinfo b/graphics/libGLU/distinfo index c5fcdf9..da68c3a 100644 --- a/graphics/libGLU/distinfo +++ b/graphics/libGLU/distinfo @@ -1,3 +1,3 @@ -MD5 (MesaLib-7.0.3.tar.bz2) = e6e6379d7793af40a6bc3ce1bace572e -SHA256 (MesaLib-7.0.3.tar.bz2) = ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22 -SIZE (MesaLib-7.0.3.tar.bz2) = 3389327 +MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5 +SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2 +SIZE (MesaLib-7.2.tar.bz2) = 3341919 diff --git a/graphics/libGLU/pkg-plist b/graphics/libGLU/pkg-plist index addb2a1..330c54e 100644 --- a/graphics/libGLU/pkg-plist +++ b/graphics/libGLU/pkg-plist @@ -1,3 +1,5 @@ include/GL/glu.h +include/GL/glu_mangle.h lib/libGLU.so lib/libGLU.so.1 +libdata/pkgconfig/glu.pc diff --git a/graphics/libGLw/Makefile b/graphics/libGLw/Makefile index b4497d3..9d9eeda 100644 --- a/graphics/libGLw/Makefile +++ b/graphics/libGLw/Makefile @@ -15,13 +15,10 @@ BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend LIB_DEPENDS+= Xm.3:${PORTSDIR}/x11-toolkits/open-motif USE_GL= gl -USE_XORG= xt +USE_XORG= glproto xt x11 xext xxf86vm xdamage xfixes -CFLAGS+= -D__GLX_MOTIF=1 -SRCDIR= glw - -HEADERS= GLwDrawA.h GLwDrawAP.h GLwMDrawA.h GLwMDrawAP.h -HEADERSDIR= src/glw +do-install: + cd ${WRKSRC}/src/glw; ${GMAKE} install .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" .include diff --git a/graphics/libGLw/distinfo b/graphics/libGLw/distinfo index c5fcdf9..da68c3a 100644 --- a/graphics/libGLw/distinfo +++ b/graphics/libGLw/distinfo @@ -1,3 +1,3 @@ -MD5 (MesaLib-7.0.3.tar.bz2) = e6e6379d7793af40a6bc3ce1bace572e -SHA256 (MesaLib-7.0.3.tar.bz2) = ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22 -SIZE (MesaLib-7.0.3.tar.bz2) = 3389327 +MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5 +SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2 +SIZE (MesaLib-7.2.tar.bz2) = 3341919 diff --git a/graphics/libGLw/files/patch-glw-GLwDrawA.c b/graphics/libGLw/files/patch-glw-GLwDrawA.c deleted file mode 100644 index fac6f15..0000000 --- a/graphics/libGLw/files/patch-glw-GLwDrawA.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/glw/GLwDrawA.c.orig Tue Mar 13 21:11:41 2007 -+++ src/glw/GLwDrawA.c Tue Mar 13 21:12:38 2007 -@@ -668,7 +668,7 @@ - #endif - - --#ifndef __GLX_MOTIF -+#ifdef __GLX_MOTIF - - /* Make context current */ - void GLwDrawingAreaMakeCurrent(Widget w,GLXContext ctx){ diff --git a/graphics/libGLw/pkg-plist b/graphics/libGLw/pkg-plist index a3105d8..211b586 100644 --- a/graphics/libGLw/pkg-plist +++ b/graphics/libGLw/pkg-plist @@ -4,3 +4,5 @@ include/GL/GLwMDrawA.h include/GL/GLwMDrawAP.h lib/libGLw.so lib/libGLw.so.1 +libdata/pkgconfig/glw.pc +@dirrmtry include/GL diff --git a/graphics/libOSMesa/Makefile b/graphics/libOSMesa/Makefile new file mode 100644 index 0000000..0c505c0 --- /dev/null +++ b/graphics/libOSMesa/Makefile @@ -0,0 +1,21 @@ +# New ports collection makefile for: libOSMesa +# Date created: Fri Oct 31 19:30:20 2008 +# Whom: rnoland +# +# $FreeBSD$ +# + +PORTNAME= libOSMesa +PORTVERSION= ${MESAVERSION} +CATEGORIES= graphics + +MAINTAINER= rnoland@FreeBSD.org +COMMENT= OpenGL offscreen library + +USE_LDCONFIG= yes + +do-install: + cd ${WRKSRC}/src/mesa; ${GMAKE} install-osmesa + +.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" +.include diff --git a/graphics/libOSMesa/distinfo b/graphics/libOSMesa/distinfo new file mode 100644 index 0000000..799cf9f --- /dev/null +++ b/graphics/libOSMesa/distinfo @@ -0,0 +1,6 @@ +MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5 +SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2 +SIZE (MesaLib-7.2.tar.bz2) = 3341919 +MD5 (MesaGLUT-7.2.tar.bz2) = f67daf93e12c4a459703bbf3e4004e31 +SHA256 (MesaGLUT-7.2.tar.bz2) = 33c51e5f0971c0da568c13b6a7f68d77ef3e0b0ec5c5758f8198ef37320daafe +SIZE (MesaGLUT-7.2.tar.bz2) = 327717 diff --git a/graphics/libOSMesa/pkg-descr b/graphics/libOSMesa/pkg-descr new file mode 100644 index 0000000..a9cf838 --- /dev/null +++ b/graphics/libOSMesa/pkg-descr @@ -0,0 +1,3 @@ +libOSMesa is a library provided with Mesa which allows off screen rendering. + +WWW: http://www.mesa3d.org/ diff --git a/graphics/libOSMesa/pkg-plist b/graphics/libOSMesa/pkg-plist new file mode 100644 index 0000000..caf4f02 --- /dev/null +++ b/graphics/libOSMesa/pkg-plist @@ -0,0 +1,2 @@ +lib/libOSMesa32.so +lib/libOSMesa32.so.7 diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile index 95bb6e6..3855db3 100644 --- a/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -6,19 +6,22 @@ # PORTNAME= libdrm -PORTVERSION= 2.3.1 +PORTVERSION= 2.4.1 CATEGORIES= graphics x11 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 +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs + USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes pre-patch: - ${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \ + @${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \ ${WRKSRC}/configure .include diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo index 985728c..40dc8bb 100644 --- a/graphics/libdrm/distinfo +++ b/graphics/libdrm/distinfo @@ -1,3 +1,3 @@ -MD5 (libdrm-2.3.1.tar.bz2) = 620fe7dd02c3236c3e9881a3a238173d -SHA256 (libdrm-2.3.1.tar.bz2) = ddfd398383729707846e1f1689e9acb3bc672e4f255a632c8f0d0c55ddf8718c -SIZE (libdrm-2.3.1.tar.bz2) = 306013 +MD5 (libdrm-2.4.1.tar.bz2) = 05feb4c5a48f1f0870a7cbe7617d6cf7 +SHA256 (libdrm-2.4.1.tar.bz2) = b740469b5660b338779fa3810db1467b818deb02f8f01b6280b05464ba78a31a +SIZE (libdrm-2.4.1.tar.bz2) = 338907 diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist index 4e76f5c..9f703f2 100644 --- a/graphics/libdrm/pkg-plist +++ b/graphics/libdrm/pkg-plist @@ -3,6 +3,7 @@ include/drm/drm_sarea.h include/drm/i915_drm.h include/drm/mach64_drm.h include/drm/mga_drm.h +include/drm/nouveau_drm.h include/drm/r128_drm.h include/drm/r300_reg.h include/drm/radeon_drm.h @@ -10,9 +11,14 @@ include/drm/savage_drm.h include/drm/sis_drm.h include/drm/via_3d_reg.h include/drm/via_drm.h +include/drm/xgi_drm.h +include/intel_bufmgr.h include/xf86drm.h lib/libdrm.la lib/libdrm.so lib/libdrm.so.2 +lib/libdrm_intel.la +lib/libdrm_intel.so +lib/libdrm_intel.so.1 libdata/pkgconfig/libdrm.pc @dirrm include/drm diff --git a/graphics/libglut/Makefile b/graphics/libglut/Makefile index 0c336d3..93c4e4b 100644 --- a/graphics/libglut/Makefile +++ b/graphics/libglut/Makefile @@ -6,25 +6,18 @@ # PORTNAME= libglut -PORTVERSION= 7.0.3 +PORTVERSION= ${MESAVERSION} CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= mesa3d -DISTNAME= MesaGLUT-${PORTVERSION} MAINTAINER= shaun@FreeBSD.org COMMENT= OpenGL utility toolkit -USE_BZIP2= yes USE_LDCONFIG= yes USE_GL= glu +USE_XORG= glproto x11 xext xxf86vm xdamage xfixes xi xmu -WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION}/src/glut/glx - -pre-patch: - ${CP} ${FILESDIR}/Makefile ${WRKSRC}/ - -pre-install: - @${MKDIR} ${PREFIX}/include/GL +do-install: + cd ${WRKSRC}/src/glut/glx; ${GMAKE} install +.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" .include diff --git a/graphics/libglut/distinfo b/graphics/libglut/distinfo index 21ac8e0..799cf9f 100644 --- a/graphics/libglut/distinfo +++ b/graphics/libglut/distinfo @@ -1,3 +1,6 @@ -MD5 (MesaGLUT-7.0.3.tar.bz2) = 0ff23c4e91b238abae63a5fc9fa003e7 -SHA256 (MesaGLUT-7.0.3.tar.bz2) = edb40aec6c5af1b59a6cac05e7e93040c74500818681d288c89b5c5d56a45cae -SIZE (MesaGLUT-7.0.3.tar.bz2) = 329421 +MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5 +SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2 +SIZE (MesaLib-7.2.tar.bz2) = 3341919 +MD5 (MesaGLUT-7.2.tar.bz2) = f67daf93e12c4a459703bbf3e4004e31 +SHA256 (MesaGLUT-7.2.tar.bz2) = 33c51e5f0971c0da568c13b6a7f68d77ef3e0b0ec5c5758f8198ef37320daafe +SIZE (MesaGLUT-7.2.tar.bz2) = 327717 diff --git a/graphics/libglut/pkg-plist b/graphics/libglut/pkg-plist index bd3da1f..27f711b 100644 --- a/graphics/libglut/pkg-plist +++ b/graphics/libglut/pkg-plist @@ -1,6 +1,5 @@ include/GL/glut.h -include/GL/glutf90.h -lib/libglut.a lib/libglut.so -lib/libglut.so.4 +lib/libglut.so.3 +libdata/pkgconfig/glut.pc @dirrmtry include/GL diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile index 5429f72..04bd905 100644 --- a/graphics/mesa-demos/Makefile +++ b/graphics/mesa-demos/Makefile @@ -6,88 +6,39 @@ # PORTNAME= demos -PORTVERSION= 7.0.3 +PORTVERSION= ${MESAVERSION} CATEGORIES= graphics -MASTER_SITES= SF -MASTER_SITE_SUBDIR= mesa3d PKGNAMEPREFIX= mesa- -DISTFILES= MesaDemos-${PORTVERSION}${EXTRACT_SUFX} \ - MesaLib-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= araujo@FreeBSD.org COMMENT= OpenGL demos distributed with Mesa -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut +USE_GL= glu glut +USE_XORG= glproto x11 xext xxf86vm xdamage xfixes -USE_BZIP2= yes -USE_GMAKE= yes -MAKE_ARGS= SHELL=${SH} \ - SUBDIRS="progs/demos progs/xdemos" -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" -ALL_TARGET= default -WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION} -DATADIR= ${PREFIX}/share/mesa-demos - -DEMO_PROGS= arbfplight arbfslight arbocclude bounce clearspd cubemap \ - drawpix engine fire fogcoord fplight fslight gamma gearbox \ - gears geartrain glinfo gloss glslnoise gltestperf glutfx \ - ipers isosurf lodbias morph3d multiarb paltex pointblast \ - ray readpix reflect renormal shadowtex singlebuffer spectex \ - spriteblast stex3d streaming_rect teapot terrain tessdemo \ - texcyl texdown texenv texobj trispd tunnel tunnel2 vao_demo \ - winpos - -DEMO_IMAGES= arch.rgb bw.rgb girl.rgb girl2.rgb reflect.rgb s128.rgb \ - tile.rgb tree2.rgba tree3.rgb wrs_logo.rgb -DEMO_DATA= geartrain.dat isosurf.dat terrain.dat - -XDEMO_PROGS= glthreads glxcontexts glxdemo glxgears glxgears_fbconfig \ - glxheads glxinfo glxpbdemo glxpixmap glxswapcontrol manywin \ - offset overlay pbdemo pbinfo wincopy xfont xrotfontdemo - -# Generate packing list -PLIST_FILES= -.for prog in ${DEMO_PROGS} -PLIST_FILES+= bin/${prog} -.endfor -.for prog in ${XDEMO_PROGS} -PLIST_FILES+= bin/${prog} -.endfor -.for img in ${DEMO_IMAGES} -PLIST_FILES+= %%DATADIR%%/images/${img} -.endfor -.for dat in ${DEMO_DATA} -PLIST_FILES+= %%DATADIR%%/data/${dat} -.endfor -PLIST_DIRS= %%DATADIR%%/images %%DATADIR%%/data %%DATADIR%% - -post-extract: - ${CP} ${FILESDIR}/config ${WRKSRC}/configs/current - ${REINPLACE_CMD} -e 's|../images/|${DATADIR}/images/|g' \ - -e 's|geartrain.dat|${DATADIR}/data/geartrain.dat|g' \ - -e 's|terrain.dat|${DATADIR}/data/terrain.dat|g' \ - -e 's|isosurf.dat|${DATADIR}/data/isosurf.dat|g' \ - ${WRKSRC}/progs/demos/*.c ${WRKSRC}/progs/xdemos/*.c +DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME} do-install: - @for prog in ${DEMO_PROGS}; do \ - ${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/$$prog \ - ${PREFIX}/bin ; \ - done - @for prog in ${XDEMO_PROGS}; do \ - ${INSTALL_PROGRAM} ${WRKSRC}/progs/xdemos/$$prog \ - ${PREFIX}/bin ; \ + @for i in demos xdemos; do \ + cd ${WRKSRC}/progs/$$i; \ + for j in `${MAKE} -V PROGS`; do \ + echo ${INSTALL_PROGRAM} $$j ${PREFIX}/bin; \ + ${INSTALL_PROGRAM} $$j ${PREFIX}/bin; \ + done; \ done ${MKDIR} ${DATADIR}/images ${DATADIR}/data - @for img in ${DEMO_IMAGES}; do \ - ${INSTALL_DATA} ${WRKSRC}/progs/images/$$img \ - ${DATADIR}/images ; \ - done - @for dat in ${DEMO_DATA}; do \ - ${INSTALL_DATA} ${WRKSRC}/progs/demos/$$dat ${DATADIR}/data ; \ - done - + @cd ${WRKSRC}/progs/images; \ + for i in `ls *.rgb*`; do \ + echo ${INSTALL_DATA} $$i ${DATADIR}/images; \ + ${INSTALL_DATA} $$i ${DATADIR}/images; \ + done + @cd ${WRKSRC}/progs/demos; \ + for i in `ls *.dat`; do \ + echo ${INSTALL_DATA} $$i ${DATADIR}/data; \ + ${INSTALL_DATA} $$i ${DATADIR}/data; \ + done + +.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" .include .if defined(WITH_NVIDIA_GL) diff --git a/graphics/mesa-demos/distinfo b/graphics/mesa-demos/distinfo index 29ae4d8..f30869a 100644 --- a/graphics/mesa-demos/distinfo +++ b/graphics/mesa-demos/distinfo @@ -1,6 +1,6 @@ -MD5 (MesaDemos-7.0.3.tar.bz2) = 47fd6863621d3c9c7dbb870ab7f0c303 -SHA256 (MesaDemos-7.0.3.tar.bz2) = f0c55cc268de57157e3f80608fafa6b30f79f18f788cda5d9db5f5de900e2356 -SIZE (MesaDemos-7.0.3.tar.bz2) = 1342158 -MD5 (MesaLib-7.0.3.tar.bz2) = e6e6379d7793af40a6bc3ce1bace572e -SHA256 (MesaLib-7.0.3.tar.bz2) = ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22 -SIZE (MesaLib-7.0.3.tar.bz2) = 3389327 +MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5 +SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2 +SIZE (MesaLib-7.2.tar.bz2) = 3341919 +MD5 (MesaDemos-7.2.tar.bz2) = 22e03dc4038cd63f32c21eb60994892b +SHA256 (MesaDemos-7.2.tar.bz2) = 3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4 +SIZE (MesaDemos-7.2.tar.bz2) = 1360304 diff --git a/graphics/mesa-demos/pkg-plist b/graphics/mesa-demos/pkg-plist new file mode 100644 index 0000000..ac2bb13 --- /dev/null +++ b/graphics/mesa-demos/pkg-plist @@ -0,0 +1,92 @@ +bin/arbfplight +bin/arbfslight +bin/arbocclude +bin/bounce +bin/clearspd +bin/copypix +bin/corender +bin/cubemap +bin/drawpix +bin/engine +bin/fbo_firecube +bin/fire +bin/fogcoord +bin/fplight +bin/fslight +bin/gamma +bin/gearbox +bin/gears +bin/geartrain +bin/glinfo +bin/gloss +bin/glslnoise +bin/gltestperf +bin/glthreads +bin/glutfx +bin/glxcontexts +bin/glxdemo +bin/glxgears +bin/glxgears_fbconfig +bin/glxgears_pixmap +bin/glxheads +bin/glxinfo +bin/glxpbdemo +bin/glxpixmap +bin/glxsnoop +bin/glxswapcontrol +bin/ipers +bin/isosurf +bin/lodbias +bin/manywin +bin/morph3d +bin/multiarb +bin/offset +bin/overlay +bin/paltex +bin/pbdemo +bin/pbinfo +bin/pointblast +bin/rain +bin/ray +bin/readpix +bin/reflect +bin/renormal +bin/shadowtex +bin/sharedtex +bin/singlebuffer +bin/spectex +bin/spriteblast +bin/stex3d +bin/streaming_rect +bin/teapot +bin/terrain +bin/tessdemo +bin/texcyl +bin/texdown +bin/texenv +bin/texobj +bin/texture_from_pixmap +bin/trispd +bin/tunnel +bin/tunnel2 +bin/vao_demo +bin/wincopy +bin/winpos +bin/xfont +bin/xrotfontdemo +%%DATADIR%%/data/geartrain.dat +%%DATADIR%%/data/isosurf.dat +%%DATADIR%%/data/terrain.dat +%%DATADIR%%/images/arch.rgb +%%DATADIR%%/images/bw.rgb +%%DATADIR%%/images/girl.rgb +%%DATADIR%%/images/girl2.rgb +%%DATADIR%%/images/reflect.rgb +%%DATADIR%%/images/s128.rgb +%%DATADIR%%/images/tile.rgb +%%DATADIR%%/images/tree2.rgba +%%DATADIR%%/images/tree3.rgb +%%DATADIR%%/images/wrs_logo.rgb +@dirrm %%DATADIR%%/images +@dirrm %%DATADIR%%/data +@dirrm %%DATADIR%% diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index 5a08b5a..69ab24d 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -8,7 +8,7 @@ PORTNAME= hal DISTVERSION= 0.5.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ diff --git a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi b/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi index f7af321..00781db 100644 --- a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi +++ b/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi @@ -1,6 +1,6 @@ ---- fdi/policy/10osvendor/10-x11-input.fdi.orig 2008-03-27 13:42:31.000000000 -0400 -+++ fdi/policy/10osvendor/10-x11-input.fdi 2008-03-27 13:48:06.000000000 -0400 -@@ -1,15 +1,6 @@ +--- fdi/policy/10osvendor/10-x11-input.fdi.orig 2008-09-24 14:32:26.000000000 +0100 ++++ fdi/policy/10osvendor/10-x11-input.fdi 2008-09-24 14:34:22.000000000 +0100 +@@ -1,19 +1,10 @@ @@ -13,6 +13,12 @@ - - - - +- ++ +- keyboard ++ kbd + + evdev diff --git a/x11-drivers/synaptics/Makefile b/x11-drivers/synaptics/Makefile index 47a8fde..6a332fd 100644 --- a/x11-drivers/synaptics/Makefile +++ b/x11-drivers/synaptics/Makefile @@ -26,7 +26,7 @@ USE_GMAKE= yes MASTER_SITES+= ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/:x11 \ http://xorg.freedesktop.org/releases/individual/xserver/:x11 DIST_SUBDIR= xorg/xserver -X_DISTFILES= xorg-server-1.4.2.tar.bz2 +X_DISTFILES= xorg-server-1.5.0.tar.bz2 EXTRA_PATCHES= ${FILESDIR}/extra-xorg-server-1.4 post-patch: diff --git a/x11-drivers/synaptics/distinfo b/x11-drivers/synaptics/distinfo index 1712be2..446b50d 100644 --- a/x11-drivers/synaptics/distinfo +++ b/x11-drivers/synaptics/distinfo @@ -1,6 +1,6 @@ MD5 (xorg/xserver/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af SHA256 (xorg/xserver/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429 SIZE (xorg/xserver/synaptics-0.14.6.tar.bz2) = 126833 -MD5 (xorg/xserver/xorg-server-1.4.2.tar.bz2) = fa2915ae377f61c340a18ebef484b64b -SHA256 (xorg/xserver/xorg-server-1.4.2.tar.bz2) = 829c66ec4c295822700067c87afae796b8e67530cc65a7b83060ea29a4ff316d -SIZE (xorg/xserver/xorg-server-1.4.2.tar.bz2) = 6216638 +MD5 (xorg/xserver/xorg-server-1.5.0.tar.bz2) = 9a817e5f7374d45b4dbe64b21bc0fb61 +SHA256 (xorg/xserver/xorg-server-1.5.0.tar.bz2) = 9a0687812eaceaccc21d55dead47f1fbecf8300a28604bd2c08aae6ff7874cd0 +SIZE (xorg/xserver/xorg-server-1.5.0.tar.bz2) = 5613930 diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile index 084cc73..cc2bd73 100644 --- a/x11-drivers/xf86-input-acecad/Makefile +++ b/x11-drivers/xf86-input-acecad/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-acecad -PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTVERSION= 1.2.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-acecad/distinfo b/x11-drivers/xf86-input-acecad/distinfo index b76810f..78a38ab 100644 --- a/x11-drivers/xf86-input-acecad/distinfo +++ b/x11-drivers/xf86-input-acecad/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-acecad-1.2.1.tar.bz2) = 2c371317f2aae34c04db63c19759a44e -SHA256 (xorg/driver/xf86-input-acecad-1.2.1.tar.bz2) = 07d2f8a1153d34a6516b8f1129fc32a18f2862bbb58c9bad4637fb282d60385a -SIZE (xorg/driver/xf86-input-acecad-1.2.1.tar.bz2) = 230394 +MD5 (xorg/driver/xf86-input-acecad-1.2.2.tar.bz2) = 2d6596b2b0cfa527b5ed4df2014684bf +SHA256 (xorg/driver/xf86-input-acecad-1.2.2.tar.bz2) = 953ebb7d7ed579ce648dd6f6a25307c37ad8230a0336ec6fc58247732835f26e +SIZE (xorg/driver/xf86-input-acecad-1.2.2.tar.bz2) = 230781 diff --git a/x11-drivers/xf86-input-calcomp/Makefile b/x11-drivers/xf86-input-calcomp/Makefile index 2f3ca08..50a656e 100644 --- a/x11-drivers/xf86-input-calcomp/Makefile +++ b/x11-drivers/xf86-input-calcomp/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-calcomp -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.1.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-calcomp/distinfo b/x11-drivers/xf86-input-calcomp/distinfo index c414423..6d65253 100644 --- a/x11-drivers/xf86-input-calcomp/distinfo +++ b/x11-drivers/xf86-input-calcomp/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-calcomp-1.1.1.tar.bz2) = 689099e2ade8a8c9f68f82fdf569b3ad -SHA256 (xorg/driver/xf86-input-calcomp-1.1.1.tar.bz2) = 8117b37da2e031eb983e1e98034710a1511299496fcf235f936caff252fa8957 -SIZE (xorg/driver/xf86-input-calcomp-1.1.1.tar.bz2) = 225927 +MD5 (xorg/driver/xf86-input-calcomp-1.1.2.tar.bz2) = ebc9a64dc72ae3015c16011bbd2d3557 +SHA256 (xorg/driver/xf86-input-calcomp-1.1.2.tar.bz2) = bf6edb9d78c90952a16c8bab9e69aebb3e1361e4423ec90e47df57e8c873254b +SIZE (xorg/driver/xf86-input-calcomp-1.1.2.tar.bz2) = 244642 diff --git a/x11-drivers/xf86-input-digitaledge/Makefile b/x11-drivers/xf86-input-digitaledge/Makefile index 8db67bb..805a662 100644 --- a/x11-drivers/xf86-input-digitaledge/Makefile +++ b/x11-drivers/xf86-input-digitaledge/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-digitaledge -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.1.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-digitaledge/distinfo b/x11-drivers/xf86-input-digitaledge/distinfo index 8fe3d8b..ee055ff 100644 --- a/x11-drivers/xf86-input-digitaledge/distinfo +++ b/x11-drivers/xf86-input-digitaledge/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-digitaledge-1.1.0.tar.bz2) = 53461c34cc0712aacab92b820b9fcb84 -SHA256 (xorg/driver/xf86-input-digitaledge-1.1.0.tar.bz2) = 24001f19b46b5bc2fcf8212f04863e4efa90175fac797350525e14848ab98a38 -SIZE (xorg/driver/xf86-input-digitaledge-1.1.0.tar.bz2) = 232925 +MD5 (xorg/driver/xf86-input-digitaledge-1.1.1.tar.bz2) = 4c27e0f3c6447e76df39a837fd46a00f +SHA256 (xorg/driver/xf86-input-digitaledge-1.1.1.tar.bz2) = ded010f82b1dbb57b1ee0ad6707902b31540e0592c94d6bbf3b43a7a35220775 +SIZE (xorg/driver/xf86-input-digitaledge-1.1.1.tar.bz2) = 242609 diff --git a/x11-drivers/xf86-input-dmc/Makefile b/x11-drivers/xf86-input-dmc/Makefile index 1cbfa65..098e2da 100644 --- a/x11-drivers/xf86-input-dmc/Makefile +++ b/x11-drivers/xf86-input-dmc/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-dmc -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.1.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-dmc/distinfo b/x11-drivers/xf86-input-dmc/distinfo index cc33e98..401682b 100644 --- a/x11-drivers/xf86-input-dmc/distinfo +++ b/x11-drivers/xf86-input-dmc/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-dmc-1.1.1.tar.bz2) = f21f008220bc7687ce1c34ab557ec32f -SHA256 (xorg/driver/xf86-input-dmc-1.1.1.tar.bz2) = f98c5a7010fa71cee88b4c2470e5cd804e42dfbc5292cf1c20eb75e9b1814002 -SIZE (xorg/driver/xf86-input-dmc-1.1.1.tar.bz2) = 223565 +MD5 (xorg/driver/xf86-input-dmc-1.1.2.tar.bz2) = 91021ea8f3593221c0d9ee9cc14deb48 +SHA256 (xorg/driver/xf86-input-dmc-1.1.2.tar.bz2) = b6f4eb367ab1aa7da5ac5218953d7cdde409c9ddf59f6cb6b2e1aa2789b3f361 +SIZE (xorg/driver/xf86-input-dmc-1.1.2.tar.bz2) = 241971 diff --git a/x11-drivers/xf86-input-dynapro/Makefile b/x11-drivers/xf86-input-dynapro/Makefile index 8ba7978..dc42781 100644 --- a/x11-drivers/xf86-input-dynapro/Makefile +++ b/x11-drivers/xf86-input-dynapro/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-dynapro -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.1.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-dynapro/distinfo b/x11-drivers/xf86-input-dynapro/distinfo index 4bf7cc3..0ae43f0 100644 --- a/x11-drivers/xf86-input-dynapro/distinfo +++ b/x11-drivers/xf86-input-dynapro/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-dynapro-1.1.1.tar.bz2) = d47be12a230c44a05d56d6b79ebcfc38 -SHA256 (xorg/driver/xf86-input-dynapro-1.1.1.tar.bz2) = ed0f1ba81febf8e7a20cfaf32b021fcaa102af37f3070d67d6a101eeb6964992 -SIZE (xorg/driver/xf86-input-dynapro-1.1.1.tar.bz2) = 222619 +MD5 (xorg/driver/xf86-input-dynapro-1.1.2.tar.bz2) = ceb5efbd3d62e24ab3a5f9f180777f7c +SHA256 (xorg/driver/xf86-input-dynapro-1.1.2.tar.bz2) = 55b7b2e950331292ec05c81d566af6d1000ac3cf904068964c3b9d43cea4deec +SIZE (xorg/driver/xf86-input-dynapro-1.1.2.tar.bz2) = 241219 diff --git a/x11-drivers/xf86-input-elo2300/Makefile b/x11-drivers/xf86-input-elo2300/Makefile index 879cc50..a9debf8 100644 --- a/x11-drivers/xf86-input-elo2300/Makefile +++ b/x11-drivers/xf86-input-elo2300/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-elo2300 -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.1.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-elo2300/distinfo b/x11-drivers/xf86-input-elo2300/distinfo index 3dc0e12..1e47179 100644 --- a/x11-drivers/xf86-input-elo2300/distinfo +++ b/x11-drivers/xf86-input-elo2300/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-elo2300-1.1.1.tar.bz2) = 4eef20f44954d49571a10b9134fdb663 -SHA256 (xorg/driver/xf86-input-elo2300-1.1.1.tar.bz2) = cc2cd97f49cce1795ea74034b1416ff7cd5107e1a69258b09a741d55a98ba005 -SIZE (xorg/driver/xf86-input-elo2300-1.1.1.tar.bz2) = 225191 +MD5 (xorg/driver/xf86-input-elo2300-1.1.2.tar.bz2) = 611d0a77a80286bc926dd3c414e59555 +SHA256 (xorg/driver/xf86-input-elo2300-1.1.2.tar.bz2) = ce575f79a5a93f4129a4e63572911d54cdc6640abc303afeb3c74741bb3c9627 +SIZE (xorg/driver/xf86-input-elo2300-1.1.2.tar.bz2) = 244443 diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile index dcc6704..0a9c1b2 100644 --- a/x11-drivers/xf86-input-elographics/Makefile +++ b/x11-drivers/xf86-input-elographics/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-elographics -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-elographics/distinfo b/x11-drivers/xf86-input-elographics/distinfo index ad1f756..3c9b42e 100644 --- a/x11-drivers/xf86-input-elographics/distinfo +++ b/x11-drivers/xf86-input-elographics/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-elographics-1.1.0.tar.bz2) = ecb2bf1f800d4f5f4c295f2a0e6b1de7 -SHA256 (xorg/driver/xf86-input-elographics-1.1.0.tar.bz2) = 1583e1dae6e3ecd34ba55deae7dfc052efede0378f852de6224308d7e7d5b2d8 -SIZE (xorg/driver/xf86-input-elographics-1.1.0.tar.bz2) = 236648 +MD5 (xorg/driver/xf86-input-elographics-1.2.1.tar.bz2) = 0b057e2bd9b0b3852d22370f0618ec12 +SHA256 (xorg/driver/xf86-input-elographics-1.2.1.tar.bz2) = d3a1f72a07e0b4747f96c91bc5cde762fafeb6fbe411319285250b70e3759be1 +SIZE (xorg/driver/xf86-input-elographics-1.2.1.tar.bz2) = 246178 diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile index 0bfa18d..fd3a610 100644 --- a/x11-drivers/xf86-input-fpit/Makefile +++ b/x11-drivers/xf86-input-fpit/Makefile @@ -6,14 +6,15 @@ # PORTNAME= xf86-input-fpit -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org fpit input driver XORG_CAT= driver +USE_XORG= xrandr + MAN4= fpit.4x .include diff --git a/x11-drivers/xf86-input-fpit/distinfo b/x11-drivers/xf86-input-fpit/distinfo index a4c1fbe..86316bb 100644 --- a/x11-drivers/xf86-input-fpit/distinfo +++ b/x11-drivers/xf86-input-fpit/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-fpit-1.1.0.tar.bz2) = a31066a2076d18619ceaea67f6d89698 -SHA256 (xorg/driver/xf86-input-fpit-1.1.0.tar.bz2) = 8ee3b2df90516182460fbda025153aa7fb2c6ba343e4239d225963a287f694f8 -SIZE (xorg/driver/xf86-input-fpit-1.1.0.tar.bz2) = 232340 +MD5 (xorg/driver/xf86-input-fpit-1.2.0.tar.bz2) = 0f3e013d5ff58e0aba3d9e1d18830291 +SHA256 (xorg/driver/xf86-input-fpit-1.2.0.tar.bz2) = 87e3dd97d57ddb520cafa5e68fa7846cfc3d9d71cb054cdf0e1d650c7b1cff7e +SIZE (xorg/driver/xf86-input-fpit-1.2.0.tar.bz2) = 242815 diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile index e9aea09..ae903ff 100644 --- a/x11-drivers/xf86-input-hyperpen/Makefile +++ b/x11-drivers/xf86-input-hyperpen/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-hyperpen -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-hyperpen/distinfo b/x11-drivers/xf86-input-hyperpen/distinfo index bdff1d5..c6af6e0 100644 --- a/x11-drivers/xf86-input-hyperpen/distinfo +++ b/x11-drivers/xf86-input-hyperpen/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-hyperpen-1.1.0.tar.bz2) = 1dfccb75069e61e0c6f990b47eb58c40 -SHA256 (xorg/driver/xf86-input-hyperpen-1.1.0.tar.bz2) = d1c20a3340e06c5634759832dcf2edc6acb41476a4f637eba6880730e607f493 -SIZE (xorg/driver/xf86-input-hyperpen-1.1.0.tar.bz2) = 235132 +MD5 (xorg/driver/xf86-input-hyperpen-1.2.0.tar.bz2) = 175c1e1ad668ebbbe212c1e975dd14f9 +SHA256 (xorg/driver/xf86-input-hyperpen-1.2.0.tar.bz2) = 689d1c5c1f21eed00ae03a01c57482f7bbef36d7e07156556c99febe28c7d413 +SIZE (xorg/driver/xf86-input-hyperpen-1.2.0.tar.bz2) = 244682 diff --git a/x11-drivers/xf86-input-jamstudio/Makefile b/x11-drivers/xf86-input-jamstudio/Makefile index a35a124..611854b 100644 --- a/x11-drivers/xf86-input-jamstudio/Makefile +++ b/x11-drivers/xf86-input-jamstudio/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-jamstudio -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-jamstudio/distinfo b/x11-drivers/xf86-input-jamstudio/distinfo index 6bb1206..b6e86cc 100644 --- a/x11-drivers/xf86-input-jamstudio/distinfo +++ b/x11-drivers/xf86-input-jamstudio/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-jamstudio-1.1.0.tar.bz2) = a32e36a24545791a3408cdc5563b6523 -SHA256 (xorg/driver/xf86-input-jamstudio-1.1.0.tar.bz2) = ce41b360bd08ea31036b79cfc25a32c854147522e4580f5ca1a203233e657e1a -SIZE (xorg/driver/xf86-input-jamstudio-1.1.0.tar.bz2) = 226459 +MD5 (xorg/driver/xf86-input-jamstudio-1.2.0.tar.bz2) = 8011f90d7dd801d26e8c3dd058633978 +SHA256 (xorg/driver/xf86-input-jamstudio-1.2.0.tar.bz2) = c5bbade96f1849b45f665a54e08ac8f9d5a94d31a8a680edc4d3c9361d164ac0 +SIZE (xorg/driver/xf86-input-jamstudio-1.2.0.tar.bz2) = 236377 diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile index e95bc48..a14aec3 100644 --- a/x11-drivers/xf86-input-joystick/Makefile +++ b/x11-drivers/xf86-input-joystick/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-joystick -PORTVERSION= 1.2.3 -PORTREVISION= 1 +PORTVERSION= 1.3.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-joystick/distinfo b/x11-drivers/xf86-input-joystick/distinfo index b15366e..3cde4cb 100644 --- a/x11-drivers/xf86-input-joystick/distinfo +++ b/x11-drivers/xf86-input-joystick/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-joystick-1.2.3.tar.bz2) = 41f33b1a18c576433222d8b6ca22c738 -SHA256 (xorg/driver/xf86-input-joystick-1.2.3.tar.bz2) = 708e01ca0f0e12a94f20566c18edc8ca71063dbc4c00e2cd78300236ee5954f7 -SIZE (xorg/driver/xf86-input-joystick-1.2.3.tar.bz2) = 239917 +MD5 (xorg/driver/xf86-input-joystick-1.3.2.tar.bz2) = e48b99e55093525ebb7811a014391a0b +SHA256 (xorg/driver/xf86-input-joystick-1.3.2.tar.bz2) = 6cad238e0a54dec75c5224f9c0774b4fce2a03b06f1c61b404e9ea97d4941d4b +SIZE (xorg/driver/xf86-input-joystick-1.3.2.tar.bz2) = 284489 diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile index f240d76..9813c29 100644 --- a/x11-drivers/xf86-input-keyboard/Makefile +++ b/x11-drivers/xf86-input-keyboard/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-keyboard -PORTVERSION= 1.2.2 -PORTREVISION= 2 +PORTVERSION= 1.3.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo index 6167681..8afaa74 100644 --- a/x11-drivers/xf86-input-keyboard/distinfo +++ b/x11-drivers/xf86-input-keyboard/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-keyboard-1.2.2.tar.bz2) = ab3122921f6359c54e250879288ffd47 -SHA256 (xorg/driver/xf86-input-keyboard-1.2.2.tar.bz2) = c25b35524eaf00928d97bd0d8bf9e489d92993b133461b5f4d8d9655d37ec072 -SIZE (xorg/driver/xf86-input-keyboard-1.2.2.tar.bz2) = 245665 +MD5 (xorg/driver/xf86-input-keyboard-1.3.1.tar.bz2) = ebe5dcf8eed819103909f18321fc3b9d +SHA256 (xorg/driver/xf86-input-keyboard-1.3.1.tar.bz2) = 7b514715dfb5a2512dea3355bc3f09eb879d7184440c5525f0a9d29ec9f3be42 +SIZE (xorg/driver/xf86-input-keyboard-1.3.1.tar.bz2) = 265170 diff --git a/x11-drivers/xf86-input-magellan/Makefile b/x11-drivers/xf86-input-magellan/Makefile index 3a5cb45..0732dd5 100644 --- a/x11-drivers/xf86-input-magellan/Makefile +++ b/x11-drivers/xf86-input-magellan/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-magellan -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-magellan/distinfo b/x11-drivers/xf86-input-magellan/distinfo index 736cfcd..d237844 100644 --- a/x11-drivers/xf86-input-magellan/distinfo +++ b/x11-drivers/xf86-input-magellan/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-magellan-1.1.1.tar.bz2) = 8a966d3b74dc2a801ff09b895037090c -SHA256 (xorg/driver/xf86-input-magellan-1.1.1.tar.bz2) = 06da7d1b222ba47ba0c7fd561965d78f2c8e46f44c998cb768e98bdc3c0e1741 -SIZE (xorg/driver/xf86-input-magellan-1.1.1.tar.bz2) = 223055 +MD5 (xorg/driver/xf86-input-magellan-1.2.0.tar.bz2) = 9801ba10f15f8be2420dfb3f3b5d5d27 +SHA256 (xorg/driver/xf86-input-magellan-1.2.0.tar.bz2) = c5285147a4df0b5b0fd5dcb7c0e5953bc982d3d6f2a2ed2e7767ead909a510e4 +SIZE (xorg/driver/xf86-input-magellan-1.2.0.tar.bz2) = 241520 diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile index e3b30eb..a2c92aa 100644 --- a/x11-drivers/xf86-input-magictouch/Makefile +++ b/x11-drivers/xf86-input-magictouch/Makefile @@ -13,6 +13,8 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org magictouch input driver +IGNORE= needs xf86_ansic.h which doesn't exist with recent xserver + XORG_CAT= driver MAN4= magictouch.4x USE_AUTOTOOLS= libtool:15 diff --git a/x11-drivers/xf86-input-microtouch/Makefile b/x11-drivers/xf86-input-microtouch/Makefile index 9cbfd1d..8dc50fb 100644 --- a/x11-drivers/xf86-input-microtouch/Makefile +++ b/x11-drivers/xf86-input-microtouch/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-microtouch -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-microtouch/distinfo b/x11-drivers/xf86-input-microtouch/distinfo index 149e928..9b68bda 100644 --- a/x11-drivers/xf86-input-microtouch/distinfo +++ b/x11-drivers/xf86-input-microtouch/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-microtouch-1.1.1.tar.bz2) = 9843fbea6cc0c4129e96ce9a6c893cf6 -SHA256 (xorg/driver/xf86-input-microtouch-1.1.1.tar.bz2) = 5f2f0b16705c6226081a452f9f876508c388b384fca69106d377cd134cfddfd3 -SIZE (xorg/driver/xf86-input-microtouch-1.1.1.tar.bz2) = 226034 +MD5 (xorg/driver/xf86-input-microtouch-1.2.0.tar.bz2) = 1ad1aee7d8df84b9ea832d1e75963257 +SHA256 (xorg/driver/xf86-input-microtouch-1.2.0.tar.bz2) = b3034e0a768c4f646ea954d59dd414d00df3238e845848081221af6efe864f3b +SIZE (xorg/driver/xf86-input-microtouch-1.2.0.tar.bz2) = 244712 diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile index 8b4144d..15a04ce 100644 --- a/x11-drivers/xf86-input-mouse/Makefile +++ b/x11-drivers/xf86-input-mouse/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-mouse -PORTVERSION= 1.2.3 -PORTREVISION= 2 +PORTVERSION= 1.3.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-mouse/distinfo b/x11-drivers/xf86-input-mouse/distinfo index f34123f..a1590aa 100644 --- a/x11-drivers/xf86-input-mouse/distinfo +++ b/x11-drivers/xf86-input-mouse/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-mouse-1.2.3.tar.bz2) = 47da1fa52584933d045528109f094eff -SHA256 (xorg/driver/xf86-input-mouse-1.2.3.tar.bz2) = a07cb2169f43018c90b7889781c0db30cda0da03811edccb8c4db533166357ab -SIZE (xorg/driver/xf86-input-mouse-1.2.3.tar.bz2) = 272961 +MD5 (xorg/driver/xf86-input-mouse-1.3.0.tar.bz2) = 31a51b0e5ddc4fac19754f48a3adf881 +SHA256 (xorg/driver/xf86-input-mouse-1.3.0.tar.bz2) = 054b253f366795c2865714ce8bc545c79e59aa9ce1b7a9a4a05b9c674dff9dec +SIZE (xorg/driver/xf86-input-mouse-1.3.0.tar.bz2) = 282157 diff --git a/x11-drivers/xf86-input-mouse/files/patch-dont-flush-buttons-6a03e8bd b/x11-drivers/xf86-input-mouse/files/patch-dont-flush-buttons-6a03e8bd deleted file mode 100644 index d1a21ed..0000000 --- a/x11-drivers/xf86-input-mouse/files/patch-dont-flush-buttons-6a03e8bd +++ /dev/null @@ -1,38 +0,0 @@ -From 6a03e8bd9699a33dabcdd2bbcf51a001ddfd5534 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 16 Nov 2007 06:15:45 +0000 -Subject: Bug #13144: Don't flush buttons, release events can cause paste events. - ---- -diff --git src/mouse.c src/mouse.c -index ff52d2b..bd98a80 100644 ---- src/mouse.c -+++ src/mouse.c -@@ -1853,26 +1853,17 @@ MouseConvert(InputInfoPtr pInfo, int first, int num, int v0, int v1, int v2, - - /********************************************************************** - * -- * FlushButtons -- send button up events for sanity. -+ * FlushButtons -- reset button states. - * - **********************************************************************/ - - static void - FlushButtons(MouseDevPtr pMse) - { -- -- /* If no button down is pending xf86PostButtonEvent() -- * will discard them. So we are on the safe side. */ -- - int i, blocked; - - pMse->lastButtons = 0; - pMse->lastMappedButtons = 0; -- -- blocked = xf86BlockSIGIO (); -- for (i = 1; i <= 5; i++) -- xf86PostButtonEvent(pMse->device,0,i,0,0,0); -- xf86UnblockSIGIO (blocked); - } - - /********************************************************************** diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile index e659cee..efaa26a 100644 --- a/x11-drivers/xf86-input-mutouch/Makefile +++ b/x11-drivers/xf86-input-mutouch/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-mutouch -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-mutouch/distinfo b/x11-drivers/xf86-input-mutouch/distinfo index 591d113..c044317 100644 --- a/x11-drivers/xf86-input-mutouch/distinfo +++ b/x11-drivers/xf86-input-mutouch/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-mutouch-1.1.0.tar.bz2) = 98ae915c67cabf0e6d40a425dbdbe10b -SHA256 (xorg/driver/xf86-input-mutouch-1.1.0.tar.bz2) = cc67e0dd4f4fcc8d798f0bfe42b975132c5739bdd80809580a74182e4d1b62ea -SIZE (xorg/driver/xf86-input-mutouch-1.1.0.tar.bz2) = 236844 +MD5 (xorg/driver/xf86-input-mutouch-1.2.0.tar.bz2) = 50711d390d2867e3fa7e06b59b2d575b +SHA256 (xorg/driver/xf86-input-mutouch-1.2.0.tar.bz2) = 214f0831f36ebfc081b9f31f91ae27972ced9371b9b2256650998596a097061d +SIZE (xorg/driver/xf86-input-mutouch-1.2.0.tar.bz2) = 246167 diff --git a/x11-drivers/xf86-input-palmax/Makefile b/x11-drivers/xf86-input-palmax/Makefile index b24b0c7..82667e6 100644 --- a/x11-drivers/xf86-input-palmax/Makefile +++ b/x11-drivers/xf86-input-palmax/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-palmax -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-palmax/distinfo b/x11-drivers/xf86-input-palmax/distinfo index 6becf14..a1c9a27 100644 --- a/x11-drivers/xf86-input-palmax/distinfo +++ b/x11-drivers/xf86-input-palmax/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-palmax-1.1.0.tar.bz2) = 0959dbf7972dfb95f56e4bd3f56447cf -SHA256 (xorg/driver/xf86-input-palmax-1.1.0.tar.bz2) = 5c00c85eed2950a575362bee2f21c2fa68eb8af81e7f1d451273a1302eac4145 -SIZE (xorg/driver/xf86-input-palmax-1.1.0.tar.bz2) = 229673 +MD5 (xorg/driver/xf86-input-palmax-1.2.0.tar.bz2) = 9655d2235569c5a6ac321c6fb89a6f3b +SHA256 (xorg/driver/xf86-input-palmax-1.2.0.tar.bz2) = 02177c339ba60fb6cc942d3bc93a322e94247f36a6fe90c7c1121694c929b05b +SIZE (xorg/driver/xf86-input-palmax-1.2.0.tar.bz2) = 239602 diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile index 0a6d6b6..60b9e00 100644 --- a/x11-drivers/xf86-input-penmount/Makefile +++ b/x11-drivers/xf86-input-penmount/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-penmount -PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTVERSION= 1.3.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-penmount/distinfo b/x11-drivers/xf86-input-penmount/distinfo index af64b16..df02c34 100644 --- a/x11-drivers/xf86-input-penmount/distinfo +++ b/x11-drivers/xf86-input-penmount/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-penmount-1.2.1.tar.bz2) = 268af4dceda544d8c815b9b7e87d4536 -SHA256 (xorg/driver/xf86-input-penmount-1.2.1.tar.bz2) = fab08de727da6f56b82d8ecee451a52e7129ff80522e711c5322f1bd2fa9970a -SIZE (xorg/driver/xf86-input-penmount-1.2.1.tar.bz2) = 224350 +MD5 (xorg/driver/xf86-input-penmount-1.3.0.tar.bz2) = 24594c0222e631fedccc7c540c420b03 +SHA256 (xorg/driver/xf86-input-penmount-1.3.0.tar.bz2) = 9cb4e0e83dcefe1ece814d638bd186785b6bc1debe1aa2101ce2a4ea0376805a +SIZE (xorg/driver/xf86-input-penmount-1.3.0.tar.bz2) = 243048 diff --git a/x11-drivers/xf86-input-summa/Makefile b/x11-drivers/xf86-input-summa/Makefile index ec5addd..b5e1d2a 100644 --- a/x11-drivers/xf86-input-summa/Makefile +++ b/x11-drivers/xf86-input-summa/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-summa -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-summa/distinfo b/x11-drivers/xf86-input-summa/distinfo index 1c67f94..7f4890c 100644 --- a/x11-drivers/xf86-input-summa/distinfo +++ b/x11-drivers/xf86-input-summa/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-summa-1.1.0.tar.bz2) = b37a432fd87bb9f46d011622d6fce6b3 -SHA256 (xorg/driver/xf86-input-summa-1.1.0.tar.bz2) = f10f2cadd4120b40b3658000c87f910e3005f4d787441c7dd83b48ebbf2a11f2 -SIZE (xorg/driver/xf86-input-summa-1.1.0.tar.bz2) = 235031 +MD5 (xorg/driver/xf86-input-summa-1.2.0.tar.bz2) = 7e17468c0d90dcbbb6202a8242efff4b +SHA256 (xorg/driver/xf86-input-summa-1.2.0.tar.bz2) = 3e8bcd89b4b3f86677f338a4584f41acb2a3cca7fe492cbea32664aa6f4f8cd8 +SIZE (xorg/driver/xf86-input-summa-1.2.0.tar.bz2) = 244435 diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile new file mode 100644 index 0000000..e7eaae4 --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/Makefile @@ -0,0 +1,26 @@ +# New ports collection makefile for: xf86-input-synaptics +# Date Created: 25 Sep 2008 +# Whom: Florent Thoumie +# +# $FreeBSD$ +# + +PORTNAME= xf86-input-synaptics +PORTVERSION= 0.15.2 +CATEGORIES= x11-drivers + +MAINTAINER= x11@FreeBSD.org +COMMENT= X.Org synaptics input driver + +USE_XORG= x11 +XORG_CAT= driver + +MAN1= syndaemon.1 \ + synclient.1 +MAN4= synaptics.4x + +post-install: + ${INSTALL_DATA} ${WRKSRC}/fdi/11-x11-synaptics.fdi \ + ${PREFIX}/share/hal/fdi/policy/10osvendor/ + +.include diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo new file mode 100644 index 0000000..fe896fa --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/distinfo @@ -0,0 +1,3 @@ +MD5 (xorg/driver/xf86-input-synaptics-0.15.2.tar.bz2) = 54565b65d115e8659ea061ef32809ed2 +SHA256 (xorg/driver/xf86-input-synaptics-0.15.2.tar.bz2) = d61f13acc20063665b79a639bf761f8efafde30598a9c400da877548d1a6e7bb +SIZE (xorg/driver/xf86-input-synaptics-0.15.2.tar.bz2) = 288531 diff --git a/x11-drivers/xf86-input-synaptics/pkg-descr b/x11-drivers/xf86-input-synaptics/pkg-descr new file mode 100644 index 0000000..2272145 --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/pkg-descr @@ -0,0 +1,4 @@ +This package contains the X.Org xf86-input-synaptics driver. + +- Florent Thoumie +flz@FreeBSD.org diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf86-input-synaptics/pkg-plist new file mode 100644 index 0000000..4633cb7 --- /dev/null +++ b/x11-drivers/xf86-input-synaptics/pkg-plist @@ -0,0 +1,8 @@ +bin/synclient +bin/syndaemon +lib/xorg/modules/input/synaptics_drv.la +lib/xorg/modules/input/synaptics_drv.so +share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi +@dirrmtry lib/xorg/modules/input +@dirrmtry lib/xorg/modules +@dirrmtry lib/xorg diff --git a/x11-drivers/xf86-input-tek4957/Makefile b/x11-drivers/xf86-input-tek4957/Makefile index 2d26140..50c9db2 100644 --- a/x11-drivers/xf86-input-tek4957/Makefile +++ b/x11-drivers/xf86-input-tek4957/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-tek4957 -PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-tek4957/distinfo b/x11-drivers/xf86-input-tek4957/distinfo index 7defb61..adb7e92 100644 --- a/x11-drivers/xf86-input-tek4957/distinfo +++ b/x11-drivers/xf86-input-tek4957/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-tek4957-1.1.0.tar.bz2) = be8a4bd474ad6c85b93f66dd6fcfa6ee -SHA256 (xorg/driver/xf86-input-tek4957-1.1.0.tar.bz2) = 09b9506d1bb1deaaf69872392bc56e1d75997bb8157e85a9121749bf5fe15727 -SIZE (xorg/driver/xf86-input-tek4957-1.1.0.tar.bz2) = 229426 +MD5 (xorg/driver/xf86-input-tek4957-1.2.0.tar.bz2) = 8103db1ca5c55726e0b58148e4b1fc06 +SHA256 (xorg/driver/xf86-input-tek4957-1.2.0.tar.bz2) = b097a5b1acbd732d9ca5d28c13003a1f1c8a3465f4fa77c1578d36330f3358a2 +SIZE (xorg/driver/xf86-input-tek4957-1.2.0.tar.bz2) = 239405 diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile index 8ac630f..f5553f7 100644 --- a/x11-drivers/xf86-input-vmmouse/Makefile +++ b/x11-drivers/xf86-input-vmmouse/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-input-vmmouse -PORTVERSION= 12.4.3 -PORTREVISION= 2 +PORTVERSION= 12.5.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-vmmouse/distinfo b/x11-drivers/xf86-input-vmmouse/distinfo index 64f21f5..f972d1d 100644 --- a/x11-drivers/xf86-input-vmmouse/distinfo +++ b/x11-drivers/xf86-input-vmmouse/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-vmmouse-12.4.3.tar.bz2) = 44730af795616ed4d4a0cd9a3a07935d -SHA256 (xorg/driver/xf86-input-vmmouse-12.4.3.tar.bz2) = d668c4cacd4be6d56608fbdf7779d60120f38f3315e6385a7cc87339124e77ab -SIZE (xorg/driver/xf86-input-vmmouse-12.4.3.tar.bz2) = 248239 +MD5 (xorg/driver/xf86-input-vmmouse-12.5.1.tar.bz2) = 1e2feafb8e4f1b670aeb39bcac9fbb18 +SHA256 (xorg/driver/xf86-input-vmmouse-12.5.1.tar.bz2) = 63608ba07138f01eadb9a02d8054c306501d907dd706ae61fdc030c50a7bfcfb +SIZE (xorg/driver/xf86-input-vmmouse-12.5.1.tar.bz2) = 245459 diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile index 7c241ca..777a308 100644 --- a/x11-drivers/xf86-video-apm/Makefile +++ b/x11-drivers/xf86-video-apm/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-apm -PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-apm/distinfo b/x11-drivers/xf86-video-apm/distinfo index 6255b59..24be840 100644 --- a/x11-drivers/xf86-video-apm/distinfo +++ b/x11-drivers/xf86-video-apm/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-apm-1.1.1.tar.bz2) = ac7e05f0dfc7e02cac0bf17b9eb89b11 -SHA256 (xorg/driver/xf86-video-apm-1.1.1.tar.bz2) = 09d7e6cf30b94f141f8ebe2560b301a058f645e74108edc28c908e750865dcec -SIZE (xorg/driver/xf86-video-apm-1.1.1.tar.bz2) = 268210 +MD5 (xorg/driver/xf86-video-apm-1.2.0.tar.bz2) = 4f78650d79656dc803a720049d65682e +SHA256 (xorg/driver/xf86-video-apm-1.2.0.tar.bz2) = f0fe020f892e6e3a696a490c86312a1b32672bffb7dead153c24f103540a6185 +SIZE (xorg/driver/xf86-video-apm-1.2.0.tar.bz2) = 278307 diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile index 1f434b3..f8b1922 100644 --- a/x11-drivers/xf86-video-ark/Makefile +++ b/x11-drivers/xf86-video-ark/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-ark -PORTVERSION= 0.6.0 -PORTREVISION= 2 +PORTVERSION= 0.7.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-ark/distinfo b/x11-drivers/xf86-video-ark/distinfo index 2e32a0b..934015e 100644 --- a/x11-drivers/xf86-video-ark/distinfo +++ b/x11-drivers/xf86-video-ark/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-ark-0.6.0.tar.bz2) = 6921479baca8f7b156029489fd335854 -SHA256 (xorg/driver/xf86-video-ark-0.6.0.tar.bz2) = e5abc4f4ae643ce56d5773f052515196f05786235e4afd155a3232e20dbc84d7 -SIZE (xorg/driver/xf86-video-ark-0.6.0.tar.bz2) = 231223 +MD5 (xorg/driver/xf86-video-ark-0.7.0.tar.bz2) = 6826c556ebe9a1248cbc7f7edd44f956 +SHA256 (xorg/driver/xf86-video-ark-0.7.0.tar.bz2) = 8e65e73045fabe37c15f6d4895baa09346bdac2f7537607b523aacd7bcf57594 +SIZE (xorg/driver/xf86-video-ark-0.7.0.tar.bz2) = 241897 diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile index efc8255..86f2798 100644 --- a/x11-drivers/xf86-video-chips/Makefile +++ b/x11-drivers/xf86-video-chips/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-chips -PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-chips/distinfo b/x11-drivers/xf86-video-chips/distinfo index cd1bd89..b45a241 100644 --- a/x11-drivers/xf86-video-chips/distinfo +++ b/x11-drivers/xf86-video-chips/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-chips-1.1.1.tar.bz2) = 3182d43439ca4cbf08ff9aa76990bba3 -SHA256 (xorg/driver/xf86-video-chips-1.1.1.tar.bz2) = 16a81cdb6b311176936c3326d279c0d75530adbcf9a3489eea55992ac5bc7494 -SIZE (xorg/driver/xf86-video-chips-1.1.1.tar.bz2) = 324093 +MD5 (xorg/driver/xf86-video-chips-1.2.0.tar.bz2) = 0fec6bee65383790485d917247a61629 +SHA256 (xorg/driver/xf86-video-chips-1.2.0.tar.bz2) = 05f38c49b23be36afa68b738faf520b8dbf05b92c769107039426651801d4f99 +SIZE (xorg/driver/xf86-video-chips-1.2.0.tar.bz2) = 337850 diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile index 13a2cdb..d7254dc 100644 --- a/x11-drivers/xf86-video-cirrus/Makefile +++ b/x11-drivers/xf86-video-cirrus/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-cirrus -PORTVERSION= 1.1.0 -PORTREVISION= 2 +PORTVERSION= 1.2.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-cirrus/distinfo b/x11-drivers/xf86-video-cirrus/distinfo index f6d5c31..f831f1d 100644 --- a/x11-drivers/xf86-video-cirrus/distinfo +++ b/x11-drivers/xf86-video-cirrus/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-cirrus-1.1.0.tar.bz2) = 66344e315def275605dafb314ce59851 -SHA256 (xorg/driver/xf86-video-cirrus-1.1.0.tar.bz2) = 5988962199d5013274f6a6952939e4f405df658bb6616ebf9954c993b1179b1b -SIZE (xorg/driver/xf86-video-cirrus-1.1.0.tar.bz2) = 264167 +MD5 (xorg/driver/xf86-video-cirrus-1.2.1.tar.bz2) = bc28fdedaee9059180e2534f9dbcd2f6 +SHA256 (xorg/driver/xf86-video-cirrus-1.2.1.tar.bz2) = e7c99ed66326df5fadf6e5d875859a430fec4369415a27cde72a91109f78bb9c +SIZE (xorg/driver/xf86-video-cirrus-1.2.1.tar.bz2) = 274458 diff --git a/x11-drivers/xf86-video-cyrix/Makefile b/x11-drivers/xf86-video-cyrix/Makefile index f3a27c7..b1d2b02 100644 --- a/x11-drivers/xf86-video-cyrix/Makefile +++ b/x11-drivers/xf86-video-cyrix/Makefile @@ -13,6 +13,8 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org cyrix display driver +IGNORE= requires pciVideoPtr typedef + XORG_CAT= driver USE_XORG= xextproto xf86dgaproto MAN4= cyrix.4x diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile index 40a646e..2498d7b 100644 --- a/x11-drivers/xf86-video-dummy/Makefile +++ b/x11-drivers/xf86-video-dummy/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-dummy -PORTVERSION= 0.2.0 -PORTREVISION= 2 +PORTVERSION= 0.3.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-dummy/distinfo b/x11-drivers/xf86-video-dummy/distinfo index 180edab..333cd74 100644 --- a/x11-drivers/xf86-video-dummy/distinfo +++ b/x11-drivers/xf86-video-dummy/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-dummy-0.2.0.tar.bz2) = 22b7cc20a33443cbd218bd2521850cfe -SHA256 (xorg/driver/xf86-video-dummy-0.2.0.tar.bz2) = 46013885696f3c1a5e05c5d503abc69e691443319a97cf2c6a01ec031e06c910 -SIZE (xorg/driver/xf86-video-dummy-0.2.0.tar.bz2) = 229159 +MD5 (xorg/driver/xf86-video-dummy-0.3.0.tar.bz2) = 3d96297556846bee02a74166ffb5d052 +SHA256 (xorg/driver/xf86-video-dummy-0.3.0.tar.bz2) = 5a4bbde0b7f0334bb63b159e5ef6e164be3699e3424734c2bd9823f20a30a278 +SIZE (xorg/driver/xf86-video-dummy-0.3.0.tar.bz2) = 239002 diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile index a54426b..1b38aca 100644 --- a/x11-drivers/xf86-video-fbdev/Makefile +++ b/x11-drivers/xf86-video-fbdev/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-fbdev -PORTVERSION= 0.3.1 -PORTREVISION= 2 +PORTVERSION= 0.4.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-fbdev/distinfo b/x11-drivers/xf86-video-fbdev/distinfo index 26ed501..c9115eb 100644 --- a/x11-drivers/xf86-video-fbdev/distinfo +++ b/x11-drivers/xf86-video-fbdev/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-fbdev-0.3.1.tar.bz2) = 9ae810c6c6c3c9713a67866fe794d4ff -SHA256 (xorg/driver/xf86-video-fbdev-0.3.1.tar.bz2) = 309d1f618c77559ea494c05d45b09577790c44900685e17bc812e4e1b19df6e7 -SIZE (xorg/driver/xf86-video-fbdev-0.3.1.tar.bz2) = 217635 +MD5 (xorg/driver/xf86-video-fbdev-0.4.0.tar.bz2) = 6572b39fec77b8e6de1c858a93992924 +SHA256 (xorg/driver/xf86-video-fbdev-0.4.0.tar.bz2) = bba725daeb2a313b83f2b92855a9ae8aa72c4cc8581f9f62f101ebdf00ac359d +SIZE (xorg/driver/xf86-video-fbdev-0.4.0.tar.bz2) = 242435 diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile index 3bfb53c..1221b17 100644 --- a/x11-drivers/xf86-video-glint/Makefile +++ b/x11-drivers/xf86-video-glint/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-glint -PORTVERSION= 1.1.1 -PORTREVISION= 4 +PORTVERSION= 1.2.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-glint/distinfo b/x11-drivers/xf86-video-glint/distinfo index 8cb471c..6c89451 100644 --- a/x11-drivers/xf86-video-glint/distinfo +++ b/x11-drivers/xf86-video-glint/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-glint-1.1.1.tar.bz2) = 2cf49f701024a145bd25aff9da11d479 -SHA256 (xorg/driver/xf86-video-glint-1.1.1.tar.bz2) = d63e0dd3f5cecebaf1915193a68ac83e90c1e973e3276a71bd14651d67115e6d -SIZE (xorg/driver/xf86-video-glint-1.1.1.tar.bz2) = 347413 +MD5 (xorg/driver/xf86-video-glint-1.2.1.tar.bz2) = 6d7afdac0a26cf201c3f3b417c31c5e1 +SHA256 (xorg/driver/xf86-video-glint-1.2.1.tar.bz2) = 161780d2127d0548a2017ca461ce38e7a69afce5d921a08604e91478c6be1cda +SIZE (xorg/driver/xf86-video-glint-1.2.1.tar.bz2) = 348552 diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile index 6726b79..361fa00 100644 --- a/x11-drivers/xf86-video-i128/Makefile +++ b/x11-drivers/xf86-video-i128/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-i128 -PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTVERSION= 1.3.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-i128/distinfo b/x11-drivers/xf86-video-i128/distinfo index a575c50..b042081 100644 --- a/x11-drivers/xf86-video-i128/distinfo +++ b/x11-drivers/xf86-video-i128/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-i128-1.2.1.tar.bz2) = d0080732eaa15059b0a953aa3522185a -SHA256 (xorg/driver/xf86-video-i128-1.2.1.tar.bz2) = 0d023cacf8134241cd8efcd5744eb156399406c92f59d3895392f2b5fd055eb1 -SIZE (xorg/driver/xf86-video-i128-1.2.1.tar.bz2) = 264809 +MD5 (xorg/driver/xf86-video-i128-1.3.1.tar.bz2) = 3b170a6df5114420cd4021a057918a09 +SHA256 (xorg/driver/xf86-video-i128-1.3.1.tar.bz2) = 49bb23625654ebcd74d0d23f534b074188f4b21c3cd443b06ac83b9485bf9a75 +SIZE (xorg/driver/xf86-video-i128-1.3.1.tar.bz2) = 265350 diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile index ded5931..1fb76a4 100644 --- a/x11-drivers/xf86-video-i740/Makefile +++ b/x11-drivers/xf86-video-i740/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-i740 -PORTVERSION= 1.1.0 -PORTREVISION= 2 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-i740/distinfo b/x11-drivers/xf86-video-i740/distinfo index 91af48c..a75899d 100644 --- a/x11-drivers/xf86-video-i740/distinfo +++ b/x11-drivers/xf86-video-i740/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-i740-1.1.0.tar.bz2) = 57302e225060a7286ae1a970c87a589b -SHA256 (xorg/driver/xf86-video-i740-1.1.0.tar.bz2) = b8f2144c987d8a14f8b477ee3aa43fc1c76d040a77e40938c3c97c8e34e2b7c5 -SIZE (xorg/driver/xf86-video-i740-1.1.0.tar.bz2) = 258461 +MD5 (xorg/driver/xf86-video-i740-1.2.0.tar.bz2) = d0e5a805c546b29b1dd3b55a68d16dc4 +SHA256 (xorg/driver/xf86-video-i740-1.2.0.tar.bz2) = 59c8f6ee465bef033c1c20bfff8121a318efda9656d5dc29f674bb655f18486f +SIZE (xorg/driver/xf86-video-i740-1.2.0.tar.bz2) = 268468 diff --git a/x11-drivers/xf86-video-imstt/Makefile b/x11-drivers/xf86-video-imstt/Makefile index 9476ca7..4d728a3 100644 --- a/x11-drivers/xf86-video-imstt/Makefile +++ b/x11-drivers/xf86-video-imstt/Makefile @@ -13,6 +13,8 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org imstt display driver +IGNORE= requires pciVideoPtr typedef + XORG_CAT= driver MAN4= imstt.4x diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile index 9c69e33..f037982 100644 --- a/x11-drivers/xf86-video-intel/Makefile +++ b/x11-drivers/xf86-video-intel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-video-intel -PORTVERSION= 2.4.2 +PORTVERSION= 2.5.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-intel/distinfo b/x11-drivers/xf86-video-intel/distinfo index 916913b..9011801 100644 --- a/x11-drivers/xf86-video-intel/distinfo +++ b/x11-drivers/xf86-video-intel/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-intel-2.4.2.tar.bz2) = 5cd6b3ed57c7e78ab51e9d9266e73fb6 -SHA256 (xorg/driver/xf86-video-intel-2.4.2.tar.bz2) = 5afdc91e93ffed09ea5258c6fde210c729ea2b44d83f98acfd92c3da7e99e64b -SIZE (xorg/driver/xf86-video-intel-2.4.2.tar.bz2) = 684445 +MD5 (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = 62e96948860b7a8507963300f56d0d16 +SHA256 (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = c203b728f1203d6d52b2963cdc6bfd87fb83eb12ab786c8122ea26c7984ac313 +SIZE (xorg/driver/xf86-video-intel-2.5.1.tar.bz2) = 716182 diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile index 8d0f841..d7b08a8 100644 --- a/x11-drivers/xf86-video-mga/Makefile +++ b/x11-drivers/xf86-video-mga/Makefile @@ -7,7 +7,6 @@ PORTNAME= xf86-video-mga PORTVERSION= 1.4.9 -#PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-drivers diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile index 4da1251..fa35a52 100644 --- a/x11-drivers/xf86-video-neomagic/Makefile +++ b/x11-drivers/xf86-video-neomagic/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-neomagic -PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTVERSION= 1.2.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-neomagic/distinfo b/x11-drivers/xf86-video-neomagic/distinfo index 8111104..1e04a87 100644 --- a/x11-drivers/xf86-video-neomagic/distinfo +++ b/x11-drivers/xf86-video-neomagic/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-neomagic-1.1.1.tar.bz2) = 7a3d3d6e60b9686d955c45d9ebbd5c1b -SHA256 (xorg/driver/xf86-video-neomagic-1.1.1.tar.bz2) = d6497080967b8285b663fedd7cafd4457578282ebd7da0b216b6fa214dd88a86 -SIZE (xorg/driver/xf86-video-neomagic-1.1.1.tar.bz2) = 263711 +MD5 (xorg/driver/xf86-video-neomagic-1.2.1.tar.bz2) = a72f57fca4f4dff9a2c82eb1fe7456f4 +SHA256 (xorg/driver/xf86-video-neomagic-1.2.1.tar.bz2) = 96e38d5378596174f76c735c4723ff2ac336f9069644502a9b706586b845e0a5 +SIZE (xorg/driver/xf86-video-neomagic-1.2.1.tar.bz2) = 272764 diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile index ec73651..6ef2d3a 100644 --- a/x11-drivers/xf86-video-rendition/Makefile +++ b/x11-drivers/xf86-video-rendition/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-rendition -PORTVERSION= 4.1.3 -PORTREVISION= 2 +PORTVERSION= 4.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-rendition/distinfo b/x11-drivers/xf86-video-rendition/distinfo index 5e6d96c..900f5d1 100644 --- a/x11-drivers/xf86-video-rendition/distinfo +++ b/x11-drivers/xf86-video-rendition/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-rendition-4.1.3.tar.bz2) = a8b97feccb32184820d5856fe78d34db -SHA256 (xorg/driver/xf86-video-rendition-4.1.3.tar.bz2) = 37e7aef72f7466485f5a3bafd0d43190cb7439de16868bfba2c59bb4c9df4408 -SIZE (xorg/driver/xf86-video-rendition-4.1.3.tar.bz2) = 292618 +MD5 (xorg/driver/xf86-video-rendition-4.2.0.tar.bz2) = 7c03de3804d4c4f6ff59f74050d24b2b +SHA256 (xorg/driver/xf86-video-rendition-4.2.0.tar.bz2) = b57b62f707d87534a799170e31b33311449cfd7019a56e6b4fa85a4c7faaae15 +SIZE (xorg/driver/xf86-video-rendition-4.2.0.tar.bz2) = 299330 diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile index 96f8970..1071f09 100644 --- a/x11-drivers/xf86-video-s3/Makefile +++ b/x11-drivers/xf86-video-s3/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-s3 -PORTVERSION= 0.5.0 -PORTREVISION= 2 +PORTVERSION= 0.6.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-s3/distinfo b/x11-drivers/xf86-video-s3/distinfo index bb59a83..c8fb279 100644 --- a/x11-drivers/xf86-video-s3/distinfo +++ b/x11-drivers/xf86-video-s3/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-s3-0.5.0.tar.bz2) = d95ab6445cab477f39adfbbc81006f67 -SHA256 (xorg/driver/xf86-video-s3-0.5.0.tar.bz2) = 4a1206cb1a200aad8881216547d9913d0e24928138f3b1bb912a3336b9c05c97 -SIZE (xorg/driver/xf86-video-s3-0.5.0.tar.bz2) = 240067 +MD5 (xorg/driver/xf86-video-s3-0.6.0.tar.bz2) = d05e7c3cb044437eda8663e174ba913c +SHA256 (xorg/driver/xf86-video-s3-0.6.0.tar.bz2) = ed07e4648b0f405fddd563783b49f971d649dd07cc8bc7737a93ff3d90f6c067 +SIZE (xorg/driver/xf86-video-s3-0.6.0.tar.bz2) = 264043 diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile index 2e95501..07869bb 100644 --- a/x11-drivers/xf86-video-s3virge/Makefile +++ b/x11-drivers/xf86-video-s3virge/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-s3virge -PORTVERSION= 1.9.1 -PORTREVISION= 2 +PORTVERSION= 1.10.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-s3virge/distinfo b/x11-drivers/xf86-video-s3virge/distinfo index 28c1a68..5729a47 100644 --- a/x11-drivers/xf86-video-s3virge/distinfo +++ b/x11-drivers/xf86-video-s3virge/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-s3virge-1.9.1.tar.bz2) = a91c73285ef67ee7cd9e2da28acb6cc4 -SHA256 (xorg/driver/xf86-video-s3virge-1.9.1.tar.bz2) = cef5702963f49e737fb8b1472dc0241f7a5da49f844ac77f2df3e693a84bc822 -SIZE (xorg/driver/xf86-video-s3virge-1.9.1.tar.bz2) = 279913 +MD5 (xorg/driver/xf86-video-s3virge-1.10.1.tar.bz2) = 4a293047e988d4ea1e9e96d3b5793f43 +SHA256 (xorg/driver/xf86-video-s3virge-1.10.1.tar.bz2) = 9094115621ef73c957cf887332717ec727c751959b1059e3d00fbfe0114a978a +SIZE (xorg/driver/xf86-video-s3virge-1.10.1.tar.bz2) = 288294 diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile index 6ff5ede..01826d0 100644 --- a/x11-drivers/xf86-video-savage/Makefile +++ b/x11-drivers/xf86-video-savage/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-savage -PORTVERSION= 2.1.3 -PORTREVISION= 1 +PORTVERSION= 2.2.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-savage/distinfo b/x11-drivers/xf86-video-savage/distinfo index 39e1686..e33089f 100644 --- a/x11-drivers/xf86-video-savage/distinfo +++ b/x11-drivers/xf86-video-savage/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-savage-2.1.3.tar.bz2) = 9c5e541613b07de6e7b2b2df3a2e35b1 -SHA256 (xorg/driver/xf86-video-savage-2.1.3.tar.bz2) = f5f154df377cb445935d1453d6b7095d63912d5776dcb44f8d3c2f10ab1a3cc5 -SIZE (xorg/driver/xf86-video-savage-2.1.3.tar.bz2) = 310709 +MD5 (xorg/driver/xf86-video-savage-2.2.1.tar.bz2) = 62b8aba48b54eaefeae87df502bf219c +SHA256 (xorg/driver/xf86-video-savage-2.2.1.tar.bz2) = adf95cae0fbaf72326c51c4c9e61486eef062bb1706f6ab46d942f2c36d8a37e +SIZE (xorg/driver/xf86-video-savage-2.2.1.tar.bz2) = 305286 diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile index f79e901..35856cd 100644 --- a/x11-drivers/xf86-video-siliconmotion/Makefile +++ b/x11-drivers/xf86-video-siliconmotion/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-siliconmotion -PORTVERSION= 1.5.1 -PORTREVISION= 1 +PORTVERSION= 1.6.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-siliconmotion/distinfo b/x11-drivers/xf86-video-siliconmotion/distinfo index a8822e4..8a35887 100644 --- a/x11-drivers/xf86-video-siliconmotion/distinfo +++ b/x11-drivers/xf86-video-siliconmotion/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-siliconmotion-1.5.1.tar.bz2) = ee35d7714ce44a2b5ac7ad7b7b7dd75a -SHA256 (xorg/driver/xf86-video-siliconmotion-1.5.1.tar.bz2) = 54cf791695a53d4836d32f899b7d34b969edf5415f02e36956b6e72993e21cd7 -SIZE (xorg/driver/xf86-video-siliconmotion-1.5.1.tar.bz2) = 265829 +MD5 (xorg/driver/xf86-video-siliconmotion-1.6.0.tar.bz2) = a8419a8ed17b02b2a6dd4d30d5e94b00 +SHA256 (xorg/driver/xf86-video-siliconmotion-1.6.0.tar.bz2) = cc5301b9c6adb9a0770509b8570d38730d43e9ffce6d6886cd9a090965017e53 +SIZE (xorg/driver/xf86-video-siliconmotion-1.6.0.tar.bz2) = 279146 diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile index 74fbf0f..9fa95de 100644 --- a/x11-drivers/xf86-video-sis/Makefile +++ b/x11-drivers/xf86-video-sis/Makefile @@ -7,7 +7,6 @@ PORTNAME= xf86-video-sis PORTVERSION= 0.10.0 -#PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile index 1e72039..5f2f717 100644 --- a/x11-drivers/xf86-video-sunffb/Makefile +++ b/x11-drivers/xf86-video-sunffb/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-sunffb -PORTVERSION= 1.1.0 -PORTREVISION= 5 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-sunffb/distinfo b/x11-drivers/xf86-video-sunffb/distinfo index b5c0eaa..072277c 100644 --- a/x11-drivers/xf86-video-sunffb/distinfo +++ b/x11-drivers/xf86-video-sunffb/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-sunffb-1.1.0.tar.bz2) = dee23564c0d8069f52c7cd29c78be667 -SHA256 (xorg/driver/xf86-video-sunffb-1.1.0.tar.bz2) = f897a427e83cf6965fd82724e3298aea44eb3131ba62f904cb514dfd0a879029 -SIZE (xorg/driver/xf86-video-sunffb-1.1.0.tar.bz2) = 268148 +MD5 (xorg/driver/xf86-video-sunffb-1.2.0.tar.bz2) = 816842de26bce8a935f3c9c3cfedbc42 +SHA256 (xorg/driver/xf86-video-sunffb-1.2.0.tar.bz2) = 59f2f8fc2399a4d6b0ce733481c58694e723a989f4712c00436d35e27c059292 +SIZE (xorg/driver/xf86-video-sunffb-1.2.0.tar.bz2) = 277524 diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile index fc627e6..a6b9f3c 100644 --- a/x11-drivers/xf86-video-tdfx/Makefile +++ b/x11-drivers/xf86-video-tdfx/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-tdfx -PORTVERSION= 1.3.0 -PORTREVISION= 3 +PORTVERSION= 1.4.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-tdfx/distinfo b/x11-drivers/xf86-video-tdfx/distinfo index 1fb963e..468b1c5 100644 --- a/x11-drivers/xf86-video-tdfx/distinfo +++ b/x11-drivers/xf86-video-tdfx/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-tdfx-1.3.0.tar.bz2) = 04c49acb5c5dbde14eabd32d06df6e73 -SHA256 (xorg/driver/xf86-video-tdfx-1.3.0.tar.bz2) = 6b1a00df5c9628817d08f07c6f18f578950744f3eb63b4397be8b0754e728624 -SIZE (xorg/driver/xf86-video-tdfx-1.3.0.tar.bz2) = 261448 +MD5 (xorg/driver/xf86-video-tdfx-1.4.0.tar.bz2) = b13132f24683ef759bfb0c1db5096496 +SHA256 (xorg/driver/xf86-video-tdfx-1.4.0.tar.bz2) = c3be06d324f2e49ece1f243b10d7180a32fbe65dbbb81e162279c8608800dead +SIZE (xorg/driver/xf86-video-tdfx-1.4.0.tar.bz2) = 278867 diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile index 05a55f6..8c3f794 100644 --- a/x11-drivers/xf86-video-tga/Makefile +++ b/x11-drivers/xf86-video-tga/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-tga -PORTVERSION= 1.1.0 -PORTREVISION= 2 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-tga/distinfo b/x11-drivers/xf86-video-tga/distinfo index df6f912..2375ee3 100644 --- a/x11-drivers/xf86-video-tga/distinfo +++ b/x11-drivers/xf86-video-tga/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-tga-1.1.0.tar.bz2) = 9eda4d4490706b2dd8f4ecdbaf779856 -SHA256 (xorg/driver/xf86-video-tga-1.1.0.tar.bz2) = 50143dfdd259fd114dc2f41518a4898d5407bf55422251df75812b96a1fa6e9b -SIZE (xorg/driver/xf86-video-tga-1.1.0.tar.bz2) = 260342 +MD5 (xorg/driver/xf86-video-tga-1.2.0.tar.bz2) = f3bddf0a64932ca9bd72041ccd3b5501 +SHA256 (xorg/driver/xf86-video-tga-1.2.0.tar.bz2) = a92f8cad0e21318be465719a9f30a50d5719b0b70bf8e15f3937e7850cf1aea6 +SIZE (xorg/driver/xf86-video-tga-1.2.0.tar.bz2) = 269406 diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile index a3328b5..2abd85a 100644 --- a/x11-drivers/xf86-video-trident/Makefile +++ b/x11-drivers/xf86-video-trident/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-trident -PORTVERSION= 1.2.3 -PORTREVISION= 2 +PORTVERSION= 1.3.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-trident/distinfo b/x11-drivers/xf86-video-trident/distinfo index 9a37d95..cc8baf9 100644 --- a/x11-drivers/xf86-video-trident/distinfo +++ b/x11-drivers/xf86-video-trident/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-trident-1.2.3.tar.bz2) = c0e8b2f54942b6902b7dd4f30defe800 -SHA256 (xorg/driver/xf86-video-trident-1.2.3.tar.bz2) = d23eb8fa165d238ddf64da63dcd60c70a01cd761608a18402cfb95aed6722495 -SIZE (xorg/driver/xf86-video-trident-1.2.3.tar.bz2) = 288372 +MD5 (xorg/driver/xf86-video-trident-1.3.0.tar.bz2) = e89799579d0cf3858362bd751469e0bf +SHA256 (xorg/driver/xf86-video-trident-1.3.0.tar.bz2) = a4f66c9f46f6e93c2c1f10e782a211ddc338b0ff9f0a2ccd2d660db031d3ddb5 +SIZE (xorg/driver/xf86-video-trident-1.3.0.tar.bz2) = 274223 diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile index 2f4b284..533fe65 100644 --- a/x11-drivers/xf86-video-tseng/Makefile +++ b/x11-drivers/xf86-video-tseng/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-tseng -PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-tseng/distinfo b/x11-drivers/xf86-video-tseng/distinfo index 9d86bd5..99c38ac 100644 --- a/x11-drivers/xf86-video-tseng/distinfo +++ b/x11-drivers/xf86-video-tseng/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-tseng-1.1.1.tar.bz2) = 488aa9c3ec7a95e6589afa4b50bec8b4 -SHA256 (xorg/driver/xf86-video-tseng-1.1.1.tar.bz2) = c9c1f3318715b7268068bc733d00bcab93924e97eb38f94548e442fd6cdfd56e -SIZE (xorg/driver/xf86-video-tseng-1.1.1.tar.bz2) = 273211 +MD5 (xorg/driver/xf86-video-tseng-1.2.0.tar.bz2) = f98fc22142a009dc3a6cdf930c95203f +SHA256 (xorg/driver/xf86-video-tseng-1.2.0.tar.bz2) = 1090d9100934329000ac330d0c66a0ac4f60d2ba83196ea15c2833a28a18b1e3 +SIZE (xorg/driver/xf86-video-tseng-1.2.0.tar.bz2) = 277086 diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile index 1cb3ca6..377a81a 100644 --- a/x11-drivers/xf86-video-vesa/Makefile +++ b/x11-drivers/xf86-video-vesa/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-vesa -PORTVERSION= 1.3.0 -PORTREVISION= 2 +PORTVERSION= 2.0.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-vesa/distinfo b/x11-drivers/xf86-video-vesa/distinfo index 307da5e..d1bb580 100644 --- a/x11-drivers/xf86-video-vesa/distinfo +++ b/x11-drivers/xf86-video-vesa/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-vesa-1.3.0.tar.bz2) = 4a307852f3b4850e436a41dab2a73676 -SHA256 (xorg/driver/xf86-video-vesa-1.3.0.tar.bz2) = b96c80ae81f5123ecef344dac4c734b2e281143d3ab7a7e633d6bf04c893e203 -SIZE (xorg/driver/xf86-video-vesa-1.3.0.tar.bz2) = 237759 +MD5 (xorg/driver/xf86-video-vesa-2.0.0.tar.bz2) = 433cf6f961eb4a2ab6fcb086def0b2b4 +SHA256 (xorg/driver/xf86-video-vesa-2.0.0.tar.bz2) = f20b2e429657552eea207fb8bc4b47c8e293d99c229dcb4da11b7c5bfdc1e165 +SIZE (xorg/driver/xf86-video-vesa-2.0.0.tar.bz2) = 247176 diff --git a/x11-drivers/xf86-video-via/Makefile b/x11-drivers/xf86-video-via/Makefile index ae44fce..b0af160 100644 --- a/x11-drivers/xf86-video-via/Makefile +++ b/x11-drivers/xf86-video-via/Makefile @@ -13,10 +13,12 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org via display driver -USE_GL= gl +IGNORE= requires pciVideoPtr typedef +USE_GL= gl XORG_CAT= driver USE_XORG= xvmc xf86driproto xextproto x11 glproto + MAN4= via.4x .include diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile index 0e51e23..01adc5f 100644 --- a/x11-drivers/xf86-video-vmware/Makefile +++ b/x11-drivers/xf86-video-vmware/Makefile @@ -6,15 +6,15 @@ # PORTNAME= xf86-video-vmware -PORTVERSION= 10.15.2 -PORTREVISION= 1 +PORTVERSION= 10.16.5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org vmware display driver XORG_CAT= driver -USE_XORG= xextproto xineramaproto +USE_XORG= xextproto xineramaproto videoproto + MAN4= vmware.4x .include diff --git a/x11-drivers/xf86-video-vmware/distinfo b/x11-drivers/xf86-video-vmware/distinfo index c911c4a..0988761 100644 --- a/x11-drivers/xf86-video-vmware/distinfo +++ b/x11-drivers/xf86-video-vmware/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-vmware-10.15.2.tar.bz2) = 99322cbcc9081ad44e9cba63e3df8f7e -SHA256 (xorg/driver/xf86-video-vmware-10.15.2.tar.bz2) = edae155c82d348b76dabe1373605bf6715b577cdd7a95f8b54ad534dc47c71ff -SIZE (xorg/driver/xf86-video-vmware-10.15.2.tar.bz2) = 269346 +MD5 (xorg/driver/xf86-video-vmware-10.16.5.tar.bz2) = 6d78c82ea7c2bb0fcb587d7bb4e8f60a +SHA256 (xorg/driver/xf86-video-vmware-10.16.5.tar.bz2) = 3e4e9abfd806b36076083ef6cacc93b713bfa4ddefe7005edfc15c64f5174366 +SIZE (xorg/driver/xf86-video-vmware-10.16.5.tar.bz2) = 278790 diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile index 437cb15..b2d97e6 100644 --- a/x11-drivers/xf86-video-voodoo/Makefile +++ b/x11-drivers/xf86-video-voodoo/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-voodoo -PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTVERSION= 1.2.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-voodoo/distinfo b/x11-drivers/xf86-video-voodoo/distinfo index 671498a..e980065 100644 --- a/x11-drivers/xf86-video-voodoo/distinfo +++ b/x11-drivers/xf86-video-voodoo/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-voodoo-1.1.1.tar.bz2) = bc878e795688b49a595b355482d27174 -SHA256 (xorg/driver/xf86-video-voodoo-1.1.1.tar.bz2) = 3975601baee674b2bad0dfe696586f17cc913f1dc7f1d5c4e184623e0461751c -SIZE (xorg/driver/xf86-video-voodoo-1.1.1.tar.bz2) = 248401 +MD5 (xorg/driver/xf86-video-voodoo-1.2.0.tar.bz2) = 7c681d9b57f5e1f798263fc1a9d99245 +SHA256 (xorg/driver/xf86-video-voodoo-1.2.0.tar.bz2) = b79ba6d5d4300570c00f8be37c536f47f2d78c18845f70f525da2a29e47c4b8c +SIZE (xorg/driver/xf86-video-voodoo-1.2.0.tar.bz2) = 256472 diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile index 4158021..99f1e11 100644 --- a/x11-drivers/xorg-drivers/Makefile +++ b/x11-drivers/xorg-drivers/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorg-drivers -PORTVERSION= 7.3 -PORTREVISION= 3 +PORTVERSION= 7.4 CATEGORIES= x11-drivers MASTER_SITES= # none DISTFILES= # none diff --git a/x11-fonts/font-xfree86-type1/Makefile b/x11-fonts/font-xfree86-type1/Makefile index 1c1804c..6784736 100644 --- a/x11-fonts/font-xfree86-type1/Makefile +++ b/x11-fonts/font-xfree86-type1/Makefile @@ -6,7 +6,7 @@ # PORTNAME= font-xfree86-type1 -PORTVERSION= 1.0.0 +PORTVERSION= 1.0.1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/font-xfree86-type1/distinfo b/x11-fonts/font-xfree86-type1/distinfo index 9c5ec95..ce450b8 100644 --- a/x11-fonts/font-xfree86-type1/distinfo +++ b/x11-fonts/font-xfree86-type1/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/font/font-xfree86-type1-1.0.0.tar.bz2) = e66f36a6d68203cc4cf7b56ebbb192dd -SHA256 (xorg/font/font-xfree86-type1-1.0.0.tar.bz2) = ef76d3b91d1bdaa9ff73cc1e5905ad4bbdc028f06157d0d2319d38e7b7f84a4d -SIZE (xorg/font/font-xfree86-type1-1.0.0.tar.bz2) = 66079 +MD5 (xorg/font/font-xfree86-type1-1.0.1.tar.bz2) = d7e965776c7f0c30b0f09742176fb77a +SHA256 (xorg/font/font-xfree86-type1-1.0.1.tar.bz2) = 8fd9f9b81120d8afc25ea8901a8a91d7428c45cd9cfe7a7bef2b15c8b8d5f341 +SIZE (xorg/font/font-xfree86-type1-1.0.1.tar.bz2) = 71607 diff --git a/x11-fonts/fslsfonts/Makefile b/x11-fonts/fslsfonts/Makefile index 4871b0c..39d7301 100644 --- a/x11-fonts/fslsfonts/Makefile +++ b/x11-fonts/fslsfonts/Makefile @@ -6,7 +6,7 @@ # PORTNAME= fslsfonts -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/fslsfonts/distinfo b/x11-fonts/fslsfonts/distinfo index 702f704..8461314 100644 --- a/x11-fonts/fslsfonts/distinfo +++ b/x11-fonts/fslsfonts/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/fslsfonts-1.0.1.tar.bz2) = c7b2f8a938749d41dc86db6bd1e6a4ca -SHA256 (xorg/app/fslsfonts-1.0.1.tar.bz2) = 3feb006a25f36856924e26249fe84b27142678f97175780960f085e1e263a62e -SIZE (xorg/app/fslsfonts-1.0.1.tar.bz2) = 76928 +MD5 (xorg/app/fslsfonts-1.0.2.tar.bz2) = a61be25c87ee42169ee4dc8344acc9e2 +SHA256 (xorg/app/fslsfonts-1.0.2.tar.bz2) = 9c8e7d573284272c633b5cf18e3358830b27bde72f4bc1ae83a1ab337d463a92 +SIZE (xorg/app/fslsfonts-1.0.2.tar.bz2) = 88561 diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile index 36a0c66..1378270 100644 --- a/x11-fonts/libFS/Makefile +++ b/x11-fonts/libFS/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libFS -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 1.0.1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/libFS/distinfo b/x11-fonts/libFS/distinfo index 78c9b5b..e8a9b43 100644 --- a/x11-fonts/libFS/distinfo +++ b/x11-fonts/libFS/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libFS-1.0.0.tar.bz2) = dfd5de47e232db0891410bec8ee6707b -SHA256 (xorg/lib/libFS-1.0.0.tar.bz2) = 2f18f9fa0e18a3eab3c154ba820ad64b5c6ee364e147524055a553a130ccfdde -SIZE (xorg/lib/libFS-1.0.0.tar.bz2) = 236606 +MD5 (xorg/lib/libFS-1.0.1.tar.bz2) = 81521249353fa33be7a4bb0062c2fbb9 +SHA256 (xorg/lib/libFS-1.0.1.tar.bz2) = 9bf92ffdb51e69e07682cd1a6c0101f2a833b16b9bfa5d601491ff46a35a2cf5 +SIZE (xorg/lib/libFS-1.0.1.tar.bz2) = 239934 diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile index e99e9c5..1986592 100644 --- a/x11-fonts/libXfont/Makefile +++ b/x11-fonts/libXfont/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libXfont -PORTVERSION= 1.3.1 -PORTREVISION= 3 +PORTVERSION= 1.3.3 PORTEPOCH= 1 CATEGORIES= x11-fonts diff --git a/x11-fonts/libXfont/distinfo b/x11-fonts/libXfont/distinfo index bf35c32..1e25021 100644 --- a/x11-fonts/libXfont/distinfo +++ b/x11-fonts/libXfont/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXfont-1.3.1.tar.bz2) = b2f396b62633819bbdd9748383876e21 -SHA256 (xorg/lib/libXfont-1.3.1.tar.bz2) = dcfb7dc980a16ad98ac984b98321148864ea8b4637d3dd3773e483a14158a9b1 -SIZE (xorg/lib/libXfont-1.3.1.tar.bz2) = 564235 +MD5 (xorg/lib/libXfont-1.3.3.tar.bz2) = 4f174b9613f87cf00d731da428a1b194 +SHA256 (xorg/lib/libXfont-1.3.3.tar.bz2) = 6171e6bca4bd6333611bd9c63cccc8e8e412d876c72097f0dddc490a9df51d5a +SIZE (xorg/lib/libXfont-1.3.3.tar.bz2) = 591117 diff --git a/x11-fonts/libXfont/files/patch-CVE-2008-0006 b/x11-fonts/libXfont/files/patch-CVE-2008-0006 deleted file mode 100644 index 95f7b2f..0000000 --- a/x11-fonts/libXfont/files/patch-CVE-2008-0006 +++ /dev/null @@ -1,24 +0,0 @@ -diff --git src/bitmap/pcfread.c src/bitmap/pcfread.c -index fd41849..c5db255 100644 ---- src/bitmap/pcfread.c -+++ src/bitmap/pcfread.c -@@ -588,6 +588,9 @@ pcfReadFont(FontPtr pFont, FontFilePtr file, - pFont->info.lastRow = pcfGetINT16(file, format); - pFont->info.defaultCh = pcfGetINT16(file, format); - if (IS_EOF(file)) goto Bail; -+ if (pFont->info.firstCol > pFont->info.lastCol || -+ pFont->info.firstRow > pFont->info.lastRow || -+ pFont->info.lastCol-pFont->info.firstCol > 255) goto Bail; - - nencoding = (pFont->info.lastCol - pFont->info.firstCol + 1) * - (pFont->info.lastRow - pFont->info.firstRow + 1); -@@ -726,6 +729,9 @@ pcfReadFontInfo(FontInfoPtr pFontInfo, FontFilePtr file) - pFontInfo->lastRow = pcfGetINT16(file, format); - pFontInfo->defaultCh = pcfGetINT16(file, format); - if (IS_EOF(file)) goto Bail; -+ if (pFontInfo->firstCol > pFontInfo->lastCol || -+ pFontInfo->firstRow > pFontInfo->lastRow || -+ pFontInfo->lastCol-pFontInfo->firstCol > 255) goto Bail; - - nencoding = (pFontInfo->lastCol - pFontInfo->firstCol + 1) * - (pFontInfo->lastRow - pFontInfo->firstRow + 1); diff --git a/x11-fonts/libXfont/files/patch-src_fontfile_catalogue.c b/x11-fonts/libXfont/files/patch-src_fontfile_catalogue.c deleted file mode 100644 index f25280e..0000000 --- a/x11-fonts/libXfont/files/patch-src_fontfile_catalogue.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/fontfile/catalogue.c.orig -+++ src/fontfile/catalogue.c -@@ -156,7 +156,7 @@ CatalogueRescan (FontPathElementPtr fpe) - while (entry = readdir(dir), entry != NULL) - { - snprintf(link, sizeof link, "%s/%s", path, entry->d_name); -- len = readlink(link, dest, sizeof dest); -+ len = readlink(link, dest, sizeof dest - 1); - if (len < 0) - continue; - diff --git a/x11-fonts/mkfontdir/Makefile b/x11-fonts/mkfontdir/Makefile index 42676ec..d539689 100644 --- a/x11-fonts/mkfontdir/Makefile +++ b/x11-fonts/mkfontdir/Makefile @@ -6,8 +6,7 @@ # PORTNAME= mkfontdir -PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTVERSION= 1.0.4 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/mkfontdir/distinfo b/x11-fonts/mkfontdir/distinfo index b1c479e..a9ac5fe 100644 --- a/x11-fonts/mkfontdir/distinfo +++ b/x11-fonts/mkfontdir/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/mkfontdir-1.0.3.tar.bz2) = 4d0f89a23f77e22f1671a77bf0898955 -SHA256 (xorg/app/mkfontdir-1.0.3.tar.bz2) = 2a786e03611a53c7f6263db446c0c9ef76e94bcf930b0b5867cc6a9c19653074 -SIZE (xorg/app/mkfontdir-1.0.3.tar.bz2) = 62898 +MD5 (xorg/app/mkfontdir-1.0.4.tar.bz2) = 35394bf3f746a57fba624dba52fdbba3 +SHA256 (xorg/app/mkfontdir-1.0.4.tar.bz2) = 6f9a3cc70d27704ee8e4ff01d5d69c974b059fd7e470172b68cfa477c7caf8e3 +SIZE (xorg/app/mkfontdir-1.0.4.tar.bz2) = 70506 diff --git a/x11-fonts/mkfontscale/Makefile b/x11-fonts/mkfontscale/Makefile index d50957b..91fa8ed 100644 --- a/x11-fonts/mkfontscale/Makefile +++ b/x11-fonts/mkfontscale/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mkfontscale -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.5 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/mkfontscale/distinfo b/x11-fonts/mkfontscale/distinfo index d7a2771..d4e7b38 100644 --- a/x11-fonts/mkfontscale/distinfo +++ b/x11-fonts/mkfontscale/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/mkfontscale-1.0.3.tar.bz2) = 1d608771aca9695b828cec1e34178fd1 -SHA256 (xorg/app/mkfontscale-1.0.3.tar.bz2) = 0458a3a5525b4ab458a018648ef8575afc191f904364c00e27876a7bd53af020 -SIZE (xorg/app/mkfontscale-1.0.3.tar.bz2) = 94674 +MD5 (xorg/app/mkfontscale-1.0.5.tar.bz2) = 5e6e210b70adfef1264b0212aab1f758 +SHA256 (xorg/app/mkfontscale-1.0.5.tar.bz2) = f79dff54153dc3beb9eb3f2e4776dbc55ed2a4d3d0adbf9c8a2d9eb230ed3850 +SIZE (xorg/app/mkfontscale-1.0.5.tar.bz2) = 100963 diff --git a/x11-fonts/showfont/Makefile b/x11-fonts/showfont/Makefile index 753b74d..0730aff 100644 --- a/x11-fonts/showfont/Makefile +++ b/x11-fonts/showfont/Makefile @@ -6,8 +6,7 @@ # PORTNAME= showfont -PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTVERSION= 1.0.2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/showfont/distinfo b/x11-fonts/showfont/distinfo index 1a91304..7f6b846 100644 --- a/x11-fonts/showfont/distinfo +++ b/x11-fonts/showfont/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/showfont-1.0.1.tar.bz2) = 339b2faf1ca5114fda414338e15b6e21 -SHA256 (xorg/app/showfont-1.0.1.tar.bz2) = 87db3cf12914abc6b074d12b35c7f39c8fd7b5d3933b339e2c1260a51061760c -SIZE (xorg/app/showfont-1.0.1.tar.bz2) = 77016 +MD5 (xorg/app/showfont-1.0.2.tar.bz2) = 8f83d774ed4cc2a6dca86edd856d820a +SHA256 (xorg/app/showfont-1.0.2.tar.bz2) = 9bd0373659b2f24120dba887fd155f99aed02e4a7c2afae69e7db1c1fa05e88c +SIZE (xorg/app/showfont-1.0.2.tar.bz2) = 90582 diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile index a6790b7..c9a635b 100644 --- a/x11-fonts/xfs/Makefile +++ b/x11-fonts/xfs/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xfs -PORTVERSION= 1.0.5 -PORTREVISION= 1 +PORTVERSION= 1.0.8 PORTEPOCH= 1 CATEGORIES= x11-fonts @@ -24,15 +23,18 @@ MAN1= xfs.1 .if !defined(WITHOUT_XFS_CACHE) USE_XORG+= fontcacheproto x11 CFLAGS+= -DFONTCACHE -.else +.endif + post-patch: + ${REINPLACE_CMD} '/^config_DATA/d' ${WRKSRC}/Makefile.in +.if defined(WITHOUT_XFS_CACHE) ${REINPLACE_CMD} -e 's|^cache|XCOMM &|' ${WRKSRC}/config.cpp .endif post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/lib/X11/fs/config.default - @if [ ! -f ${PREFIX}/lib/X11/fs/config ]; then \ - ${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/lib/X11/fs/config; \ + ${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/etc/X11/fs/config.default + @if [ ! -f ${PREFIX}/etc/X11/fs/config ]; then \ + ${INSTALL_SCRIPT} ${WRKSRC}/config ${PREFIX}/etc/X11/fs/config; \ fi .include diff --git a/x11-fonts/xfs/distinfo b/x11-fonts/xfs/distinfo index d0f8c85..3484d5e 100644 --- a/x11-fonts/xfs/distinfo +++ b/x11-fonts/xfs/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xfs-1.0.5.tar.bz2) = 3fc73b5e39a1fe8b8d96563c8144cffe -SHA256 (xorg/app/xfs-1.0.5.tar.bz2) = f586f2101d42e512e7d20a6a6715c3c2cad19cacbee3b4034a0818de349e38f9 -SIZE (xorg/app/xfs-1.0.5.tar.bz2) = 152131 +MD5 (xorg/app/xfs-1.0.8.tar.bz2) = f10717e45535b64eb45226aac571dac2 +SHA256 (xorg/app/xfs-1.0.8.tar.bz2) = 34b5040b3db7552fc1cdfa46f926ce5b7217ea5d77cfafbbddf94fbae6b4f482 +SIZE (xorg/app/xfs-1.0.8.tar.bz2) = 161279 diff --git a/x11-fonts/xfs/files/patch-Makefile.in b/x11-fonts/xfs/files/patch-Makefile.in deleted file mode 100644 index 2fecfe5..0000000 --- a/x11-fonts/xfs/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Sat Jul 8 12:35:19 2006 -+++ Makefile.in Sat Jul 8 12:35:21 2006 -@@ -289,7 +289,7 @@ - FSERRORS = /var/log/xfs.log - FONTDIR = $(libdir)/X11/fonts - FONTPATH = $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/ --config_DATA = config -+#config_DATA = config - EXTRA_DIST = xfs.def config.cpp $(appman_PRE) - CLEANFILES = config $(appman_DATA) - appmandir = $(APP_MAN_DIR) diff --git a/x11-fonts/xfs/pkg-install b/x11-fonts/xfs/pkg-install index 183fcb6..9979ff9 100644 --- a/x11-fonts/xfs/pkg-install +++ b/x11-fonts/xfs/pkg-install @@ -6,7 +6,7 @@ fi PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6} -XINITCONFDIR=${PKG_PREFIX}/lib/X11/fs +XINITCONFDIR=${PKG_PREFIX}/etc/X11/fs if [ ! -f ${XINITCONFDIR}/config ]; then cp ${XINITCONFDIR}/config.default ${XINITCONFDIR}/config fi diff --git a/x11-fonts/xfs/pkg-plist b/x11-fonts/xfs/pkg-plist index 02c0cee..e2378ab 100644 --- a/x11-fonts/xfs/pkg-plist +++ b/x11-fonts/xfs/pkg-plist @@ -1,5 +1,6 @@ bin/xfs -@unexec if cmp -s %D/lib/X11/fs/config.default %D/lib/X11/fs/config; then rm -f %D/lib/X11/fs/config; fi -lib/X11/fs/config.default -@exec if [ ! -f %D/lib/X11/fs/config ] ; then cp -p %D/%F %B/config; fi -@dirrmtry lib/X11/fs +@unexec if cmp -s %D/etc/X11/fs/config.default %D/etc/X11/fs/config; then rm -f %D/etc/X11/fs/config; fi +etc/X11/fs/config.default +@exec if [ ! -f %D/etc/X11/fs/config ] ; then cp -p %D/%F %B/config; fi +@dirrmtry etc/X11/fs +@dirrmtry etc/X11 diff --git a/x11-fonts/xfsinfo/Makefile b/x11-fonts/xfsinfo/Makefile index 269e355..38ff955 100644 --- a/x11-fonts/xfsinfo/Makefile +++ b/x11-fonts/xfsinfo/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xfsinfo -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/xfsinfo/distinfo b/x11-fonts/xfsinfo/distinfo index 2a37289..f95281d 100644 --- a/x11-fonts/xfsinfo/distinfo +++ b/x11-fonts/xfsinfo/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xfsinfo-1.0.1.tar.bz2) = e98b18fbce1261de30b1de819d86f48a -SHA256 (xorg/app/xfsinfo-1.0.1.tar.bz2) = adc33443b3a7f334d2407de702004a0491f24708e0e1abe74cd8ae114cd60cd9 -SIZE (xorg/app/xfsinfo-1.0.1.tar.bz2) = 74335 +MD5 (xorg/app/xfsinfo-1.0.2.tar.bz2) = e6c0071f6d5436113982f4a575d3f94b +SHA256 (xorg/app/xfsinfo-1.0.2.tar.bz2) = 95aaca84f948fc7e25d82c58d3fdbba44911b99f3e205378ce82a786c11bb96f +SIZE (xorg/app/xfsinfo-1.0.2.tar.bz2) = 87787 diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile index a942b68..fa95c97 100644 --- a/x11-fonts/xorg-fonts-100dpi/Makefile +++ b/x11-fonts/xorg-fonts-100dpi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-fonts-100dpi -PORTVERSION= 7.3 +PORTVERSION= 7.4 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 b29d41b..db1d5e2 100644 --- a/x11-fonts/xorg-fonts-75dpi/Makefile +++ b/x11-fonts/xorg-fonts-75dpi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-fonts-75dpi -PORTVERSION= 7.3 +PORTVERSION= 7.4 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 ec6c7f8..6249ab9 100644 --- a/x11-fonts/xorg-fonts-cyrillic/Makefile +++ b/x11-fonts/xorg-fonts-cyrillic/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-fonts-cyrillic -PORTVERSION= 7.3 +PORTVERSION= 7.4 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 43ea891..a53a9ad 100644 --- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile +++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-fonts-miscbitmaps -PORTVERSION= 7.3 +PORTVERSION= 7.4 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 7768229..949d815 100644 --- a/x11-fonts/xorg-fonts-truetype/Makefile +++ b/x11-fonts/xorg-fonts-truetype/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-fonts-truetype -PORTVERSION= 7.3 +PORTVERSION= 7.4 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 ee730ff..5d93feb 100644 --- a/x11-fonts/xorg-fonts-type1/Makefile +++ b/x11-fonts/xorg-fonts-type1/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-fonts-type1 -PORTVERSION= 7.3 +PORTVERSION= 7.4 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile index 70de378..6d19cf4 100644 --- a/x11-fonts/xorg-fonts/Makefile +++ b/x11-fonts/xorg-fonts/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorg-fonts -PORTVERSION= 7.3 -PORTREVISION= 1 +PORTVERSION= 7.4 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none diff --git a/x11-servers/xephyr/Makefile b/x11-servers/xephyr/Makefile index 7e8dcaf..06f1c30 100644 --- a/x11-servers/xephyr/Makefile +++ b/x11-servers/xephyr/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xephyr -PORTVERSION= 1.4 -PORTREVISION= 1 +PORTVERSION= 1.5.3 CATEGORIES= x11-servers MAINTAINER= x11@FreeBSD.org @@ -16,13 +15,15 @@ COMMENT= A kdrive based X server from X.Org XORG_CAT= xserver LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm + +USE_GL= gl USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ damageproto xcmiscproto xtrans inputproto \ xf86bigfontproto scrnsaverproto bigreqsproto \ resourceproto fontsproto videoproto \ compositeproto trapproto recordproto \ xineramaproto evieproto xkbfile xfont \ - xau xdmcp xext fontenc pixman + xau xdmcp xext fontenc xv pixman CONFIGURE_ARGS= --enable-kdrive --enable-xephyr --disable-dmx --disable-xvfb \ --disable-xorg --disable-xnest --disable-xprint \ diff --git a/x11-servers/xephyr/distinfo b/x11-servers/xephyr/distinfo index 70c76c2..0a7c42a 100644 --- a/x11-servers/xephyr/distinfo +++ b/x11-servers/xephyr/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/xserver/xorg-server-1.4.tar.bz2) = a06d9fe4f9f1d459ae02657f9ce64220 -SHA256 (xorg/xserver/xorg-server-1.4.tar.bz2) = 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2 -SIZE (xorg/xserver/xorg-server-1.4.tar.bz2) = 6179392 +MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8 +SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb +SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625 diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile index 8a81dd4..90f7a49 100644 --- a/x11-servers/xorg-dmx/Makefile +++ b/x11-servers/xorg-dmx/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorg-dmx -PORTVERSION= 1.4 -PORTREVISION= 3 +PORTVERSION= 1.5.3 PORTEPOCH= 1 CATEGORIES= x11-servers @@ -19,6 +18,8 @@ CONFLICTS= XFree86-dmx-[0-9]* XORG_CAT= xserver LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm + +USE_GL= gl USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ damageproto xcmiscproto xextproto xf86miscproto \ xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ diff --git a/x11-servers/xorg-dmx/distinfo b/x11-servers/xorg-dmx/distinfo index 70c76c2..0a7c42a 100644 --- a/x11-servers/xorg-dmx/distinfo +++ b/x11-servers/xorg-dmx/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/xserver/xorg-server-1.4.tar.bz2) = a06d9fe4f9f1d459ae02657f9ce64220 -SHA256 (xorg/xserver/xorg-server-1.4.tar.bz2) = 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2 -SIZE (xorg/xserver/xorg-server-1.4.tar.bz2) = 6179392 +MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8 +SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb +SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625 diff --git a/x11-servers/xorg-dmx/files/patch-hw_dmx_Makefile.in b/x11-servers/xorg-dmx/files/patch-hw_dmx_Makefile.in deleted file mode 100644 index be7571e..0000000 --- a/x11-servers/xorg-dmx/files/patch-hw_dmx_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- hw/dmx/Makefile.in.orig 2007-12-12 17:55:26.000000000 +0000 -+++ hw/dmx/Makefile.in 2007-12-12 17:55:56.000000000 +0000 -@@ -476,6 +476,7 @@ - Xdmx_LDADD = $(XORG_CORE_LIBS) \ - $(XDMX_LIBS) \ - $(GLX_LIBS) \ -+ $(XSERVER_LIBS) \ - input/libdmxinput.a \ - config/libdmxconfig.a \ - @DMXMODULES_LIBS@ diff --git a/x11-servers/xorg-dmx/files/patch-hw_dmx_dmxinput.c b/x11-servers/xorg-dmx/files/patch-hw_dmx_dmxinput.c deleted file mode 100644 index c860dc1..0000000 --- a/x11-servers/xorg-dmx/files/patch-hw_dmx_dmxinput.c +++ /dev/null @@ -1,17 +0,0 @@ ---- hw/dmx/dmxinput.c.orig 2007-12-12 17:52:53.000000000 +0000 -+++ hw/dmx/dmxinput.c 2007-12-12 17:53:22.000000000 +0000 -@@ -105,3 +105,14 @@ - if (!dmxInput->detached && dmxInput->updateWindowInfo) - dmxInput->updateWindowInfo(dmxInput, type, pWindow); - } -+ -+int -+NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev) -+{ -+ return BadValue; -+} -+ -+void -+DeleteInputDeviceRequest(DeviceIntPtr dev) -+{ -+} diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile index 52a9136..c1313cf 100644 --- a/x11-servers/xorg-nestserver/Makefile +++ b/x11-servers/xorg-nestserver/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorg-nestserver -PORTVERSION= 1.4 -PORTREVISION= 1 +PORTVERSION= 1.5.3 PORTEPOCH= 1 CATEGORIES= x11-servers @@ -19,6 +18,8 @@ CONFLICTS= XFree86-NestServer-* XORG_CAT= xserver LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm + +USE_GL= gl USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ damageproto xcmiscproto xextproto xf86miscproto inputproto \ xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo index 70c76c2..0a7c42a 100644 --- a/x11-servers/xorg-nestserver/distinfo +++ b/x11-servers/xorg-nestserver/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/xserver/xorg-server-1.4.tar.bz2) = a06d9fe4f9f1d459ae02657f9ce64220 -SHA256 (xorg/xserver/xorg-server-1.4.tar.bz2) = 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2 -SIZE (xorg/xserver/xorg-server-1.4.tar.bz2) = 6179392 +MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8 +SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb +SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625 diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 3813e9a..60fc44c 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -6,48 +6,45 @@ # PORTNAME= xorg-server -PORTVERSION= 1.4.2 +PORTVERSION= 1.5.3 PORTEPOCH= 1 CATEGORIES= x11-servers -MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/:fdo \ - ${MASTER_SITE_SOURCEFORGE:S/$/:mesa/} -MASTER_SITE_SUBDIR=mesa3d/:mesa -DISTFILES= xorg-server-${PORTVERSION}.tar.bz2:fdo \ - MesaLib-7.0.1.tar.bz2:mesa +MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/ +DISTFILES= xorg-server-${PORTVERSION}.tar.bz2 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 CONFLICTS= XFree86-Server-* XORG_CAT= xserver +USE_GL= gl USE_XORG= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \ xmu xt xpm xext randrproto renderproto fixesproto damageproto \ xcmiscproto xextproto xproto xtrans xf86miscproto \ xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ resourceproto fontsproto inputproto xf86dgaproto \ videoproto compositeproto trapproto recordproto xineramaproto \ - evieproto xfont fontenc xkbui pixman + evieproto xfont fontenc xkbui pixman pciaccess +USE_OPENSSL= yes USE_PERL5_BUILD=yes -CONFIGURE_ARGS= --with-mesa-source=${WRKDIR}/Mesa-7.0.1 \ - --disable-dmx --disable-xvfb --disable-xnest --disable-xprint \ - --localstatedir=/var --without-dtrace +CONFIGURE_ARGS= --disable-dmx --disable-xvfb --disable-xnest --disable-xprint \ + --localstatedir=/var --without-dtrace --disable-xephyr MAN1= Xorg.1 \ Xserver.1 \ cvt.1 \ gtf.1 \ - pcitweak.1 \ xorgconfig.1 MAN4= exa.4 \ fbdevhw.4 -MAN5= xorg.conf.5 \ - SecurityPolicy.5 +MAN5= xorg.conf.5 NOT_FOR_ARCHS= ia64 alpha @@ -57,6 +54,13 @@ OPTIONS= HAL "Compile with HAL config support" on \ .include +.if defined(WITH_OPENSSL_BASE) +# The reason why I use this is cause openssl from base doesn't install a .pc file +# and configure will fail trying to find it. Setting both of those variables to +# a *non-empty* value by-passes the pkg-config check. +CONFIGURE_ENV= OPENSSL_LIBS="-L/usr/lib -ssl -crypto" OPENSSL_CFLAGS="-I/usr/include" +.endif + .if !defined(WITHOUT_HAL) LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal CONFIGURE_ARGS+= --enable-config-hal=yes @@ -101,7 +105,6 @@ PLIST_SUB+= SPARC64_NA="" .if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == sparc64 PLIST_SUB+= AMD64_I386_SPARC64="" -MAN1+= scanpci.1 .else PLIST_SUB+= AMD64_I386_SPARC64="@comment " .endif diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo index 03b4020..0a7c42a 100644 --- a/x11-servers/xorg-server/distinfo +++ b/x11-servers/xorg-server/distinfo @@ -1,6 +1,3 @@ -MD5 (xorg/xserver/xorg-server-1.4.2.tar.bz2) = fa2915ae377f61c340a18ebef484b64b -SHA256 (xorg/xserver/xorg-server-1.4.2.tar.bz2) = 829c66ec4c295822700067c87afae796b8e67530cc65a7b83060ea29a4ff316d -SIZE (xorg/xserver/xorg-server-1.4.2.tar.bz2) = 6216638 -MD5 (xorg/xserver/MesaLib-7.0.1.tar.bz2) = c056abd763e899114bf745c9eedbf9ad -SHA256 (xorg/xserver/MesaLib-7.0.1.tar.bz2) = 5190ffac157882d9129d31f262339512f4a45dcf95ccdad213760a7d54d82de7 -SIZE (xorg/xserver/MesaLib-7.0.1.tar.bz2) = 3343538 +MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8 +SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb +SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625 diff --git a/x11-servers/xorg-server/files/patch-Pci.h b/x11-servers/xorg-server/files/patch-Pci.h deleted file mode 100644 index 0d6991b..0000000 --- a/x11-servers/xorg-server/files/patch-Pci.h +++ /dev/null @@ -1,88 +0,0 @@ ---- hw/xfree86/os-support/bus/Pci.h.orig 2007-09-06 02:48:26.000000000 +0200 -+++ hw/xfree86/os-support/bus/Pci.h 2007-09-28 21:43:06.000000000 +0200 -@@ -112,6 +112,10 @@ - #include "xf86Pci.h" - #include "xf86PciInfo.h" - -+#if defined(__FreeBSD__) -+#include -+#endif -+ - /* - * Global Definitions - */ -@@ -123,6 +127,10 @@ - # define MAX_PCI_DOMAINS 512 - # define PCI_DOM_MASK 0x01fful - # define MAX_PCI_BUSES (MAX_PCI_DOMAINS*256) /* 256 per domain */ -+#elif defined(FreeBSD) && __FreeBSD_version >= 700053 && !defined(__i386__) -+# define MAX_PCI_DOMAINS 256 /* limited by 32-bit xf86 PCITAG */ -+# define PCI_DOM_MASK (MAX_PCI_DOMAINS - 1) -+# define MAX_PCI_BUSES (MAX_PCI_DOMAINS*256) /* 256 per domain */ - #else - # define MAX_PCI_BUSES 256 /* Max number of PCI buses */ - #endif -@@ -238,7 +246,9 @@ - # elif defined(__FreeBSD__) || defined(__OpenBSD__) - # define ARCH_PCI_INIT freebsdPciInit - # define INCLUDE_XF86_MAP_PCI_MEM --# define INCLUDE_XF86_NO_DOMAIN -+# if __FreeBSD_version < 700053 || defined(__OpenBSD__) -+# define INCLUDE_XF86_NO_DOMAIN -+# endif - # elif defined(__NetBSD__) - # define ARCH_PCI_INIT netbsdPciInit - # define INCLUDE_XF86_MAP_PCI_MEM -@@ -260,10 +270,12 @@ - # if defined(linux) - # define ARCH_PCI_INIT ia64linuxPciInit - # define INCLUDE_XF86_MAP_PCI_MEM --# elif defined(FreeBSD) -+# elif defined(FreeBSD) || defined(__OpenBSD__) - # define ARCH_PCI_INIT freebsdPciInit - # define INCLUDE_XF86_MAP_PCI_MEM --# define INCLUDE_XF86_NO_DOMAIN -+# if __FreeBSD_version < 700053 || defined(__OpenBSD__) -+# define INCLUDE_XF86_NO_DOMAIN -+# endif - # endif - # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper - #elif defined(__i386__) || defined(i386) -@@ -293,7 +305,9 @@ - # elif defined(__FreeBSD__) || defined(__OpenBSD__) - # define ARCH_PCI_INIT freebsdPciInit - # define INCLUDE_XF86_MAP_PCI_MEM --# define INCLUDE_XF86_NO_DOMAIN -+# if __FreeBSD_version < 700053 || defined(__OpenBSD__) -+# define INCLUDE_XF86_NO_DOMAIN -+# endif - # elif defined(__NetBSD__) - # define ARCH_PCI_INIT netbsdPciInit - # define INCLUDE_XF86_MAP_PCI_MEM -@@ -325,7 +339,9 @@ - # elif (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc64__) - # define ARCH_PCI_INIT freebsdPciInit - # define INCLUDE_XF86_MAP_PCI_MEM --# define INCLUDE_XF86_NO_DOMAIN -+# if __FreeBSD_version < 700053 || defined(__OpenBSD__) -+# define INCLUDE_XF86_NO_DOMAIN -+# endif - # endif - # if !defined(__FreeBSD__) && !defined(linux) - # define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge -@@ -333,11 +349,14 @@ - #elif defined(__amd64__) || defined(__amd64) - # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - # define ARCH_PCI_INIT freebsdPciInit -+# if __FreeBSD_version < 700053 || defined(__FreeBSD_kernel__) -+# define INCLUDE_XF86_NO_DOMAIN -+# endif - # else - # define ARCH_PCI_INIT ix86PciInit -+# define INCLUDE_XF86_NO_DOMAIN - # endif - # define INCLUDE_XF86_MAP_PCI_MEM --# define INCLUDE_XF86_NO_DOMAIN - # if defined(linux) - # define ARCH_PCI_OS_INIT linuxPciInit - # endif diff --git a/x11-servers/xorg-server/files/patch-bsdResource.c b/x11-servers/xorg-server/files/patch-bsdResource.c index 44388bb..67eef59 100644 --- a/x11-servers/xorg-server/files/patch-bsdResource.c +++ b/x11-servers/xorg-server/files/patch-bsdResource.c @@ -1,15 +1,15 @@ ---- hw/xfree86/os-support/bsd/bsdResource.c.orig Fri Apr 23 21:54:07 2004 -+++ hw/xfree86/os-support/bsd/bsdResource.c Tue May 17 00:48:36 2005 -@@ -18,7 +18,7 @@ +--- hw/xfree86/os-support/bsd/bsdResource.c.orig 2008-07-19 12:47:13.000000000 +0100 ++++ hw/xfree86/os-support/bsd/bsdResource.c 2008-07-19 12:52:03.000000000 +0100 +@@ -19,7 +19,7 @@ #ifdef INCLUDE_XF86_NO_DOMAIN --#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) -+#if defined(__alpha__) || defined(__amd64__) +-#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || defined(__x86_64__) ++#if defined(__alpha__) || defined(__amd64__) || defined(__x86_64__) resPtr - xf86BusAccWindowsFromOS(void) -@@ -112,7 +112,7 @@ + xf86AccResFromOS(resPtr ret) +@@ -60,7 +60,7 @@ return ret; } @@ -17,44 +17,8 @@ +#elif defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__) resPtr - xf86BusAccWindowsFromOS(void) -@@ -123,7 +123,11 @@ - RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); - ret = xf86AddResToList(ret, &range, -1); - -+#if defined(__sparc__) || defined(__sparc64__) -+ RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); -+#else - RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); -+#endif - ret = xf86AddResToList(ret, &range, -1); - return ret; - } -@@ -137,7 +141,11 @@ - RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); - ret = xf86AddResToList(ret, &range, -1); - -+#if defined(__sparc__) || defined(__sparc64__) -+ RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); -+#else - RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); -+#endif - ret = xf86AddResToList(ret, &range, -1); - return ret; - } -@@ -153,7 +161,11 @@ - RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); - ret = xf86AddResToList(ret, &range, -1); - -+#if defined(__sparc__) || defined(__sparc64__) -+ RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); -+#else - RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); -+#endif - ret = xf86AddResToList(ret, &range, -1); - return ret; - } -@@ -175,7 +187,11 @@ + xf86AccResFromOS(resPtr ret) +@@ -77,7 +77,11 @@ ret = xf86AddResToList(ret, &range, -1); RANGE(range, 0x00000000, 0x00000000, ResExcIoBlock); ret = xf86AddResToList(ret, &range, -1); diff --git a/x11-servers/xorg-server/files/patch-config-hal.c b/x11-servers/xorg-server/files/patch-config-hal.c deleted file mode 100644 index bbe6cb0..0000000 --- a/x11-servers/xorg-server/files/patch-config-hal.c +++ /dev/null @@ -1,10 +0,0 @@ ---- config/hal.c.orig 2007-08-23 15:04:52.000000000 -0400 -+++ config/hal.c 2008-03-27 18:36:36.000000000 -0400 -@@ -212,6 +212,7 @@ - } - - add_option(&options, "path", path); -+ add_option(&options, "device", path); - add_option(&options, "driver", driver); - add_option(&options, "name", name); - config_info = xalloc(strlen(udi) + 5); /* "hal:" and NULL */ diff --git a/x11-servers/xorg-server/files/patch-configure b/x11-servers/xorg-server/files/patch-configure deleted file mode 100644 index 1c8c8f3..0000000 --- a/x11-servers/xorg-server/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2008-02-28 16:08:55.000000000 -0500 -+++ configure 2008-02-28 16:11:19.000000000 -0500 -@@ -30376,7 +30376,7 @@ - else - cat >conftest.$ac_ext <<_ACEOF - --#define _POSIX_C_SOURCE 199309L -+#define _POSIX_C_SOURCE 200112L - #include - - int main(int argc, char *argv[]) { diff --git a/x11-servers/xorg-server/files/patch-dix_devices.c b/x11-servers/xorg-server/files/patch-dix_devices.c deleted file mode 100644 index f02738d..0000000 --- a/x11-servers/xorg-server/files/patch-dix_devices.c +++ /dev/null @@ -1,20 +0,0 @@ ---- dix/devices.c.orig 2007-10-19 17:04:51.000000000 -0200 -+++ dix/devices.c 2007-10-23 17:50:38.000000000 -0200 -@@ -294,7 +294,17 @@ CoreKeyboardBell(int volume, DeviceIntPt - static void - CoreKeyboardCtl(DeviceIntPtr pDev, KeybdCtrl *ctrl) - { -+#ifdef XKB -+ if (!noXkbExtension) { -+ DeviceIntPtr dev = (DeviceIntPtr) -+ pDev->devPrivates[CoreDevicePrivatesIndex].ptr; -+ -+ if (dev && dev->key && dev->key->xkbInfo && dev->key->xkbInfo->kbdProc) -+ (*dev->key->xkbInfo->kbdProc)(dev, ctrl); -+ } -+#else - return; -+#endif - } - - /** diff --git a/x11-servers/xorg-server/files/patch-freebsdPci.c b/x11-servers/xorg-server/files/patch-freebsdPci.c deleted file mode 100644 index 83b034f..0000000 --- a/x11-servers/xorg-server/files/patch-freebsdPci.c +++ /dev/null @@ -1,306 +0,0 @@ ---- hw/xfree86/os-support/bus/freebsdPci.c.orig Thu Sep 6 02:48:26 2007 -+++ hw/xfree86/os-support/bus/freebsdPci.c Sat Sep 29 12:22:56 2007 -@@ -109,10 +109,6 @@ - #define PCI_CPU(val) (val) - #endif - -- --#define BUS(tag) (((tag)>>16)&0xff) --#define DFN(tag) (((tag)>>8)&0xff) -- - static int pciFd = -1; - - void -@@ -133,9 +129,12 @@ - { - struct pci_io io; - int error; -- io.pi_sel.pc_bus = BUS(tag); -- io.pi_sel.pc_dev = DFN(tag) >> 3; -- io.pi_sel.pc_func = DFN(tag) & 7; -+#ifndef INCLUDE_XF86_NO_DOMAIN -+ io.pi_sel.pc_domain = PCI_DOM_FROM_TAG(tag); -+#endif -+ io.pi_sel.pc_bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag)); -+ io.pi_sel.pc_dev = PCI_DEV_FROM_TAG(tag); -+ io.pi_sel.pc_func = PCI_FUNC_FROM_TAG(tag); - io.pi_reg = off; - io.pi_width = 4; - error = ioctl(pciFd, PCIOCREAD, &io); -@@ -148,9 +147,12 @@ - freebsdPciCfgWrite(PCITAG tag, int off, CARD32 val) - { - struct pci_io io; -- io.pi_sel.pc_bus = BUS(tag); -- io.pi_sel.pc_dev = DFN(tag) >> 3; -- io.pi_sel.pc_func = DFN(tag) & 7; -+#ifndef INCLUDE_XF86_NO_DOMAIN -+ io.pi_sel.pc_domain = PCI_DOM_FROM_TAG(tag); -+#endif -+ io.pi_sel.pc_bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag)); -+ io.pi_sel.pc_dev = PCI_DEV_FROM_TAG(tag); -+ io.pi_sel.pc_func = PCI_FUNC_FROM_TAG(tag); - io.pi_reg = off; - io.pi_width = 4; - io.pi_data = PCI_CPU(val); -@@ -164,3 +166,260 @@ - val = (val & ~mask) | (bits & mask); - freebsdPciCfgWrite(tag, off, val); - } -+ -+#ifndef INCLUDE_XF86_NO_DOMAIN -+ -+/* This probably shouldn't be FreeBSD-specific. */ -+static pciConfigPtr -+xf86GetPciHostConfigFromTag(PCITAG Tag) -+{ -+ int bus = PCI_BUS_FROM_TAG(Tag); -+ pciBusInfo_t *pBusInfo; -+ -+ while ((bus < pciNumBuses) && (pBusInfo = pciBusInfo[bus])) { -+ if (bus == pBusInfo->primary_bus) -+ return pBusInfo->bridge; -+ bus = pBusInfo->primary_bus; -+ } -+ -+ return NULL; /* Bad data */ -+} -+ -+/* -+ * This is ugly, but until I can extract this information from the kernel, -+ * it'll have to do. The default I/O space size is 64K, and 4G for memory. -+ * Anything else needs to go in this table. (PowerPC folk take note.) -+ * -+ * Please keep this table in ascending vendor/device order. -+ */ -+static const struct pciSizes { -+ unsigned short vendor, device; -+ unsigned long io_size, mem_size; -+} pciControllerSizes[] = { -+ { -+ PCI_VENDOR_SUN, PCI_CHIP_PSYCHO, -+ 1U << 16, 1U << 31 -+ }, -+ { -+ PCI_VENDOR_SUN, PCI_CHIP_SCHIZO, -+ 1U << 24, 1U << 31 /* ??? */ -+ }, -+ { -+ PCI_VENDOR_SUN, PCI_CHIP_SABRE, -+ 1U << 24, (unsigned long)(1ULL << 32) -+ }, -+ { -+ PCI_VENDOR_SUN, PCI_CHIP_HUMMINGBIRD, -+ 1U << 24, (unsigned long)(1ULL << 32) -+ } -+}; -+#define NUM_SIZES (sizeof(pciControllerSizes) / sizeof(pciControllerSizes[0])) -+ -+static const struct pciSizes * -+freebsdGetSizesStruct(PCITAG Tag) -+{ -+ static const struct pciSizes default_size = { -+ 0, 0, 1U << 16, (unsigned long)(1ULL << 32) -+ }; -+ pciConfigPtr pPCI; -+ int i; -+ -+ /* Find host bridge */ -+ if ((pPCI = xf86GetPciHostConfigFromTag(Tag))) { -+ /* Look up vendor/device */ -+ for (i = 0; i < NUM_SIZES; i++) { -+ if ((pPCI->pci_vendor == -+ pciControllerSizes[i].vendor) && -+ (pPCI->pci_device == -+ pciControllerSizes[i].device)) { -+ return & pciControllerSizes[i]; -+ } -+ } -+ } -+ -+ /* Default to 64KB I/O and 4GB memory. */ -+ return & default_size; -+} -+ -+static __inline__ unsigned long -+freebsdGetIOSize(PCITAG Tag) -+{ -+ const struct pciSizes * const sizes = freebsdGetSizesStruct(Tag); -+ return sizes->io_size; -+} -+ -+static __inline__ void -+freebsdGetSizes(PCITAG Tag, unsigned long *io_size, unsigned long *mem_size) -+{ -+ const struct pciSizes * const sizes = freebsdGetSizesStruct(Tag); -+ -+ *io_size = sizes->io_size; -+ *mem_size = sizes->mem_size; -+} -+ -+_X_EXPORT int -+xf86GetPciDomain(PCITAG Tag) -+{ -+ return PCI_DOM_FROM_TAG(Tag); -+} -+ -+_X_EXPORT pointer -+xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag, ADDRESS Base, -+ unsigned long Size) -+{ -+ return xf86MapVidMem(ScreenNum, Flags, Base, Size); -+} -+ -+_X_EXPORT IOADDRESS -+xf86MapDomainIO(int ScreenNum, int Flags, PCITAG Tag, IOADDRESS Base, -+ unsigned long Size) -+{ -+ return Base; -+} -+ -+_X_EXPORT int -+xf86ReadDomainMemory(PCITAG Tag, ADDRESS Base, int Len, unsigned char *Buf) -+{ -+ int ret, length, rlength; -+ -+ /* Read in 64kB chunks. */ -+ ret = 0; -+ while ((length = Len) > 0) { -+ if (length > 0x010000) length = 0x010000; -+ rlength = xf86ReadBIOS(Base, 0, Buf, length); -+ if (rlength < 0) { -+ ret = rlength; -+ break; -+ } -+ ret += rlength; -+ if (rlength < length) break; -+ Base += rlength; -+ Buf += rlength; -+ Len -= rlength; -+ } -+ -+ return ret; -+} -+ -+resPtr -+xf86BusAccWindowsFromOS(void) -+{ -+ pciConfigPtr *ppPCI, pPCI; -+ resPtr pRes = NULL; -+ resRange range; -+ unsigned long io_size, mem_size; -+ int domain; -+ -+ if ((ppPCI = xf86scanpci(0))) { -+ for (; (pPCI = *ppPCI); ppPCI++) { -+ if ((pPCI->pci_base_class != PCI_CLASS_BRIDGE) || -+ (pPCI->pci_sub_class != PCI_SUBCLASS_BRIDGE_HOST)) -+ continue; -+ -+ domain = xf86GetPciDomain(pPCI->tag); -+ freebsdGetSizes(pPCI->tag, &io_size, &mem_size); -+ -+ RANGE(range, 0, (ADDRESS)(mem_size - 1), -+ RANGE_TYPE(ResExcMemBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ -+ RANGE(range, 0, (IOADDRESS)(io_size - 1), -+ RANGE_TYPE(ResExcIoBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ -+ if (domain <= 0) -+ break; -+ } -+ } -+ -+ return pRes; -+} -+ -+resPtr -+xf86PciBusAccWindowsFromOS(void) -+{ -+ pciConfigPtr *ppPCI, pPCI; -+ resPtr pRes = NULL; -+ resRange range; -+ unsigned long io_size, mem_size; -+ int domain; -+ -+ if ((ppPCI = xf86scanpci(0))) { -+ for (; (pPCI = *ppPCI); ppPCI++) { -+ if ((pPCI->pci_base_class != PCI_CLASS_BRIDGE) || -+ (pPCI->pci_sub_class != PCI_SUBCLASS_BRIDGE_HOST)) -+ continue; -+ -+ domain = xf86GetPciDomain(pPCI->tag); -+ freebsdGetSizes(pPCI->tag, &io_size, &mem_size); -+ -+ RANGE(range, 0, (ADDRESS)(mem_size - 1), -+ RANGE_TYPE(ResExcMemBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ -+ RANGE(range, 0, (IOADDRESS)(io_size - 1), -+ RANGE_TYPE(ResExcIoBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ -+ if (domain <= 0) -+ break; -+ } -+ } -+ -+ return pRes; -+} -+ -+resPtr -+xf86AccResFromOS(resPtr pRes) -+{ -+ pciConfigPtr *ppPCI, pPCI; -+ resRange range; -+ unsigned long io_size, mem_size; -+ int domain; -+ -+ if ((ppPCI = xf86scanpci(0))) { -+ for (; (pPCI = *ppPCI); ppPCI++) { -+ if ((pPCI->pci_base_class != PCI_CLASS_BRIDGE) || -+ (pPCI->pci_sub_class != PCI_SUBCLASS_BRIDGE_HOST)) -+ continue; -+ -+ domain = xf86GetPciDomain(pPCI->tag); -+ freebsdGetSizes(pPCI->tag, &io_size, &mem_size); -+ -+ /* -+ * At minimum, the top and bottom resources must be -+ * claimed, so that resources that are (or appear to -+ * be) unallocated can be relocated. -+ */ -+ RANGE(range, 0x00000000u, 0x0009ffffu, -+ RANGE_TYPE(ResExcMemBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ RANGE(range, 0x000c0000u, 0x000effffu, -+ RANGE_TYPE(ResExcMemBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ RANGE(range, 0x000f0000u, 0x000fffffu, -+ RANGE_TYPE(ResExcMemBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ -+ RANGE(range, (ADDRESS)(mem_size - 1), -+ (ADDRESS)(mem_size - 1), -+ RANGE_TYPE(ResExcMemBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ -+ RANGE(range, 0x00000000u, 0x00000000u, -+ RANGE_TYPE(ResExcIoBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ RANGE(range, (IOADDRESS)(io_size - 1), -+ (IOADDRESS)(io_size - 1), -+ RANGE_TYPE(ResExcIoBlock, domain)); -+ pRes = xf86AddResToList(pRes, &range, -1); -+ -+ if (domain <= 0) -+ break; -+ } -+ } -+ -+ return pRes; -+} -+ -+#endif /* !INCLUDE_XF86_NO_DOMAIN */ diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist index 1dc5f28..11a2195 100644 --- a/x11-servers/xorg-server/pkg-plist +++ b/x11-servers/xorg-server/pkg-plist @@ -9,8 +9,6 @@ bin/gtf %%PPC_NA%%bin/outb %%PPC_NA%%bin/outl %%PPC_NA%%bin/outw -bin/pcitweak -%%AMD64_I386_SPARC64%%bin/scanpci bin/xorgconfig include/xorg/BT.h include/xorg/IBM.h @@ -42,6 +40,7 @@ include/xorg/damagestr.h include/xorg/dbestruct.h include/xorg/dgaproc.h include/xorg/dix.h +include/xorg/dixaccess.h include/xorg/dixevents.h include/xorg/dixfont.h include/xorg/dixfontstr.h @@ -98,11 +97,13 @@ include/xorg/picture.h include/xorg/picturestr.h include/xorg/pixmap.h include/xorg/pixmapstr.h +include/xorg/privates.h include/xorg/property.h include/xorg/propertyst.h include/xorg/randrstr.h include/xorg/region.h include/xorg/regionstr.h +include/xorg/registry.h include/xorg/renderedge.h include/xorg/resource.h include/xorg/rgb.h @@ -157,8 +158,6 @@ include/xorg/xf86Version.h include/xorg/xf86Xinput.h include/xorg/xf86_OSlib.h include/xorg/xf86_OSproc.h -include/xorg/xf86_ansic.h -include/xorg/xf86_libc.h include/xorg/xf86cmap.h include/xorg/xf86fbman.h include/xorg/xf86i2c.h @@ -169,15 +168,15 @@ include/xorg/xf86xv.h include/xorg/xf86xvmc.h include/xorg/xf86xvpriv.h include/xorg/xisb.h +include/xorg/xkbfile.h include/xorg/xkbsrv.h +include/xorg/xkbstr.h include/xorg/xorg-server.h include/xorg/xorgVersion.h include/xorg/xvdix.h include/xorg/xvmcext.h lib/X11/Cards lib/X11/Options -lib/xorg/modules/extensions/libGLcore.la -lib/xorg/modules/extensions/libGLcore.so lib/xorg/modules/extensions/libdbe.la lib/xorg/modules/extensions/libdbe.so lib/xorg/modules/extensions/libdri.la @@ -186,14 +185,8 @@ lib/xorg/modules/extensions/libextmod.la lib/xorg/modules/extensions/libextmod.so lib/xorg/modules/extensions/libglx.la lib/xorg/modules/extensions/libglx.so -lib/xorg/modules/extensions/librecord.la -lib/xorg/modules/extensions/librecord.so -lib/xorg/modules/extensions/libxtrap.la -lib/xorg/modules/extensions/libxtrap.so lib/xorg/modules/fonts/libfreetype.la lib/xorg/modules/fonts/libfreetype.so -lib/xorg/modules/fonts/libtype1.la -lib/xorg/modules/fonts/libtype1.so %%ALPHA_NA%%lib/xorg/modules/libafb.la %%ALPHA_NA%%lib/xorg/modules/libafb.so lib/xorg/modules/libcfb.la @@ -208,10 +201,6 @@ lib/xorg/modules/libint10.la lib/xorg/modules/libint10.so lib/xorg/modules/libmfb.la lib/xorg/modules/libmfb.so -lib/xorg/modules/libpcidata.la -lib/xorg/modules/libpcidata.so -lib/xorg/modules/libscanpci.la -lib/xorg/modules/libscanpci.so lib/xorg/modules/libshadow.la lib/xorg/modules/libshadow.so lib/xorg/modules/libshadowfb.la @@ -248,7 +237,7 @@ lib/xorg/modules/multimedia/tda9885_drv.la lib/xorg/modules/multimedia/tda9885_drv.so lib/xorg/modules/multimedia/uda1380_drv.la lib/xorg/modules/multimedia/uda1380_drv.so -lib/xserver/SecurityPolicy +lib/xorg/protocol.txt libdata/pkgconfig/xorg-server.pc share/X11/xkb/compiled/README.compiled share/aclocal/xorg-server.m4 @@ -259,7 +248,6 @@ share/aclocal/xorg-server.m4 @dirrm lib/xorg/modules/multimedia @dirrm lib/xorg/modules @dirrm lib/xorg -@dirrm lib/xserver @dirrmtry include/X11/bitmaps @dirrmtry include/X11/pixmaps @dirrmtry lib/X11/doc diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile index ee82973..4ab5025 100644 --- a/x11-servers/xorg-vfbserver/Makefile +++ b/x11-servers/xorg-vfbserver/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorg-vfbserver -PORTVERSION= 1.4 -PORTREVISION= 1 +PORTVERSION= 1.5.3 PORTEPOCH= 1 CATEGORIES= x11-servers @@ -19,6 +18,8 @@ CONFLICTS= XFree86-VirtualFramebufferServer-* XORG_CAT= xserver LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm + +USE_GL= gl USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ damageproto xcmiscproto xextproto xf86miscproto inputproto \ xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ diff --git a/x11-servers/xorg-vfbserver/distinfo b/x11-servers/xorg-vfbserver/distinfo index 70c76c2..0a7c42a 100644 --- a/x11-servers/xorg-vfbserver/distinfo +++ b/x11-servers/xorg-vfbserver/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/xserver/xorg-server-1.4.tar.bz2) = a06d9fe4f9f1d459ae02657f9ce64220 -SHA256 (xorg/xserver/xorg-server-1.4.tar.bz2) = 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2 -SIZE (xorg/xserver/xorg-server-1.4.tar.bz2) = 6179392 +MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8 +SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb +SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625 diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile index 2a2d414..bd54155 100644 --- a/x11-toolkits/libXmu/Makefile +++ b/x11-toolkits/libXmu/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXmu -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 PORTEPOCH= 1 CATEGORIES= x11-toolkits diff --git a/x11-toolkits/libXmu/distinfo b/x11-toolkits/libXmu/distinfo index 4cf9425..98c9034 100644 --- a/x11-toolkits/libXmu/distinfo +++ b/x11-toolkits/libXmu/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXmu-1.0.3.tar.bz2) = b926b95b811ece3e19cd590db85ee615 -SHA256 (xorg/lib/libXmu-1.0.3.tar.bz2) = b56e308e36da8d9cb48433ddb81fd04e26b4f1c695586ac8106ac48a35466d66 -SIZE (xorg/lib/libXmu-1.0.3.tar.bz2) = 296622 +MD5 (xorg/lib/libXmu-1.0.4.tar.bz2) = fb372a5f3ab42b5ba16d7af4d833a0cb +SHA256 (xorg/lib/libXmu-1.0.4.tar.bz2) = f83c00d6ed8f4c08effa9dcc2d7f1ff6f5a753f2b9fe1babda16618c2afa18f0 +SIZE (xorg/lib/libXmu-1.0.4.tar.bz2) = 305347 diff --git a/x11-wm/twm/Makefile b/x11-wm/twm/Makefile index 414ad28..bbcd182 100644 --- a/x11-wm/twm/Makefile +++ b/x11-wm/twm/Makefile @@ -6,8 +6,7 @@ # PORTNAME= twm -PORTVERSION= 1.0.3 -PORTREVISION= 3 +PORTVERSION= 1.0.4 CATEGORIES= x11-wm MAINTAINER= x11@FreeBSD.org diff --git a/x11-wm/twm/distinfo b/x11-wm/twm/distinfo index a618471..5fad235 100644 --- a/x11-wm/twm/distinfo +++ b/x11-wm/twm/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/twm-1.0.3.tar.bz2) = a56b71dc40249195b32b304633c28a3e -SHA256 (xorg/app/twm-1.0.3.tar.bz2) = 5b41550477a893bf2b82ab73fc7fb6c839ba52d0deac059be1a473dd7bb92a4e -SIZE (xorg/app/twm-1.0.3.tar.bz2) = 238448 +MD5 (xorg/app/twm-1.0.4.tar.bz2) = 0865e14c73c08fa8c501ae877298ee9f +SHA256 (xorg/app/twm-1.0.4.tar.bz2) = daa088f9ae231508929b7bd4746e942212b53f2802ca4cee450139fabc8de1fa +SIZE (xorg/app/twm-1.0.4.tar.bz2) = 241944 diff --git a/x11-wm/xcompmgr/Makefile b/x11-wm/xcompmgr/Makefile index 7c22d9d..32c9a06 100644 --- a/x11-wm/xcompmgr/Makefile +++ b/x11-wm/xcompmgr/Makefile @@ -6,16 +6,14 @@ # PORTNAME= xcompmgr -PORTVERSION= 1.1.3 -PORTREVISION= 2 +PORTVERSION= 1.1.4 CATEGORIES= x11-wm -MASTER_SITES= http://xapps.freedesktop.org/release/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= x11@FreeBSD.org COMMENT= A sample X compositing manager +XORG_CAT= app USE_XORG= x11 xcomposite xfixes xdamage xrender -GNU_CONFIGURE= yes MAN1= xcompmgr.1 diff --git a/x11-wm/xcompmgr/distinfo b/x11-wm/xcompmgr/distinfo index b493b0a..f372f9b 100644 --- a/x11-wm/xcompmgr/distinfo +++ b/x11-wm/xcompmgr/distinfo @@ -1,3 +1,3 @@ -MD5 (xcompmgr-1.1.3.tar.gz) = 44ccbafa8484b7e0c00e5c83cd915adc -SHA256 (xcompmgr-1.1.3.tar.gz) = 5d4b1fb063876c7b3883e45b69d3a07845a62a132c8a9994de16bf8d6c199d44 -SIZE (xcompmgr-1.1.3.tar.gz) = 79840 +MD5 (xorg/app/xcompmgr-1.1.4.tar.bz2) = 3eb1c2b7a6ceaec4ee872cb06d202d91 +SHA256 (xorg/app/xcompmgr-1.1.4.tar.bz2) = 4bf647745b4de940ef75796fc8ad4e1f83c276e474f7b6779f317fcd070de884 +SIZE (xorg/app/xcompmgr-1.1.4.tar.bz2) = 78389 diff --git a/x11/Makefile b/x11/Makefile index 85d298f..439c665 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -36,6 +36,7 @@ SUBDIR += dgs SUBDIR += dmenu SUBDIR += dmxproto + SUBDIR += dri2proto SUBDIR += docker SUBDIR += dxpc SUBDIR += dynamag diff --git a/x11/beforelight/Makefile b/x11/beforelight/Makefile index b5172a7..f94fd41 100644 --- a/x11/beforelight/Makefile +++ b/x11/beforelight/Makefile @@ -6,7 +6,7 @@ # PORTNAME= beforelight -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/beforelight/distinfo b/x11/beforelight/distinfo index 06c9a62..358c032 100644 --- a/x11/beforelight/distinfo +++ b/x11/beforelight/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/beforelight-1.0.2.tar.bz2) = 8bc2e35cdcd2e6a80eab1b77c41f2a46 -SHA256 (xorg/app/beforelight-1.0.2.tar.bz2) = 00e217559c93779fe04fd948017820af118a3981d6b4371ace95107cb3b047a7 -SIZE (xorg/app/beforelight-1.0.2.tar.bz2) = 85526 +MD5 (xorg/app/beforelight-1.0.3.tar.bz2) = d55b0e7196dafcfeb4db3886af2e1969 +SHA256 (xorg/app/beforelight-1.0.3.tar.bz2) = cae9427fa083a0ec3f2d1a3a6391508b31a2cf0220cb8d732c5d473a8c995c4e +SIZE (xorg/app/beforelight-1.0.3.tar.bz2) = 85067 diff --git a/x11/dri2proto/Makefile b/x11/dri2proto/Makefile new file mode 100644 index 0000000..d8e961c --- /dev/null +++ b/x11/dri2proto/Makefile @@ -0,0 +1,17 @@ +# New ports collection makefile for: dri2proto +# Date Created: Jul 28 2008 +# Whom: Florent Thoumie +# +# $FreeBSD$ +# + +PORTNAME= dri2proto +PORTVERSION= 1.1 +CATEGORIES= x11 + +MAINTAINER= x11@FreeBSD.org +COMMENT= DRI2 prototype headers + +XORG_CAT= proto + +.include diff --git a/x11/dri2proto/distinfo b/x11/dri2proto/distinfo new file mode 100644 index 0000000..becfbad --- /dev/null +++ b/x11/dri2proto/distinfo @@ -0,0 +1,3 @@ +MD5 (xorg/proto/dri2proto-1.1.tar.bz2) = 1d70f0653b0b3a837853262dc5d34da4 +SHA256 (xorg/proto/dri2proto-1.1.tar.bz2) = 69def6d1f64b3699ec9c729596d8b096623a62bdda6bbea78ed690421d174c11 +SIZE (xorg/proto/dri2proto-1.1.tar.bz2) = 40610 diff --git a/x11/dri2proto/pkg-descr b/x11/dri2proto/pkg-descr new file mode 100644 index 0000000..1e57ddb --- /dev/null +++ b/x11/dri2proto/pkg-descr @@ -0,0 +1,4 @@ +This package contains X.Org DRI2 prototype headers. + +- Florent Thoumie +flz@FreeBSD.org diff --git a/x11/dri2proto/pkg-plist b/x11/dri2proto/pkg-plist new file mode 100644 index 0000000..830f3f0 --- /dev/null +++ b/x11/dri2proto/pkg-plist @@ -0,0 +1,3 @@ +include/X11/extensions/dri2proto.h +libdata/pkgconfig/dri2proto.pc +@dirrmtry include/X11/extensions diff --git a/x11/fstobdf/Makefile b/x11/fstobdf/Makefile index 6ebe359..36d5b1c 100644 --- a/x11/fstobdf/Makefile +++ b/x11/fstobdf/Makefile @@ -6,7 +6,7 @@ # PORTNAME= fstobdf -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/fstobdf/distinfo b/x11/fstobdf/distinfo index 56ea2a1..9216579 100644 --- a/x11/fstobdf/distinfo +++ b/x11/fstobdf/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/fstobdf-1.0.2.tar.bz2) = 99144743ab3cbb9cf37090fdc9e747db -SHA256 (xorg/app/fstobdf-1.0.2.tar.bz2) = 690e45b252cd96036dd9b89af8624eb423e16d4bd662b07d264a3f876ce7ac22 -SIZE (xorg/app/fstobdf-1.0.2.tar.bz2) = 82861 +MD5 (xorg/app/fstobdf-1.0.3.tar.bz2) = 49a6225380f6c18fff664a043cd569b1 +SHA256 (xorg/app/fstobdf-1.0.3.tar.bz2) = f2242720045c69f69dc9e18320a1c6402e92234d40c237367560fae3d210f7b0 +SIZE (xorg/app/fstobdf-1.0.3.tar.bz2) = 90507 diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile index 88b9bd5..173b33a 100644 --- a/x11/glproto/Makefile +++ b/x11/glproto/Makefile @@ -6,7 +6,7 @@ # PORTNAME= glproto -PORTVERSION= 1.4.8 +PORTVERSION= 1.4.9 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/glproto/distinfo b/x11/glproto/distinfo index e35b268..d26a42f 100644 --- a/x11/glproto/distinfo +++ b/x11/glproto/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/proto/glproto-1.4.8.tar.bz2) = 3dfbd17203c0c88b94b6f579f24c11cc -SHA256 (xorg/proto/glproto-1.4.8.tar.bz2) = 2f5d84413853b688b7bb46c66fee108a499190e1f7810afffb775910778f053c -SIZE (xorg/proto/glproto-1.4.8.tar.bz2) = 53852 +MD5 (xorg/proto/glproto-1.4.9.tar.bz2) = e60951628422663e60faeb400f27bac1 +SHA256 (xorg/proto/glproto-1.4.9.tar.bz2) = 69d7fb7be4f0f56bd3a67b6c8c88dc677892eb99fd1b13e166b43b39d64764a3 +SIZE (xorg/proto/glproto-1.4.9.tar.bz2) = 57658 diff --git a/x11/inputproto/Makefile b/x11/inputproto/Makefile index 9efac1b..7c7889e 100644 --- a/x11/inputproto/Makefile +++ b/x11/inputproto/Makefile @@ -6,7 +6,7 @@ # PORTNAME= inputproto -PORTVERSION= 1.4.2.1 +PORTVERSION= 1.4.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/inputproto/distinfo b/x11/inputproto/distinfo index f3852aa..6a46fbf 100644 --- a/x11/inputproto/distinfo +++ b/x11/inputproto/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/proto/inputproto-1.4.2.1.tar.bz2) = aa948a7469168ddd9c33f11c5dff55ac -SHA256 (xorg/proto/inputproto-1.4.2.1.tar.bz2) = 9b6db77037de7c52b9a17862b99bc435bd5c20e5d3faf5aec943b206cdaff3ed -SIZE (xorg/proto/inputproto-1.4.2.1.tar.bz2) = 47663 +MD5 (xorg/proto/inputproto-1.4.4.tar.bz2) = 3a532379f226c34b36a5c585999f75e4 +SHA256 (xorg/proto/inputproto-1.4.4.tar.bz2) = 63278ef492d6babb9e3efaef84a67a982e5362c51623714c9428f0384007dfe5 +SIZE (xorg/proto/inputproto-1.4.4.tar.bz2) = 54417 diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile index cd1bfe5..a6baad0 100644 --- a/x11/libSM/Makefile +++ b/x11/libSM/Makefile @@ -6,14 +6,16 @@ # PORTNAME= libSM -PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTVERSION= 1.1.0 PORTEPOCH= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Session Management library for X11 +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/uuid.pc:${PORTSDIR}/misc/e2fsprogs-libuuid +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/uuid.pc:${PORTSDIR}/misc/e2fsprogs-libuuid + XORG_CAT= lib USE_XORG= ice xproto:both xtrans diff --git a/x11/libSM/distinfo b/x11/libSM/distinfo index 459be28..fdaef16 100644 --- a/x11/libSM/distinfo +++ b/x11/libSM/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libSM-1.0.3.tar.bz2) = 184cbf502b3cd5d7ba5f9d1290a99606 -SHA256 (xorg/lib/libSM-1.0.3.tar.bz2) = 57f42d3557effe452cd348362977ff90fa61009885c23b3aca8cb0219b5dec04 -SIZE (xorg/lib/libSM-1.0.3.tar.bz2) = 223906 +MD5 (xorg/lib/libSM-1.1.0.tar.bz2) = 05a04c2b6382fb0054f6c70494e22733 +SHA256 (xorg/lib/libSM-1.1.0.tar.bz2) = 7536ac382e1ff82014d3a0defba0c61b3a30984f4e5bc7707960d6debcb92a82 +SIZE (xorg/lib/libSM-1.1.0.tar.bz2) = 252599 diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index 27902f3..d07aa72 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -6,15 +6,14 @@ # PORTNAME= libX11 -PORTVERSION= 1.1.3 -PORTREVISION= 1 +PORTVERSION= 1.1.5 PORTEPOCH= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X11 library -OPTIONS= XCB "use XCB for low-level protocol implementation" off +OPTIONS= XCB "use XCB for low-level protocol implementation" on XORG_CAT= lib USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \ diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo index 9fb62bb..6ee962c 100644 --- a/x11/libX11/distinfo +++ b/x11/libX11/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libX11-1.1.3.tar.bz2) = 4d43d3e472c552d2f191ecdd4e75112c -SHA256 (xorg/lib/libX11-1.1.3.tar.bz2) = 4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a -SIZE (xorg/lib/libX11-1.1.3.tar.bz2) = 1526958 +MD5 (xorg/lib/libX11-1.1.5.tar.bz2) = d1512d65dadd4f48c779d4749e7753a8 +SHA256 (xorg/lib/libX11-1.1.5.tar.bz2) = da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82 +SIZE (xorg/lib/libX11-1.1.5.tar.bz2) = 1585005 diff --git a/x11/libX11/pkg-plist b/x11/libX11/pkg-plist index 8244c23..7f65475 100644 --- a/x11/libX11/pkg-plist +++ b/x11/libX11/pkg-plist @@ -23,6 +23,9 @@ libdata/pkgconfig/x11.pc %%XCB%%libdata/pkgconfig/x11-xcb.pc lib/X11/XErrorDB lib/X11/XKeysymDB +lib/X11/locale/am_ET.UTF-8/XI18N_OBJS +lib/X11/locale/am_ET.UTF-8/XLC_LOCALE +lib/X11/locale/am_ET.UTF-8/Compose lib/X11/locale/armscii-8/XI18N_OBJS lib/X11/locale/armscii-8/XLC_LOCALE lib/X11/locale/armscii-8/Compose @@ -254,4 +257,5 @@ lib/X11/locale/compose.dir @dirrm lib/X11/locale/el_GR.UTF-8 @dirrm lib/X11/locale/C @dirrm lib/X11/locale/armscii-8 +@dirrm lib/X11/locale/am_ET.UTF-8 @dirrm lib/X11/locale diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile index c4d35c2..983ec6c 100644 --- a/x11/libXScrnSaver/Makefile +++ b/x11/libXScrnSaver/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXScrnSaver -PORTVERSION= 1.1.2 +PORTVERSION= 1.1.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXScrnSaver/distinfo b/x11/libXScrnSaver/distinfo index ee971b2..401b30f 100644 --- a/x11/libXScrnSaver/distinfo +++ b/x11/libXScrnSaver/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXScrnSaver-1.1.2.tar.bz2) = ac2d697dd02f51e5c15f7104f4be5328 -SHA256 (xorg/lib/libXScrnSaver-1.1.2.tar.bz2) = 6c75debca746060e0c2408a6ca119613ae02d1054adebd4b26ff8beee79bcc67 -SIZE (xorg/lib/libXScrnSaver-1.1.2.tar.bz2) = 219728 +MD5 (xorg/lib/libXScrnSaver-1.1.3.tar.bz2) = 93f84b6797f2f29cae1ce23b0355d00d +SHA256 (xorg/lib/libXScrnSaver-1.1.3.tar.bz2) = 4b90245093c15a24aaaf2fc6e09f075137aad994f72043e098597997d9b2c988 +SIZE (xorg/lib/libXScrnSaver-1.1.3.tar.bz2) = 219568 diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile index f782894..d3378d1 100644 --- a/x11/libXau/Makefile +++ b/x11/libXau/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libXau -PORTVERSION= 1.0.3 -PORTREVISION= 2 +PORTVERSION= 1.0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXau/distinfo b/x11/libXau/distinfo index bc29775..9f908d6 100644 --- a/x11/libXau/distinfo +++ b/x11/libXau/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXau-1.0.3.tar.bz2) = 75a9f2b85cd1617b5ca98c9095323853 -SHA256 (xorg/lib/libXau-1.0.3.tar.bz2) = d6c30a88770a720e96e0bd7e13e0334f9ef60f1b475a92556764828005c19e3b -SIZE (xorg/lib/libXau-1.0.3.tar.bz2) = 229619 +MD5 (xorg/lib/libXau-1.0.4.tar.bz2) = 0f2b88d857e0a3f5898e4759c541af46 +SHA256 (xorg/lib/libXau-1.0.4.tar.bz2) = 10d3ffa5f00d0c0a4083309ba68bdfa01dfdf912ef4cf2141e3f260b2edeb22c +SIZE (xorg/lib/libXau-1.0.4.tar.bz2) = 227753 diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile index d78ccf6..4a33bc5 100644 --- a/x11/libXext/Makefile +++ b/x11/libXext/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXext -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/libXext/distinfo b/x11/libXext/distinfo index 5f63d02..a219911 100644 --- a/x11/libXext/distinfo +++ b/x11/libXext/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXext-1.0.3.tar.bz2) = 1bf6fa1c26f9957d7cc0bd90b038dfa6 -SHA256 (xorg/lib/libXext-1.0.3.tar.bz2) = 2d706baf206d1cb422c8e0ceb6c5a8546bc3f0587cf090eba51e75a295d9c3f0 -SIZE (xorg/lib/libXext-1.0.3.tar.bz2) = 262116 +MD5 (xorg/lib/libXext-1.0.4.tar.bz2) = a91f1f722ac80c597cf0b75dcb8b48c0 +SHA256 (xorg/lib/libXext-1.0.4.tar.bz2) = 2dfd8eace1cafacc87b4055c57efeb771a740e24141d3f113de58c2a9eebd21f +SIZE (xorg/lib/libXext-1.0.4.tar.bz2) = 264491 diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile index 8a48da0..7b404b6 100644 --- a/x11/libXinerama/Makefile +++ b/x11/libXinerama/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXinerama -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/libXinerama/distinfo b/x11/libXinerama/distinfo index 43db741..0955c5e 100644 --- a/x11/libXinerama/distinfo +++ b/x11/libXinerama/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXinerama-1.0.2.tar.bz2) = f6fb08eafd3c2909d515f1a07bfca8fd -SHA256 (xorg/lib/libXinerama-1.0.2.tar.bz2) = d245d7ae4c766ecbc4e5cc2666e2e78198d8386dbaa06b35c3d1b1457ee5d03d -SIZE (xorg/lib/libXinerama-1.0.2.tar.bz2) = 214046 +MD5 (xorg/lib/libXinerama-1.0.3.tar.bz2) = cd9f7c46439ac40e0517a302d2434d2c +SHA256 (xorg/lib/libXinerama-1.0.3.tar.bz2) = 07b3564cd56154c20580b56230b7a95d74fe6582c80cedf0550d8d7955181219 +SIZE (xorg/lib/libXinerama-1.0.3.tar.bz2) = 236386 diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile index 4603957..a3d58c9 100644 --- a/x11/libXrandr/Makefile +++ b/x11/libXrandr/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libXrandr -PORTVERSION= 1.2.2 -PORTREVISION= 1 +PORTVERSION= 1.2.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -17,7 +16,6 @@ XORG_CAT= lib USE_XORG= x11 randrproto:both xext xextproto xrender renderproto xproto:both MAN3= Xrandr.3 \ - XRRConfig.3 \ XRRConfigCurrentConfiguration.3 \ XRRConfigCurrentRate.3 \ XRRConfigRates.3 \ @@ -29,7 +27,6 @@ MAN3= Xrandr.3 \ XRRQueryExtension.3 \ XRRQueryVersion.3 \ XRRRootToScreen.3 \ - XRRScreenConfig.3 \ XRRSelectInput.3 \ XRRSetScreenConfig.3 \ XRRSetScreenConfigAndRate.3 diff --git a/x11/libXrandr/distinfo b/x11/libXrandr/distinfo index d9f575f..3744d06 100644 --- a/x11/libXrandr/distinfo +++ b/x11/libXrandr/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXrandr-1.2.2.tar.bz2) = 1b244b5d19f0ccab01d7083436cd3558 -SHA256 (xorg/lib/libXrandr-1.2.2.tar.bz2) = 206f8dc850f12b1213fb73dbef09fafa1bb8fb8c3ddfe4d39721c1e2dec12a98 -SIZE (xorg/lib/libXrandr-1.2.2.tar.bz2) = 224302 +MD5 (xorg/lib/libXrandr-1.2.3.tar.bz2) = 5cd67cc02a50c9644ba0a1846ea3b08e +SHA256 (xorg/lib/libXrandr-1.2.3.tar.bz2) = f8edfe26b8c4c3677a3a949f81a8b09a5fad62972020bfd230401e11cc0ed267 +SIZE (xorg/lib/libXrandr-1.2.3.tar.bz2) = 251814 diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile index 1beea2c..6cb164e 100644 --- a/x11/libXv/Makefile +++ b/x11/libXv/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libXv -PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTVERSION= 1.0.4 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/libXv/distinfo b/x11/libXv/distinfo index dee2747..839e785 100644 --- a/x11/libXv/distinfo +++ b/x11/libXv/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXv-1.0.3.tar.bz2) = f1c4109fa804aeaf7188b66c5cdd9f57 -SHA256 (xorg/lib/libXv-1.0.3.tar.bz2) = f87ae65be39a3c26dc3c87159d9126daf2af1b8c5e7f2ffc38b9f72b9236261b -SIZE (xorg/lib/libXv-1.0.3.tar.bz2) = 231715 +MD5 (xorg/lib/libXv-1.0.4.tar.bz2) = 723a0275227165383e967a1ca8899b52 +SHA256 (xorg/lib/libXv-1.0.4.tar.bz2) = 4d3cc49b6f4da6d396196054eca23a91df1a41001c736dcfd22fec5a5c7428c8 +SIZE (xorg/lib/libXv-1.0.4.tar.bz2) = 229227 diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile index 7508185..671d596 100644 --- a/x11/libXxf86vm/Makefile +++ b/x11/libXxf86vm/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXxf86vm -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXxf86vm/distinfo b/x11/libXxf86vm/distinfo index 852a685..5f6d92e 100644 --- a/x11/libXxf86vm/distinfo +++ b/x11/libXxf86vm/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXxf86vm-1.0.1.tar.bz2) = 8de1ca6c55aaad7d8cae19b4f0b3da32 -SHA256 (xorg/lib/libXxf86vm-1.0.1.tar.bz2) = e08fc2c1611c422f751ed02810491b45bf7faa4207d762a11f11815263c9285a -SIZE (xorg/lib/libXxf86vm-1.0.1.tar.bz2) = 227928 +MD5 (xorg/lib/libXxf86vm-1.0.2.tar.bz2) = 304d37bd0a10d9b58aa9b64469ad73e5 +SHA256 (xorg/lib/libXxf86vm-1.0.2.tar.bz2) = 3cb3c3c6552a4fbc686ba6c2dbeb6e4ba2a27103279908831d56363de73951de +SIZE (xorg/lib/libXxf86vm-1.0.2.tar.bz2) = 240637 diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile index 8c4be0a..588fa60 100644 --- a/x11/libxkbfile/Makefile +++ b/x11/libxkbfile/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libxkbfile -PORTVERSION= 1.0.4 +PORTVERSION= 1.0.5 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libxkbfile/distinfo b/x11/libxkbfile/distinfo index a1594e5..106e9f4 100644 --- a/x11/libxkbfile/distinfo +++ b/x11/libxkbfile/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libxkbfile-1.0.4.tar.bz2) = 12b4ceb5d42b520228b5fb40a96ae6c5 -SHA256 (xorg/lib/libxkbfile-1.0.4.tar.bz2) = 468ade4eaa3951a7c34b6ae1c290ab1a1d364ee36c5c455ef0df15550825b8ae -SIZE (xorg/lib/libxkbfile-1.0.4.tar.bz2) = 273537 +MD5 (xorg/lib/libxkbfile-1.0.5.tar.bz2) = 0726a845fe5a56551de2718c9f6b0e35 +SHA256 (xorg/lib/libxkbfile-1.0.5.tar.bz2) = 0ab628271fc9cb6d05f861d9823573088d81d510aca95b87ac0504b2e558965f +SIZE (xorg/lib/libxkbfile-1.0.5.tar.bz2) = 259790 diff --git a/x11/luit/Makefile b/x11/luit/Makefile index 26ef3e4..2a3e0ad 100644 --- a/x11/luit/Makefile +++ b/x11/luit/Makefile @@ -6,8 +6,7 @@ # PORTNAME= luit -PORTVERSION= 1.0.2 -PORTREVISION= 2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/luit/distinfo b/x11/luit/distinfo index 092103b..054a7b3 100644 --- a/x11/luit/distinfo +++ b/x11/luit/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/luit-1.0.2.tar.bz2) = aacda46598ce3af8ca16e2a8132db1b2 -SHA256 (xorg/app/luit-1.0.2.tar.bz2) = c0c4d76df0350c626df7ce62bf3df7915f9959557d76abce96222857d782389c -SIZE (xorg/app/luit-1.0.2.tar.bz2) = 99235 +MD5 (xorg/app/luit-1.0.3.tar.bz2) = b01e4f71c20fc1c79ed727759c1df40c +SHA256 (xorg/app/luit-1.0.3.tar.bz2) = 2010f2152eee89a67f02edc3041574fb07442d075ca46fbcf84f981f0977a5d7 +SIZE (xorg/app/luit-1.0.3.tar.bz2) = 104642 diff --git a/x11/printproto/Makefile b/x11/printproto/Makefile index da937f1..af2b57d 100644 --- a/x11/printproto/Makefile +++ b/x11/printproto/Makefile @@ -6,7 +6,7 @@ # PORTNAME= printproto -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/printproto/distinfo b/x11/printproto/distinfo index 638a4e4..ad847aa 100644 --- a/x11/printproto/distinfo +++ b/x11/printproto/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/proto/printproto-1.0.3.tar.bz2) = 0f4e7982c6d4ec3b2cf38502dd1293a3 -SHA256 (xorg/proto/printproto-1.0.3.tar.bz2) = 8b375f8cda83dfc7d84be44af41eedd484d0e2499acbd19bdca5b4056dec7235 -SIZE (xorg/proto/printproto-1.0.3.tar.bz2) = 43560 +MD5 (xorg/proto/printproto-1.0.4.tar.bz2) = 7321847a60748b4d2f1fa16db4b6ede8 +SHA256 (xorg/proto/printproto-1.0.4.tar.bz2) = f059a93188e7143dbb6cc55e31ccf81b976776aa3023bfa57f47501fd1bfd3be +SIZE (xorg/proto/printproto-1.0.4.tar.bz2) = 49579 diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile index e3caae3..9b03858 100644 --- a/x11/sessreg/Makefile +++ b/x11/sessreg/Makefile @@ -6,7 +6,7 @@ # PORTNAME= sessreg -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/sessreg/distinfo b/x11/sessreg/distinfo index 15eadc0..d300de9 100644 --- a/x11/sessreg/distinfo +++ b/x11/sessreg/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/sessreg-1.0.3.tar.bz2) = 07665816f2623ec82e665fb7d31c6cef -SHA256 (xorg/app/sessreg-1.0.3.tar.bz2) = 7d0c145d53246ddf09fc749f91324897ed9a3da0064808f99b789c37470080dc -SIZE (xorg/app/sessreg-1.0.3.tar.bz2) = 94690 +MD5 (xorg/app/sessreg-1.0.4.tar.bz2) = 839e968d7197b9563f0fd8a5a3aac2e3 +SHA256 (xorg/app/sessreg-1.0.4.tar.bz2) = 23e163502e208ac16f04a12b15f7f8dcd9919f0149c714353b7f92539b7e9802 +SIZE (xorg/app/sessreg-1.0.4.tar.bz2) = 96209 diff --git a/x11/x11perf/Makefile b/x11/x11perf/Makefile index d3789a1..20079d1 100644 --- a/x11/x11perf/Makefile +++ b/x11/x11perf/Makefile @@ -6,7 +6,7 @@ # PORTNAME= x11perf -PORTVERSION= 1.4.1 +PORTVERSION= 1.5 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/x11perf/distinfo b/x11/x11perf/distinfo index 62ad1a0..2ad476a 100644 --- a/x11/x11perf/distinfo +++ b/x11/x11perf/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/x11perf-1.4.1.tar.bz2) = fd06c8b8e3572a0e14af65a49e0dd7d1 -SHA256 (xorg/app/x11perf-1.4.1.tar.bz2) = c81819618ec596fda55b950ef80f2ee02e5ce149ea99f1f741cedb459b4d3064 -SIZE (xorg/app/x11perf-1.4.1.tar.bz2) = 126784 +MD5 (xorg/app/x11perf-1.5.tar.bz2) = 31283bfc3c78718ac1bd71e510d4e774 +SHA256 (xorg/app/x11perf-1.5.tar.bz2) = 4729da53dde0b7e1748db4bb771f9b7aaf2e2b1e67293a3a5b96d54043ce1233 +SIZE (xorg/app/x11perf-1.5.tar.bz2) = 142378 diff --git a/x11/xauth/Makefile b/x11/xauth/Makefile index 04c0194..29e3b26 100644 --- a/x11/xauth/Makefile +++ b/x11/xauth/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xauth -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xauth/distinfo b/x11/xauth/distinfo index 9573c12..14a99ab 100644 --- a/x11/xauth/distinfo +++ b/x11/xauth/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xauth-1.0.2.tar.bz2) = 31b956edaeb453ddaa640420e97b25b2 -SHA256 (xorg/app/xauth-1.0.2.tar.bz2) = 569e5a581e5eb16abf1c04a66da22c6dade14578ab34e5e78b8724bb655f1f17 -SIZE (xorg/app/xauth-1.0.2.tar.bz2) = 110215 +MD5 (xorg/app/xauth-1.0.3.tar.bz2) = e91e10ace1df0d5f2cbc74ead256407a +SHA256 (xorg/app/xauth-1.0.3.tar.bz2) = 1fd18b53fda74ea4649eb9577b1cf86538a25d171f10251eeb30d11cdd5bda8c +SIZE (xorg/app/xauth-1.0.3.tar.bz2) = 112331 diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile index e1033d8..88ba511 100644 --- a/x11/xdm/Makefile +++ b/x11/xdm/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xdm -PORTVERSION= 1.1.6 -PORTREVISION= 3 +PORTVERSION= 1.1.8 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -29,6 +28,7 @@ post-patch: ${WRKSRC}/config/xdm-config.cpp \ ${WRKSRC}/config/Xstartup.cpp \ ${WRKSRC}/config/Xreset.cpp + @${REINPLACE_CMD} -e "s|@DESTDIR@||" ${WRKSRC}/Makefile.in post-configure: @${REINPLACE_CMD} -e "s|${EXAMPLESDIR}|${PREFIX}/lib/X11/xdm|" \ diff --git a/x11/xdm/distinfo b/x11/xdm/distinfo index e689ef9..b4d588d 100644 --- a/x11/xdm/distinfo +++ b/x11/xdm/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xdm-1.1.6.tar.bz2) = c89f8bc74fda4d19e5f374f59c88810f -SHA256 (xorg/app/xdm-1.1.6.tar.bz2) = c41ac89d9da5c3f5424e9c4871d363ff17acf0fd2a46830931c447ba0b5a8bcd -SIZE (xorg/app/xdm-1.1.6.tar.bz2) = 394175 +MD5 (xorg/app/xdm-1.1.8.tar.bz2) = cc1816bc62a3722ad509373b0b7f30fe +SHA256 (xorg/app/xdm-1.1.8.tar.bz2) = e1169058775a44b0898351d2f645039b4d8946360285831e553587a147b735e9 +SIZE (xorg/app/xdm-1.1.8.tar.bz2) = 401712 diff --git a/x11/xdm/files/patch-config_Xresources.cpp b/x11/xdm/files/patch-config_Xresources.cpp deleted file mode 100644 index 79f43ad..0000000 --- a/x11/xdm/files/patch-config_Xresources.cpp +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/config/Xresources.cpp b/config/Xresources.cpp -index a98287b..8c04efc 100644 ---- config/Xresources.cpp.orig -+++ config/Xresources.cpp -@@ -36,6 +36,16 @@ xlogin*greetFace: Serif-24:bold:italic - xlogin*face: Helvetica-18 - xlogin*promptFace: Helvetica-18:bold - xlogin*failFace: Helvetica-18:bold -+XHASHelse -+xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1 -+xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1 -+xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1 -+xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1 -+xlogin*greetFace: Serif-18:bold:italic -+xlogin*face: Helvetica-12 -+xlogin*promptFace: Helvetica-12:bold -+xlogin*failFace: Helvetica-14:bold -+XHASHendif - - XHASHifdef COLOR - xlogin*borderWidth: 1 diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile index e815d33..eb432d8 100644 --- a/x11/xdpyinfo/Makefile +++ b/x11/xdpyinfo/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xdpyinfo -PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xdpyinfo/distinfo b/x11/xdpyinfo/distinfo index c514e41..53dd02d 100644 --- a/x11/xdpyinfo/distinfo +++ b/x11/xdpyinfo/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xdpyinfo-1.0.2.tar.bz2) = c9ee60ae52c97c51d4ca327e53f0cb61 -SHA256 (xorg/app/xdpyinfo-1.0.2.tar.bz2) = c9927fc33e8a4422d74b1ebee0d19dd5a16d9ebc435e8f47f0aa546501ccfed3 -SIZE (xorg/app/xdpyinfo-1.0.2.tar.bz2) = 100024 +MD5 (xorg/app/xdpyinfo-1.0.3.tar.bz2) = b7cbab6cbcd12bf7ad65dbc12d86e104 +SHA256 (xorg/app/xdpyinfo-1.0.3.tar.bz2) = 4294768751bd4ffb47e5ebacfc7b5b9f95a1a2f4d221d8af64474382473e1962 +SIZE (xorg/app/xdpyinfo-1.0.3.tar.bz2) = 103116 diff --git a/x11/xev/Makefile b/x11/xev/Makefile index 5a0dfc4..118aed8 100644 --- a/x11/xev/Makefile +++ b/x11/xev/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xev -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xev/distinfo b/x11/xev/distinfo index 0d51b68..bd2ca1d 100644 --- a/x11/xev/distinfo +++ b/x11/xev/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xev-1.0.2.tar.bz2) = e3008eb0655da3026c162a5597d70869 -SHA256 (xorg/app/xev-1.0.2.tar.bz2) = cac2771b67942d9a00b46532176feb18b2f82c434e0f6ece578d95953ef33053 -SIZE (xorg/app/xev-1.0.2.tar.bz2) = 84097 +MD5 (xorg/app/xev-1.0.3.tar.bz2) = a9532c3d1683c99bb5df1895cb3a60b1 +SHA256 (xorg/app/xev-1.0.3.tar.bz2) = d4ac7ae154ee9733be27a5f55586abb9362c768f5fb8a4fc7fd2645100a9313a +SIZE (xorg/app/xev-1.0.3.tar.bz2) = 92292 diff --git a/x11/xextproto/Makefile b/x11/xextproto/Makefile index fcff27a..4154572 100644 --- a/x11/xextproto/Makefile +++ b/x11/xextproto/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xextproto -PORTVERSION= 7.0.2 +PORTVERSION= 7.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xextproto/distinfo b/x11/xextproto/distinfo index 3be185f..58bfa46 100644 --- a/x11/xextproto/distinfo +++ b/x11/xextproto/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/proto/xextproto-7.0.2.tar.bz2) = 242388ab65dde3a3dd313eeee265e429 -SHA256 (xorg/proto/xextproto-7.0.2.tar.bz2) = 53f3039ae769b08bd139d4474a7debe0b6f24048e7c514c835c8a1880f11e0d9 -SIZE (xorg/proto/xextproto-7.0.2.tar.bz2) = 68323 +MD5 (xorg/proto/xextproto-7.0.3.tar.bz2) = 3a2e0252e853ab30b3bff05ac92ec61c +SHA256 (xorg/proto/xextproto-7.0.3.tar.bz2) = 3972428e3651c9159aff655c9c794728520c3ce3d66ac219ec5243d5d73d4db4 +SIZE (xorg/proto/xextproto-7.0.3.tar.bz2) = 71648 diff --git a/x11/xextproto/pkg-plist b/x11/xextproto/pkg-plist index e997f23..30e1062 100644 --- a/x11/xextproto/pkg-plist +++ b/x11/xextproto/pkg-plist @@ -5,16 +5,18 @@ include/X11/extensions/XLbx.h include/X11/extensions/XShm.h include/X11/extensions/XTest.h include/X11/extensions/Xag.h -include/X11/extensions/Xagsrv.h include/X11/extensions/Xagstr.h include/X11/extensions/Xcup.h include/X11/extensions/Xcupstr.h include/X11/extensions/Xdbe.h include/X11/extensions/Xdbeproto.h include/X11/extensions/Xext.h +include/X11/extensions/Xge.h include/X11/extensions/dpms.h include/X11/extensions/dpmsstr.h include/X11/extensions/extutil.h +include/X11/extensions/ge.h +include/X11/extensions/geproto.h include/X11/extensions/lbxbuf.h include/X11/extensions/lbxbufstr.h include/X11/extensions/lbxdeltastr.h diff --git a/x11/xf86driproto/Makefile b/x11/xf86driproto/Makefile index deabac5..1acf5f9 100644 --- a/x11/xf86driproto/Makefile +++ b/x11/xf86driproto/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86driproto -PORTVERSION= 2.0.3 +PORTVERSION= 2.0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xf86driproto/distinfo b/x11/xf86driproto/distinfo index 8bc28ed..e32be9f 100644 --- a/x11/xf86driproto/distinfo +++ b/x11/xf86driproto/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/proto/xf86driproto-2.0.3.tar.bz2) = e4a282cfd708b8892fca4425fee9cd7b -SHA256 (xorg/proto/xf86driproto-2.0.3.tar.bz2) = 111c469a24374803b08104c725d8318760b226cedccd12b199c83d1b2756b8d6 -SIZE (xorg/proto/xf86driproto-2.0.3.tar.bz2) = 42828 +MD5 (xorg/proto/xf86driproto-2.0.4.tar.bz2) = 01470d088da3a8a3deefa8e1f45d69cb +SHA256 (xorg/proto/xf86driproto-2.0.4.tar.bz2) = f57da66bec8563502fe95c0e3f6ed297d9985862f5b64a5c9d3039719ac7f9da +SIZE (xorg/proto/xf86driproto-2.0.4.tar.bz2) = 43814 diff --git a/x11/xf86driproto/pkg-plist b/x11/xf86driproto/pkg-plist index ad29f35..93dac2d 100644 --- a/x11/xf86driproto/pkg-plist +++ b/x11/xf86driproto/pkg-plist @@ -1,4 +1,3 @@ -include/GL/internal/dri_interface.h include/X11/dri/xf86dri.h include/X11/dri/xf86dristr.h libdata/pkgconfig/xf86driproto.pc diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile index 07b8b9f..6ff0896 100644 --- a/x11/xinit/Makefile +++ b/x11/xinit/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xinit -PORTVERSION= 1.0.7 +PORTVERSION= 1.0.9 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo index fc24500..8f4018b 100644 --- a/x11/xinit/distinfo +++ b/x11/xinit/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xinit-1.0.7.tar.bz2) = 8b882d9e2deed9d85469a3beaec566a3 -SHA256 (xorg/app/xinit-1.0.7.tar.bz2) = 15781cf2b15af8a2535ecc49acce77cc16573571344a71dcbe198ec12e5bb774 -SIZE (xorg/app/xinit-1.0.7.tar.bz2) = 110908 +MD5 (xorg/app/xinit-1.0.9.tar.bz2) = 224c36057e4416205d4e421af01a2f15 +SHA256 (xorg/app/xinit-1.0.9.tar.bz2) = b4218fd4ca5e431bf69cba848c21e91235fda30504634b9f6b6cd011dcbd8999 +SIZE (xorg/app/xinit-1.0.9.tar.bz2) = 127210 diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile index d820002..e4302d8 100644 --- a/x11/xinput/Makefile +++ b/x11/xinput/Makefile @@ -6,18 +6,17 @@ # PORTNAME= xinput -PORTVERSION= 1.2 -PORTREVISION= 1 +PORTVERSION= 1.3.0 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XCONTRIB} -MASTER_SITE_SUBDIR=utilities -MAINTAINER= ports@FreeBSD.org +MAINTAINER= x11@FreeBSD.org COMMENT= Very useful utility for configuring and testing XInput devices -USE_IMAKE= yes +XORG_CAT= app +USE_XORG= inputproto x11 xi xext -MAN1= xinput.1 PLIST_FILES= bin/xinput +MAN1= xinput.1 + .include diff --git a/x11/xinput/distinfo b/x11/xinput/distinfo index f12b6f7..71de447 100644 --- a/x11/xinput/distinfo +++ b/x11/xinput/distinfo @@ -1,3 +1,3 @@ -MD5 (xinput-1.2.tar.gz) = 0ee7ad8dca7a3add2b63b1c96bc87399 -SHA256 (xinput-1.2.tar.gz) = 4529443553a50f8508b0c63555bd8405e49f7648f60fd41b16176ada2420b223 -SIZE (xinput-1.2.tar.gz) = 8354 +MD5 (xorg/app/xinput-1.3.0.tar.bz2) = 977d657e8d7b59f7d82c98ebef444b28 +SHA256 (xorg/app/xinput-1.3.0.tar.bz2) = 330c3e5188abf256131c162c456060804f369349e9a0e7aa3efbc54add802e45 +SIZE (xorg/app/xinput-1.3.0.tar.bz2) = 94468 diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile index b80d84d..0cdf694 100644 --- a/x11/xkbcomp/Makefile +++ b/x11/xkbcomp/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xkbcomp -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.5 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xkbcomp/distinfo b/x11/xkbcomp/distinfo index 89f85b3..db401ba 100644 --- a/x11/xkbcomp/distinfo +++ b/x11/xkbcomp/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xkbcomp-1.0.3.tar.bz2) = 2fbcae1323c266edf5b6c61751f2e343 -SHA256 (xorg/app/xkbcomp-1.0.3.tar.bz2) = 0635bae5dae3c933ebba997475ae14fa213aee1f2ea8aaff2ca76c50f8aec716 -SIZE (xorg/app/xkbcomp-1.0.3.tar.bz2) = 189992 +MD5 (xorg/app/xkbcomp-1.0.5.tar.bz2) = 6cc96c3e4ed5d9802fe717beac008f19 +SHA256 (xorg/app/xkbcomp-1.0.5.tar.bz2) = 204403e0388e83127212109310037d17f56c3c3fd3c96d7dcaa0df99684f00c1 +SIZE (xorg/app/xkbcomp-1.0.5.tar.bz2) = 201382 diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile index 3ce4333..f966b7c 100644 --- a/x11/xorg-apps/Makefile +++ b/x11/xorg-apps/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-apps -PORTVERSION= 7.3 +PORTVERSION= 7.4 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none @@ -15,100 +15,15 @@ EXTRACT_ONLY= # none MAINTAINER= x11@FreeBSD.org COMMENT= X.org apps meta-port -RUN_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ - mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ - mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \ - appres:${PORTSDIR}/x11/appres \ - beforelight:${PORTSDIR}/x11/beforelight \ - bitmap:${PORTSDIR}/x11/bitmap \ - editres:${PORTSDIR}/x11/editres \ - fonttosfnt:${PORTSDIR}/x11-fonts/fonttosfnt \ - fslsfonts:${PORTSDIR}/x11-fonts/fslsfonts \ - fstobdf:${PORTSDIR}/x11/fstobdf \ - iceauth:${PORTSDIR}/x11/iceauth \ - ico:${PORTSDIR}/x11/ico \ - listres:${PORTSDIR}/x11/listres \ - luit:${PORTSDIR}/x11/luit \ - ${PREFIX}/sbin/mkcomposecache:${PORTSDIR}/x11/mkcomposecache \ - oclock:${PORTSDIR}/x11/oclock \ - showrgb:${PORTSDIR}/x11/rgb \ - rstart:${PORTSDIR}/x11/rstart \ - xon:${PORTSDIR}/x11/scripts \ - sessreg:${PORTSDIR}/x11/sessreg \ - setxkbmap:${PORTSDIR}/x11/setxkbmap \ - showfont:${PORTSDIR}/x11-fonts/showfont \ - smproxy:${PORTSDIR}/x11/smproxy \ - twm:${PORTSDIR}/x11-wm/twm \ - viewres:${PORTSDIR}/x11/viewres \ - x11perf:${PORTSDIR}/x11/x11perf \ - xauth:${PORTSDIR}/x11/xauth \ - xbacklight:${PORTSDIR}/x11/xbacklight \ - xbiff:${PORTSDIR}/x11/xbiff \ - xcalc:${PORTSDIR}/x11/xcalc \ - xclipboard:${PORTSDIR}/x11/xclipboard \ - xclock:${PORTSDIR}/x11/xclock \ - xcmsdb:${PORTSDIR}/x11/xcmsdb \ - xconsole:${PORTSDIR}/x11/xconsole \ - xcursorgen:${PORTSDIR}/x11/xcursorgen \ - xdbedizzy:${PORTSDIR}/x11/xdbedizzy \ - xditview:${PORTSDIR}/x11/xditview \ - xdm:${PORTSDIR}/x11/xdm \ - xdpyinfo:${PORTSDIR}/x11/xdpyinfo \ - xdriinfo:${PORTSDIR}/x11/xdriinfo \ - xedit:${PORTSDIR}/x11/xedit \ - xev:${PORTSDIR}/x11/xev \ - xeyes:${PORTSDIR}/x11/xeyes \ - dga:${PORTSDIR}/x11/xf86dga \ - xfd:${PORTSDIR}/x11/xfd \ - xfindproxy:${PORTSDIR}/x11/xfindproxy \ - xfontsel:${PORTSDIR}/x11-fonts/xfontsel \ - xfs:${PORTSDIR}/x11-fonts/xfs \ - xfsinfo:${PORTSDIR}/x11-fonts/xfsinfo \ - xfwp:${PORTSDIR}/x11/xfwp \ - xgamma:${PORTSDIR}/x11/xgamma \ - xgc:${PORTSDIR}/x11/xgc \ - xhost:${PORTSDIR}/x11/xhost \ - xinit:${PORTSDIR}/x11/xinit \ - xkbcomp:${PORTSDIR}/x11/xkbcomp \ - xkbevd:${PORTSDIR}/x11/xkbevd \ - xkbprint:${PORTSDIR}/x11/xkbprint \ - xkbvleds:${PORTSDIR}/x11/xkbutils \ - xkill:${PORTSDIR}/x11/xkill \ - xload:${PORTSDIR}/x11/xload \ - xlogo:${PORTSDIR}/x11/xlogo \ - xlsatoms:${PORTSDIR}/x11/xlsatoms \ - xlsclients:${PORTSDIR}/x11/xlsclients \ - xlsfonts:${PORTSDIR}/x11-fonts/xlsfonts \ - xmag:${PORTSDIR}/x11/xmag \ - xman:${PORTSDIR}/x11/xman \ - xmessage:${PORTSDIR}/x11/xmessage \ - xmodmap:${PORTSDIR}/x11/xmodmap \ - xmore:${PORTSDIR}/x11/xmore \ - xphelloworld:${PORTSDIR}/x11/xphelloworld \ - xplsprinters:${PORTSDIR}/x11/xplsprinters \ - xpr:${PORTSDIR}/x11/xpr \ - xprehashprinterlist:${PORTSDIR}/x11/xprehashprinterlist \ - xprop:${PORTSDIR}/x11/xprop \ - xrandr:${PORTSDIR}/x11/xrandr \ - xrdb:${PORTSDIR}/x11/xrdb \ - xrefresh:${PORTSDIR}/x11/xrefresh \ - xrx:${PORTSDIR}/x11/xrx \ - xset:${PORTSDIR}/x11/xset \ - xsetmode:${PORTSDIR}/x11/xsetmode \ - xsetpointer:${PORTSDIR}/x11/xsetpointer \ - xsetroot:${PORTSDIR}/x11/xsetroot \ - xstdcmap:${PORTSDIR}/x11/xstdcmap \ - xtrapchar:${PORTSDIR}/x11/xtrap \ - xvidtune:${PORTSDIR}/x11/xvidtune \ - xvinfo:${PORTSDIR}/x11/xvinfo \ - xwd:${PORTSDIR}/x11/xwd \ - xwininfo:${PORTSDIR}/x11/xwininfo \ - xwud:${PORTSDIR}/x11/xwud \ - xterm:${PORTSDIR}/x11/xterm - -.if exists(/usr/bin/rsh) -RUN_DEPENDS+= xsm:${PORTSDIR}/x11/xsm -.endif +COMPONENTS= appres bitmap xf86dga:dga iceauth luit \ + x11-fonts/mkfontdir:mkfontdir \ + x11-fonts/mkfontscale:mkfontscale sessreg \ + setxkbmap smproxy x11perf xauth xbacklight xcalc \ + xcmsdb xcursorgen xdpyinfo xdriinfo xev xgamma xgc \ + xhost xinput xkbcomp xkbevd xkbutils:xkbvleds xkill \ + xlsatoms xlsclients xmodmap xpr xprop xrandr xrdb \ + xrefresh xset xsetmode xsetroot xvinfo xwd xwininfo \ + xwud NO_BUILD= yes @@ -116,4 +31,26 @@ do-install: ${MKDIR} ${PREFIX}/libdata/xorg ${TOUCH} ${PREFIX}/libdata/xorg/apps -.include +.for comp in ${COMPONENTS} +OPTIONS+= ${comp:C/:.*//:C/.*\///:U} "Install ${comp:C/:.*//:C/.*\///} application" on +.endfor + +.include + +.for comp in ${COMPONENTS} +. if !defined(WITHOUT_${comp:C/:.*//:C/.*\///:U}) +. if ${comp:M:}=="" +port=${comp} +check=${comp:C/.*\///} # doesn't work +. else +port=${comp:C/:.*//} +check=${comp:C/.*://} +. endif +. if ${port:M*/*}=="" +port:=x11/${port} +. endif +RUN_DEPENDS:= ${RUN_DEPENDS} ${check}:${PORTSDIR}/${port} +. endif +.endfor + +.include diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile index 4f8b023..b48da18 100644 --- a/x11/xorg-libraries/Makefile +++ b/x11/xorg-libraries/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorg-libraries -PORTVERSION= 7.3 -PORTREVISION= 2 +PORTVERSION= 7.4 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none @@ -18,13 +17,14 @@ COMMENT= X.org libraries meta-port NO_BUILD= yes -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \ - ${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \ - ${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache \ +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \ + ${LOCALBASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc \ ${LOCALBASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE \ + ${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS \ + ${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX \ + ${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman \ ${LOCALBASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM \ - ${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres \ - ${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap \ + ${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \ ${LOCALBASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau \ ${LOCALBASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw \ ${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite \ @@ -35,32 +35,31 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \ ${LOCALBASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \ ${LOCALBASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes \ ${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \ + ${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \ + ${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache \ + ${LOCALBASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft \ ${LOCALBASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi \ ${LOCALBASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama \ + ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \ + ${LOCALBASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui \ ${LOCALBASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu \ ${LOCALBASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp \ ${LOCALBASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm \ + ${LOCALBASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil \ + ${LOCALBASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil \ ${LOCALBASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr \ ${LOCALBASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender \ + ${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres \ ${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver \ ${LOCALBASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt \ + ${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans \ + ${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap \ ${LOCALBASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst \ ${LOCALBASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv \ ${LOCALBASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC \ ${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga \ ${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc \ - ${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm \ - ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \ - ${LOCALBASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui \ - ${LOCALBASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft \ - ${LOCALBASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil \ - ${LOCALBASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil \ - ${LOCALBASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc \ - ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \ - ${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans \ - ${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS \ - ${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX \ - ${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman + ${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm .if !defined(XORG_UPGRADE) && !defined(PACKAGE_BUILDING) && exists(/usr/X11R6) pre-everything:: diff --git a/x11/xorg-protos/Makefile b/x11/xorg-protos/Makefile index d0c8a70..58959a4 100644 --- a/x11/xorg-protos/Makefile +++ b/x11/xorg-protos/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorg-protos -PORTVERSION= 7.3 -PORTREVISION= 2 +PORTVERSION= 7.4 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none @@ -16,36 +15,37 @@ EXTRACT_ONLY= # none MAINTAINER= x11@FreeBSD.org COMMENT= X.org protos meta-port -BUILD_DEPENDS= ${PREFIX}/include/X11/extensions/bigreqstr.h:${PORTSDIR}/x11/bigreqsproto \ +BUILD_DEPENDS= ${PREFIX}/include/GL/glxproto.h:${PORTSDIR}/x11/glproto \ + ${PREFIX}/include/X11/dri/xf86dri.h:${PORTSDIR}/x11/xf86driproto \ + ${PREFIX}/include/X11/DECkeysym.h:${PORTSDIR}/x11/xproto \ + ${PREFIX}/include/X11/PM/PM.h:${PORTSDIR}/x11/xproxymanagementprotocol \ + ${PREFIX}/include/X11/extensions/MITMisc.h:${PORTSDIR}/x11/xextproto \ + ${PREFIX}/include/X11/extensions/Print.h:${PORTSDIR}/x11/printproto \ + ${PREFIX}/include/X11/extensions/XIproto.h:${PORTSDIR}/x11/inputproto \ + ${PREFIX}/include/X11/extensions/XKB.h:${PORTSDIR}/x11/kbproto \ + ${PREFIX}/include/X11/extensions/XResproto.h:${PORTSDIR}/x11/resourceproto \ + ${PREFIX}/include/X11/extensions/Xv.h:${PORTSDIR}/x11/videoproto \ + ${PREFIX}/include/X11/extensions/bigreqstr.h:${PORTSDIR}/x11/bigreqsproto \ ${PREFIX}/include/X11/extensions/composite.h:${PORTSDIR}/x11/compositeproto \ ${PREFIX}/include/X11/extensions/damageproto.h:${PORTSDIR}/x11/damageproto \ ${PREFIX}/include/X11/extensions/dmxproto.h:${PORTSDIR}/x11/dmxproto \ - ${PREFIX}/include/X11/extensions/xfixesproto.h:${PORTSDIR}/x11/fixesproto \ + ${PREFIX}/include/X11/extensions/dri2proto.h:${PORTSDIR}/x11/dri2proto \ ${PREFIX}/include/X11/extensions/fontcache.h:${PORTSDIR}/x11-fonts/fontcacheproto \ - ${PREFIX}/include/X11/fonts/FS.h:${PORTSDIR}/x11-fonts/fontsproto \ - ${PREFIX}/include/GL/glxproto.h:${PORTSDIR}/x11/glproto \ - ${PREFIX}/include/X11/extensions/XIproto.h:${PORTSDIR}/x11/inputproto \ - ${PREFIX}/include/X11/extensions/XKB.h:${PORTSDIR}/x11/kbproto \ - ${PREFIX}/include/X11/extensions/Print.h:${PORTSDIR}/x11/printproto \ + ${PREFIX}/include/X11/extensions/panoramiXproto.h:${PORTSDIR}/x11/xineramaproto \ ${PREFIX}/include/X11/extensions/randr.h:${PORTSDIR}/x11/randrproto \ ${PREFIX}/include/X11/extensions/recordstr.h:${PORTSDIR}/x11/recordproto \ ${PREFIX}/include/X11/extensions/render.h:${PORTSDIR}/x11/renderproto \ - ${PREFIX}/include/X11/extensions/XResproto.h:${PORTSDIR}/x11/resourceproto \ ${PREFIX}/include/X11/extensions/saver.h:${PORTSDIR}/x11/scrnsaverproto \ - ${PREFIX}/include/X11/extensions/xtrapproto.h:${PORTSDIR}/x11/trapproto \ - ${PREFIX}/include/X11/extensions/Xv.h:${PORTSDIR}/x11/videoproto \ ${PREFIX}/include/X11/extensions/xcmiscstr.h:${PORTSDIR}/x11/xcmiscproto \ - ${PREFIX}/include/X11/extensions/MITMisc.h:${PORTSDIR}/x11/xextproto \ ${PREFIX}/include/X11/extensions/xf86bigfont.h:${PORTSDIR}/x11-fonts/xf86bigfontproto \ ${PREFIX}/include/X11/extensions/xf86dga.h:${PORTSDIR}/x11/xf86dgaproto \ - ${PREFIX}/include/GL/internal/dri_interface.h:${PORTSDIR}/x11/xf86driproto \ ${PREFIX}/include/X11/extensions/xf86misc.h:${PORTSDIR}/x11/xf86miscproto \ ${PREFIX}/include/X11/extensions/xf86rush.h:${PORTSDIR}/x11/xf86rushproto \ ${PREFIX}/include/X11/extensions/xf86vmode.h:${PORTSDIR}/x11/xf86vidmodeproto \ - ${PREFIX}/include/X11/extensions/panoramiXproto.h:${PORTSDIR}/x11/xineramaproto \ - ${PREFIX}/include/X11/DECkeysym.h:${PORTSDIR}/x11/xproto \ - ${PREFIX}/include/X11/PM/PM.h:${PORTSDIR}/x11/xproxymanagementprotocol -RUN_DEPENDS= ${BUILD_DEPENDS} + ${PREFIX}/include/X11/extensions/xfixesproto.h:${PORTSDIR}/x11/fixesproto \ + ${PREFIX}/include/X11/extensions/xtrapproto.h:${PORTSDIR}/x11/trapproto \ + ${PREFIX}/include/X11/fonts/FS.h:${PORTSDIR}/x11-fonts/fontsproto +RUN_DEPENDS:= ${BUILD_DEPENDS} NO_BUILD= yes diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile index bb63246..ed3e22c 100644 --- a/x11/xorg/Makefile +++ b/x11/xorg/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorg -PORTVERSION= 7.3 -PORTREVISION= 2 +PORTVERSION= 7.4 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none diff --git a/x11/xprop/Makefile b/x11/xprop/Makefile index 7112127..5b9f1cf 100644 --- a/x11/xprop/Makefile +++ b/x11/xprop/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xprop -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xprop/distinfo b/x11/xprop/distinfo index d134e15..4db994c 100644 --- a/x11/xprop/distinfo +++ b/x11/xprop/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xprop-1.0.3.tar.bz2) = e7b16eeb4bab974e3592d62f415aa6a5 -SHA256 (xorg/app/xprop-1.0.3.tar.bz2) = ddda23b888a3b4cf96a508af7ae07e3b2f1e9f2f2f0d5f6b2684cfa162337fa6 -SIZE (xorg/app/xprop-1.0.3.tar.bz2) = 106686 +MD5 (xorg/app/xprop-1.0.4.tar.bz2) = 48aa8fd78802f477dcbf9ef0dfd9f783 +SHA256 (xorg/app/xprop-1.0.4.tar.bz2) = daa47cba7d5a919ca1bd053d8a8b6af4904f77eded4bdb055cd915aa5f5cd772 +SIZE (xorg/app/xprop-1.0.4.tar.bz2) = 109102 diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile index 8f2a373..2293039 100644 --- a/x11/xproto/Makefile +++ b/x11/xproto/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xproto -PORTVERSION= 7.0.10 -PORTREVISION= 1 +PORTVERSION= 7.0.13 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo index 02bf99a..0d43236 100644 --- a/x11/xproto/distinfo +++ b/x11/xproto/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/proto/xproto-7.0.10.tar.bz2) = 2ed80e90992e7455eaac4c3e977ebd01 -SHA256 (xorg/proto/xproto-7.0.10.tar.bz2) = 6d659920262d41e48714184f94ff9cd2608515e0f3d2f074892fe0c048784df4 -SIZE (xorg/proto/xproto-7.0.10.tar.bz2) = 142954 +MD5 (xorg/proto/xproto-7.0.13.tar.bz2) = 7d26f45dca52632712a696e0631dc17b +SHA256 (xorg/proto/xproto-7.0.13.tar.bz2) = 6f6328922d69f5de29513a5baf1d010db2a7a54cb58a7a6cbbb1b25097ecd592 +SIZE (xorg/proto/xproto-7.0.13.tar.bz2) = 148633 diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile index 40f7d46..0abf67b 100644 --- a/x11/xrandr/Makefile +++ b/x11/xrandr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xrandr -PORTVERSION= 1.2.2 +PORTVERSION= 1.2.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xrandr/distinfo b/x11/xrandr/distinfo index bf733e1..2c2fd69 100644 --- a/x11/xrandr/distinfo +++ b/x11/xrandr/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xrandr-1.2.2.tar.bz2) = c6ec9dc42396e3b3a2da932f3feca6ec -SHA256 (xorg/app/xrandr-1.2.2.tar.bz2) = 632f3ff492a07f8279807ffbafe4f89af069bb0e7b4934b3ddf7379509aa9303 -SIZE (xorg/app/xrandr-1.2.2.tar.bz2) = 96462 +MD5 (xorg/app/xrandr-1.2.3.tar.bz2) = 41a9d0cc073fa6165a31fbf9e85f68a6 +SHA256 (xorg/app/xrandr-1.2.3.tar.bz2) = ab06b77f3a2b8866279e096f9d2702ac644681424eb0aec39e4eb7199f152207 +SIZE (xorg/app/xrandr-1.2.3.tar.bz2) = 111121 diff --git a/x11/xrdb/Makefile b/x11/xrdb/Makefile index c4fc873..62cafb2 100644 --- a/x11/xrdb/Makefile +++ b/x11/xrdb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xrdb -PORTVERSION= 1.0.4 +PORTVERSION= 1.0.5 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xrdb/distinfo b/x11/xrdb/distinfo index edc775d..a0467d1 100644 --- a/x11/xrdb/distinfo +++ b/x11/xrdb/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xrdb-1.0.4.tar.bz2) = 34eb2311a0c5279e7b4f492e826f63d1 -SHA256 (xorg/app/xrdb-1.0.4.tar.bz2) = 3f8cde77e8cbeb6d0a5f232b7a2ee51dd49b677916d52ab0986d320a5f9e8000 -SIZE (xorg/app/xrdb-1.0.4.tar.bz2) = 100792 +MD5 (xorg/app/xrdb-1.0.5.tar.bz2) = 9c30b8e1709d5367beb7706146640c07 +SHA256 (xorg/app/xrdb-1.0.5.tar.bz2) = c24d08939250f10238fd1b984707bfa0901ba9c55fa36b67d91eb12b500500aa +SIZE (xorg/app/xrdb-1.0.5.tar.bz2) = 101484 diff --git a/x11/xset/Makefile b/x11/xset/Makefile index d5e1dde..2c01249 100644 --- a/x11/xset/Makefile +++ b/x11/xset/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xset -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xset/distinfo b/x11/xset/distinfo index accb4a2..0202548 100644 --- a/x11/xset/distinfo +++ b/x11/xset/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xset-1.0.3.tar.bz2) = 657bbb43ce5470c33665d187c1740566 -SHA256 (xorg/app/xset-1.0.3.tar.bz2) = 0e3fd7d9902442df13c954316a194251e9b9acc197ae939d8b2fae66b8864d11 -SIZE (xorg/app/xset-1.0.3.tar.bz2) = 102742 +MD5 (xorg/app/xset-1.0.4.tar.bz2) = 2f41fd983ba4d89419204854936025e2 +SHA256 (xorg/app/xset-1.0.4.tar.bz2) = 6c3e74bb36beab92b918f0db12198d2526675276c724558a1de71d7789d0bdad +SIZE (xorg/app/xset-1.0.4.tar.bz2) = 103613 diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile index 1e18cc8..a91547c 100644 --- a/x11/xtrans/Makefile +++ b/x11/xtrans/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xtrans -PORTVERSION= 1.0.4 +PORTVERSION= 1.2.1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xtrans/distinfo b/x11/xtrans/distinfo index bc5bfd6..c6051f9 100644 --- a/x11/xtrans/distinfo +++ b/x11/xtrans/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/xtrans-1.0.4.tar.bz2) = 8b36cdf08df12be96615e3d550236626 -SHA256 (xorg/lib/xtrans-1.0.4.tar.bz2) = 765219fa822edeffb0650e93458e4ebf63c23176e58fce06806fb251fbfe7d8c -SIZE (xorg/lib/xtrans-1.0.4.tar.bz2) = 103761 +MD5 (xorg/lib/xtrans-1.2.1.tar.bz2) = 96e142331edd498a9364887b2548f1bb +SHA256 (xorg/lib/xtrans-1.2.1.tar.bz2) = 9ff21a8d9ea524ca9b7cb6d6b4d522b4cb20b1c35edeb8995a9e9265a0df64bd +SIZE (xorg/lib/xtrans-1.2.1.tar.bz2) = 107174 diff --git a/x11/xwd/Makefile b/x11/xwd/Makefile index 11fc6fa..dff12f2 100644 --- a/x11/xwd/Makefile +++ b/x11/xwd/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xwd -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xwd/distinfo b/x11/xwd/distinfo index 450cba2..0ba03d3 100644 --- a/x11/xwd/distinfo +++ b/x11/xwd/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xwd-1.0.1.tar.bz2) = 911addfb7fa402217ddac63e5c1d97c7 -SHA256 (xorg/app/xwd-1.0.1.tar.bz2) = c8bd9bcd64df439c2cd09eaa3e83a1297fbfed5c7d3dd8117342b3a25eeae131 -SIZE (xorg/app/xwd-1.0.1.tar.bz2) = 97079 +MD5 (xorg/app/xwd-1.0.2.tar.bz2) = 0a6ef08a2ac08ad5c4dd1522eb3788a3 +SHA256 (xorg/app/xwd-1.0.2.tar.bz2) = ab8974e010c1957a9a65a54656215463dea324adcaa9954147ecdcc6e9307f61 +SIZE (xorg/app/xwd-1.0.2.tar.bz2) = 111673 diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile index 8c70152..2198d06 100644 --- a/x11/xwininfo/Makefile +++ b/x11/xwininfo/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xwininfo -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xwininfo/distinfo b/x11/xwininfo/distinfo index e419fc4..ddf5cfd 100644 --- a/x11/xwininfo/distinfo +++ b/x11/xwininfo/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xwininfo-1.0.3.tar.bz2) = 721f84332c98c33152460bb22ba9ded6 -SHA256 (xorg/app/xwininfo-1.0.3.tar.bz2) = fbe3a1aafbc6fa113e58971ff2a82605a7e106af8b810eea4b7512de58a5478a -SIZE (xorg/app/xwininfo-1.0.3.tar.bz2) = 98632 +MD5 (xorg/app/xwininfo-1.0.4.tar.bz2) = e2a9bf5ab7f2a0866700a3b49dd8c6bf +SHA256 (xorg/app/xwininfo-1.0.4.tar.bz2) = df9a52788632cd3338e7bd7107ac732b11b8e2c367d4600578cd77e350428ee4 +SIZE (xorg/app/xwininfo-1.0.4.tar.bz2) = 101541