diff options
210 files changed, 699 insertions, 913 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index ef168d49f82e..ab08c18fe18b 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1940,6 +1940,12 @@ BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison .include "${PORTSDIR}/Mk/bsd.local.mk" .endif +.if defined(USE_XORG) || defined(XORG_CAT) +. if ${X_WINDOW_SYSTEM} == "xorg" +.include "${PORTSDIR}/Mk/bsd.xorg.mk" +. endif +.endif + .if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \ defined(USE_PGSQL) || defined(WANT_PGSQL_VER) || \ defined(USE_BDB) || defined(USE_SQLITE) || defined(USE_FIREBIRD) diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk index eda8cb0c063d..dce9a5785050 100644 --- a/Mk/bsd.xorg.mk +++ b/Mk/bsd.xorg.mk @@ -149,7 +149,7 @@ USE_GNOME+= pkgconfig # Register all xorg .pc files here. # foo_LIB_PC_DEPENDS means it should go to BUILD_DEPENDS *and* RUN_DEPENDS. -XORG_MODULES= bigreqsproto compositeproto damageproto dmx dmxproto evieproto fixesproto fontcacheproto fontenc fontsproto fontutil glproto ice inputproto kbproto libfs oldx printproto randrproto recordproto renderproto resourceproto scrnsaverproto sm trapproto videoproto x11 xau xaw xaw6 xaw7 xaw8 xbitmaps xcmiscproto xcomposite xcursor xdamage xdmcp xevie xext xextproto xf86bigfontproto xf86dgaproto xf86driproto xf86miscproto xf86rushproto xf86vidmodeproto xfixes xfont xfontcache xft xi xinerama xineramaproto xkbfile xkbui xmu xmuu xorg-server xp xpm xprintapputil xprintutil xproto xproxymngproto xrandr xrender xres xscrnsaver xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm +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 bigreqsproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/bigreqsproto.pc:${PORTSDIR}/x11/bigreqsproto compositeproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/compositeproto.pc:${PORTSDIR}/x11/compositeproto @@ -168,6 +168,7 @@ inputproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/inputproto.pc:${PORTSDIR} kbproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/kbproto.pc:${PORTSDIR}/x11/kbproto libfs_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS oldx_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX +pixman_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman printproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto randrproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/randrproto.pc:${PORTSDIR}/x11/randrproto recordproto_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/recordproto.pc:${PORTSDIR}/x11/recordproto @@ -6,6 +6,16 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20070913: + AFFECTS: users of x11/xorg + AUTHOR: flz@FreeBSD.org + + X.org ports were updated to 7.3. Since we're now using the modular + build, the upgrade is pretty much painless. If you're using the + x11/xorg meta-port, upgrade should be as easy as: + + # portupgrade -R xorg + 20070905: AFFECTS: testers of net/openldap24-server AUTHOR: delphij@FreeBSD.org diff --git a/x11-clocks/xclock/Makefile b/x11-clocks/xclock/Makefile index 23bfdc02bb29..e7861d5d94bd 100644 --- a/x11-clocks/xclock/Makefile +++ b/x11-clocks/xclock/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xclock -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11-clocks/xclock/distinfo b/x11-clocks/xclock/distinfo index e30567695300..b5888a5b09bb 100644 --- a/x11-clocks/xclock/distinfo +++ b/x11-clocks/xclock/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xclock-1.0.2.tar.bz2) = 6b930326f71993fb54b7203902b387cd -SHA256 (xorg/app/xclock-1.0.2.tar.bz2) = ced648762382eab09e0ccb87371cb745646ede08ffcb068faa6025d20c4d1f3d -SIZE (xorg/app/xclock-1.0.2.tar.bz2) = 104335 +MD5 (xorg/app/xclock-1.0.3.tar.bz2) = 2b1a3d030d87e62a591db8ee4c0072e6 +SHA256 (xorg/app/xclock-1.0.3.tar.bz2) = 10b5777ae9ef2a10d4cf447bd1bf13372d7061573835c2c87d5c948b65e9577f +SIZE (xorg/app/xclock-1.0.3.tar.bz2) = 113967 diff --git a/x11-drivers/synaptics/Makefile b/x11-drivers/synaptics/Makefile index 7a39ce27f533..857b3ed766a6 100644 --- a/x11-drivers/synaptics/Makefile +++ b/x11-drivers/synaptics/Makefile @@ -7,7 +7,7 @@ PORTNAME= synaptics PORTVERSION= 0.14.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-servers MASTER_SITES= http://web.telia.com/~u89404340/touchpad/files/:synaptics DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:synaptics \ @@ -36,9 +36,10 @@ MASTER_SITES+= ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/:x11 \ DIST_SUBDIR= xorg/xserver X_DISTFILES= xorg-server-${X11VERSION}.tar.bz2 PLIST_SUB+= XORG="" XFREE86="@comment " +EXTRA_PATCHES= ${FILESDIR}/extra-xorg-server-1.4 post-patch: - @${REINPLACE_CMD} 's|\(ALLINCLUDES = -I.\)|\1 -I${X11BASE}/include|' \ + @${REINPLACE_CMD} 's|\(ALLINCLUDES = -I.\)|\1 -I${LOCALBASE}/include -I${LOCALBASE}/include/pixman-1|' \ ${WRKSRC}/Makefile .elif ${X_WINDOW_SYSTEM:L} == xfree86-4 diff --git a/x11-drivers/synaptics/distinfo b/x11-drivers/synaptics/distinfo index a4b8415f3a1e..2028c8c16605 100644 --- a/x11-drivers/synaptics/distinfo +++ b/x11-drivers/synaptics/distinfo @@ -1,9 +1,9 @@ MD5 (xorg/xserver/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af SHA256 (xorg/xserver/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429 SIZE (xorg/xserver/synaptics-0.14.6.tar.bz2) = 126833 -MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6 -SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85 -SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596 +MD5 (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 (xc/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af SHA256 (xc/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429 SIZE (xc/synaptics-0.14.6.tar.bz2) = 126833 diff --git a/x11-drivers/synaptics/files/extra-xorg-server-1.4 b/x11-drivers/synaptics/files/extra-xorg-server-1.4 new file mode 100644 index 000000000000..d6f2ab11f0a7 --- /dev/null +++ b/x11-drivers/synaptics/files/extra-xorg-server-1.4 @@ -0,0 +1,63 @@ +diff -u Makefile.orig Makefile +--- Makefile.orig 2006-07-15 17:58:26.000000000 +0200 ++++ Makefile 2007-09-07 15:03:17.386179198 +0200 +@@ -34,10 +34,9 @@ + LDCOMBINEFLAGS = -shared -lc + PICFLAG = $(call check_gcc,-fPIC,) + X_INCLUDES_ROOT = $(INSTALLED_X) +- SDKDIR = $(shell pkg-config xorg-server --variable=sdkdir) + ALLINCLUDES = -I. -I$(INSTALLED_X)/include/X11 \ + -I$(INSTALLED_X)/include/X11/extensions \ +- -I$(SDKDIR) ++ `pkg-config xorg-server --cflags` + else + INSTALLED_X = /usr/X11R6 + INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input +diff -u synaptics.c.orig synaptics.c +--- synaptics.c.orig 2006-07-15 17:54:29.000000000 +0200 ++++ synaptics.c 2007-09-07 15:10:24.910542275 +0200 +@@ -321,7 +321,9 @@ + local->private_flags = 0; + local->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS; + local->conf_idev = dev; ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 + local->motion_history_proc = xf86GetMotionEvents; ++#endif + local->history_size = 0; + local->always_core_feedback = 0; + +@@ -613,8 +615,17 @@ + + InitPointerDeviceStruct((DevicePtr)dev, map, + SYN_MAX_BUTTONS, +- miPointerGetMotionEvents, SynapticsCtrl, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 ++ miPointerGetMotionEvents, ++#else ++ GetMotionHistory, ++#endif ++ SynapticsCtrl, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 + miPointerGetMotionBufferSize()); ++#else ++ GetMotionHistorySize(), 2); ++#endif + + /* X valuator */ + xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1); +diff -u synaptics.h.orig synaptics.h +--- synaptics.h.orig 2006-07-15 17:54:29.000000000 +0200 ++++ synaptics.h 2007-09-07 15:10:12.409829887 +0200 +@@ -226,5 +226,11 @@ + + #endif /* SYNAPTICS_PRIVATE */ + ++/* Previously found in xf86Xinput.h */ ++#ifdef DBG ++#undef DBG ++#endif ++ ++#define DBG(lvl, f) {if ((lvl) <= xf86GetVerbosity()) f;} + + #endif /* _SYNAPTICS_H_ */ + diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile index 42a7b7a477a8..3cb2bb126f2f 100644 --- a/x11-drivers/xf86-input-acecad/Makefile +++ b/x11-drivers/xf86-input-acecad/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-input-acecad -PORTVERSION= 1.1.0 +PORTVERSION= 1.2.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-acecad/distinfo b/x11-drivers/xf86-input-acecad/distinfo index 16af938dad3d..b76810fe5bcd 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.1.0.tar.bz2) = ce0b7bec500273ad935cbfa212b8ac8a -SHA256 (xorg/driver/xf86-input-acecad-1.1.0.tar.bz2) = 3e5feea79f1d48cd46a2a40661140042ac586f90311669f79d65fea6cfc112ad -SIZE (xorg/driver/xf86-input-acecad-1.1.0.tar.bz2) = 230176 +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 diff --git a/x11-drivers/xf86-input-calcomp/Makefile b/x11-drivers/xf86-input-calcomp/Makefile index d9a335967cf0..99fca604b2a6 100644 --- a/x11-drivers/xf86-input-calcomp/Makefile +++ b/x11-drivers/xf86-input-calcomp/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-input-calcomp -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-calcomp/distinfo b/x11-drivers/xf86-input-calcomp/distinfo index 3c739f96fbd2..c41442399067 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.0.tar.bz2) = af13f9de2af4e1d03b2da0c037fd718a -SHA256 (xorg/driver/xf86-input-calcomp-1.1.0.tar.bz2) = ebc446e74eea72d391104b1ce3b2a5376bced098154ec089a944f4311d240904 -SIZE (xorg/driver/xf86-input-calcomp-1.1.0.tar.bz2) = 231496 +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 diff --git a/x11-drivers/xf86-input-citron/Makefile b/x11-drivers/xf86-input-citron/Makefile index 4c21d32b3b16..7fc6e506750e 100644 --- a/x11-drivers/xf86-input-citron/Makefile +++ b/x11-drivers/xf86-input-citron/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-input-citron -PORTVERSION= 2.2.0 +PORTVERSION= 2.2.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-citron/distinfo b/x11-drivers/xf86-input-citron/distinfo index 067361f9aa45..38eef6049d01 100644 --- a/x11-drivers/xf86-input-citron/distinfo +++ b/x11-drivers/xf86-input-citron/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-citron-2.2.0.tar.bz2) = 1fe53cd055a69650f3c2e02377ec728c -SHA256 (xorg/driver/xf86-input-citron-2.2.0.tar.bz2) = 26cfa755d3a383f80039fcd286c44ba5f7b353feb8c674f386bb08d741d2c3fe -SIZE (xorg/driver/xf86-input-citron-2.2.0.tar.bz2) = 257145 +MD5 (xorg/driver/xf86-input-citron-2.2.1.tar.bz2) = 4e254fcefb3bea55772e63c12570f6d9 +SHA256 (xorg/driver/xf86-input-citron-2.2.1.tar.bz2) = 1480ba63b342c00a53292d513bd79a69e1ea7c01a0c77d1a368ffb22e37c1a83 +SIZE (xorg/driver/xf86-input-citron-2.2.1.tar.bz2) = 251964 diff --git a/x11-drivers/xf86-input-dmc/Makefile b/x11-drivers/xf86-input-dmc/Makefile index 6b7d69b88eb2..3f1c9bc407d0 100644 --- a/x11-drivers/xf86-input-dmc/Makefile +++ b/x11-drivers/xf86-input-dmc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-input-dmc -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-dmc/distinfo b/x11-drivers/xf86-input-dmc/distinfo index 5b548b06c199..cc33e98bfbf4 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.0.tar.bz2) = e1bcbdefcb839173de79aeb3cd038b77 -SHA256 (xorg/driver/xf86-input-dmc-1.1.0.tar.bz2) = c5ca8fb2dfe0130767b2c10bd0661277a67e7d5b9171a7f5f6264ec48790473f -SIZE (xorg/driver/xf86-input-dmc-1.1.0.tar.bz2) = 228592 +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 diff --git a/x11-drivers/xf86-input-dynapro/Makefile b/x11-drivers/xf86-input-dynapro/Makefile index 9772be78c52e..37207e61d2f5 100644 --- a/x11-drivers/xf86-input-dynapro/Makefile +++ b/x11-drivers/xf86-input-dynapro/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-input-dynapro -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-dynapro/distinfo b/x11-drivers/xf86-input-dynapro/distinfo index 12e972f2610d..4bf7cc30a455 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.0.tar.bz2) = 1683178d09dfc604dde9ea2aab950a28 -SHA256 (xorg/driver/xf86-input-dynapro-1.1.0.tar.bz2) = fc2ad50b1aa027fe57da53cbb73db0b4b9d0de9032f00dd42e7cc0aae7c50d6a -SIZE (xorg/driver/xf86-input-dynapro-1.1.0.tar.bz2) = 227960 +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 diff --git a/x11-drivers/xf86-input-elo2300/Makefile b/x11-drivers/xf86-input-elo2300/Makefile index 5ddc621a95e2..3e52a481cefc 100644 --- a/x11-drivers/xf86-input-elo2300/Makefile +++ b/x11-drivers/xf86-input-elo2300/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-input-elo2300 -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-elo2300/distinfo b/x11-drivers/xf86-input-elo2300/distinfo index 485614280ed6..3dc0e127131c 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.0.tar.bz2) = 43885769d6f741272dda162e82902b0d -SHA256 (xorg/driver/xf86-input-elo2300-1.1.0.tar.bz2) = 9551f67e24c4573867a64d032d1ff6b63654caab8a85d3c6b2af7748daaa2134 -SIZE (xorg/driver/xf86-input-elo2300-1.1.0.tar.bz2) = 230654 +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 diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile index bb746ad58726..dabed65caa53 100644 --- a/x11-drivers/xf86-input-joystick/Makefile +++ b/x11-drivers/xf86-input-joystick/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-input-joystick -PORTVERSION= 1.1.0 +PORTVERSION= 1.2.3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -14,4 +14,6 @@ COMMENT= X.Org joystick input driver XORG_CAT= driver +MAN4= joystick.4x + .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-joystick/distinfo b/x11-drivers/xf86-input-joystick/distinfo index c4b7d151af72..b15366ed7b32 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.1.0.tar.bz2) = e0025215542c7a11c5a7f9548631dbd7 -SHA256 (xorg/driver/xf86-input-joystick-1.1.0.tar.bz2) = 11c3e8056e8f44b9a6f348b5366c7e725155563374770b82e339e913b9a60d16 -SIZE (xorg/driver/xf86-input-joystick-1.1.0.tar.bz2) = 228374 +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 diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile index 7c2f223e4759..c4f014b0c3be 100644 --- a/x11-drivers/xf86-input-keyboard/Makefile +++ b/x11-drivers/xf86-input-keyboard/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-input-keyboard -PORTVERSION= 1.1.1 +PORTVERSION= 1.2.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -14,6 +14,6 @@ COMMENT= X.Org keyboard input driver XORG_CAT= driver USE_XORG= kbproto -MAN4= kbd.4x keyboard.4x +MAN4= kbd.4x .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo index 87ec2cfc238b..616768134029 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.1.1.tar.bz2) = babf094e37bdfc08076d4adb4c69c1d9 -SHA256 (xorg/driver/xf86-input-keyboard-1.1.1.tar.bz2) = b7e7377d75f3a10cceb5df18019b8e4498fbed0100478edd4af75bf8cd45d6fd -SIZE (xorg/driver/xf86-input-keyboard-1.1.1.tar.bz2) = 235022 +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 diff --git a/x11-drivers/xf86-input-keyboard/pkg-plist b/x11-drivers/xf86-input-keyboard/pkg-plist index 32d077162789..7e9f47e9ffe1 100644 --- a/x11-drivers/xf86-input-keyboard/pkg-plist +++ b/x11-drivers/xf86-input-keyboard/pkg-plist @@ -1,7 +1,5 @@ lib/xorg/modules/input/kbd_drv.la lib/xorg/modules/input/kbd_drv.so -lib/xorg/modules/input/keyboard_drv.la -lib/xorg/modules/input/keyboard_drv.so @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg diff --git a/x11-drivers/xf86-input-magellan/Makefile b/x11-drivers/xf86-input-magellan/Makefile index bf936bae3d7e..36a4f2fa548e 100644 --- a/x11-drivers/xf86-input-magellan/Makefile +++ b/x11-drivers/xf86-input-magellan/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-input-magellan -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-magellan/distinfo b/x11-drivers/xf86-input-magellan/distinfo index 59784431ba6c..736cfcd6f7f1 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.0.tar.bz2) = 0d6a81aa864ac790d9a8b517ca7016ad -SHA256 (xorg/driver/xf86-input-magellan-1.1.0.tar.bz2) = 8eef54b50c428513a330ed7183ce37f269050252a4d1199d3b00ad6bf0a7833d -SIZE (xorg/driver/xf86-input-magellan-1.1.0.tar.bz2) = 228401 +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 diff --git a/x11-drivers/xf86-input-microtouch/Makefile b/x11-drivers/xf86-input-microtouch/Makefile index 137c05d886f5..81cb2ff0aeee 100644 --- a/x11-drivers/xf86-input-microtouch/Makefile +++ b/x11-drivers/xf86-input-microtouch/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-input-microtouch -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-microtouch/distinfo b/x11-drivers/xf86-input-microtouch/distinfo index dce1b3e71abc..149e9286096d 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.0.tar.bz2) = 7b3cc0330d70e7e4e07914fcb325b331 -SHA256 (xorg/driver/xf86-input-microtouch-1.1.0.tar.bz2) = 7f92f5531495ecfbfd00744198fd4b2aa3b8f5c188b115e55e865e961bca2039 -SIZE (xorg/driver/xf86-input-microtouch-1.1.0.tar.bz2) = 231483 +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 diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile index df7cf282513f..5550791b4bd3 100644 --- a/x11-drivers/xf86-input-mouse/Makefile +++ b/x11-drivers/xf86-input-mouse/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-input-mouse -PORTVERSION= 1.1.2 +PORTVERSION= 1.2.2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-mouse/distinfo b/x11-drivers/xf86-input-mouse/distinfo index eebc5df3524b..eb8def43ba43 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.1.2.tar.bz2) = d8bcd9fb1b4efb02acd251495f9a30c1 -SHA256 (xorg/driver/xf86-input-mouse-1.1.2.tar.bz2) = 7d4c2ecbe8f9327f7c8093c05401ab68b22f3343bcf04e4838cc40c21b7f8e0a -SIZE (xorg/driver/xf86-input-mouse-1.1.2.tar.bz2) = 279229 +MD5 (xorg/driver/xf86-input-mouse-1.2.2.tar.bz2) = c47c598e55e7080b8ea30f70781f7ca3 +SHA256 (xorg/driver/xf86-input-mouse-1.2.2.tar.bz2) = 80e9cb52b2036b71289b2140bcd3ac202cf46fd42830761c53120ddac38e7edf +SIZE (xorg/driver/xf86-input-mouse-1.2.2.tar.bz2) = 274401 diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile index 26d6e860f58b..01740eca6ee1 100644 --- a/x11-drivers/xf86-input-penmount/Makefile +++ b/x11-drivers/xf86-input-penmount/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-input-penmount -PORTVERSION= 1.2.0 +PORTVERSION= 1.2.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-penmount/distinfo b/x11-drivers/xf86-input-penmount/distinfo index d099b3757f0a..af64b1649286 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.0.tar.bz2) = 0589f2eaa84afb9bd49b226ce7dacdda -SHA256 (xorg/driver/xf86-input-penmount-1.2.0.tar.bz2) = dea18a07cf8f59e7bc981cfa1f6ef476dd14f7d9bee3bb1a55a6cc49f766150e -SIZE (xorg/driver/xf86-input-penmount-1.2.0.tar.bz2) = 210083 +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 diff --git a/x11-drivers/xf86-input-spaceorb/Makefile b/x11-drivers/xf86-input-spaceorb/Makefile index 81bbdab1b33a..59174fc7c606 100644 --- a/x11-drivers/xf86-input-spaceorb/Makefile +++ b/x11-drivers/xf86-input-spaceorb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-input-spaceorb -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-spaceorb/distinfo b/x11-drivers/xf86-input-spaceorb/distinfo index 1fb4db5f22f1..537d703d42b4 100644 --- a/x11-drivers/xf86-input-spaceorb/distinfo +++ b/x11-drivers/xf86-input-spaceorb/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-spaceorb-1.1.0.tar.bz2) = 294810ca9e93c4096458c6a0f2fb5679 -SHA256 (xorg/driver/xf86-input-spaceorb-1.1.0.tar.bz2) = 9cd53cb719bf401ff3f72233d3a88c59539b94eaf11e586e307c807a325f0815 -SIZE (xorg/driver/xf86-input-spaceorb-1.1.0.tar.bz2) = 227457 +MD5 (xorg/driver/xf86-input-spaceorb-1.1.1.tar.bz2) = c7fb96281874733480ba86a5a0a3b5af +SHA256 (xorg/driver/xf86-input-spaceorb-1.1.1.tar.bz2) = be8f052e7132d39094f42a08c0b7171a9e280e9fa1b162a62343d1dc0d2449cf +SIZE (xorg/driver/xf86-input-spaceorb-1.1.1.tar.bz2) = 222050 diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile index d2253dcc174a..82757c57365b 100644 --- a/x11-drivers/xf86-input-void/Makefile +++ b/x11-drivers/xf86-input-void/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-input-void -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-void/distinfo b/x11-drivers/xf86-input-void/distinfo index 01b44a382693..14642cefafa6 100644 --- a/x11-drivers/xf86-input-void/distinfo +++ b/x11-drivers/xf86-input-void/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-input-void-1.1.0.tar.bz2) = ea72a92d43b95f413347df96d6a73933 -SHA256 (xorg/driver/xf86-input-void-1.1.0.tar.bz2) = b43c5d920821bd06b6a1a131dd071ab838bf024c3cb092c6d1f10d57b648b0e4 -SIZE (xorg/driver/xf86-input-void-1.1.0.tar.bz2) = 226456 +MD5 (xorg/driver/xf86-input-void-1.1.1.tar.bz2) = 862c230f5f6e0c545f232b4c0fa9537a +SHA256 (xorg/driver/xf86-input-void-1.1.1.tar.bz2) = dde062d6267a3fd9d51b0daee88fd84fceea52a6019de51dece46e92012dbc4f +SIZE (xorg/driver/xf86-input-void-1.1.1.tar.bz2) = 219328 diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile index a529247c3365..b770360be9b9 100644 --- a/x11-drivers/xf86-video-ati/Makefile +++ b/x11-drivers/xf86-video-ati/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-ati -PORTVERSION= 6.6.3 -PORTREVISION= 2 +PORTVERSION= 6.7.192 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo index b618867a33c5..cb9e6bf6773e 100644 --- a/x11-drivers/xf86-video-ati/distinfo +++ b/x11-drivers/xf86-video-ati/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-ati-6.6.3.tar.bz2) = f6d559f9d20f61567d381916b376590f -SHA256 (xorg/driver/xf86-video-ati-6.6.3.tar.bz2) = d08a429e1fb1620ae81839181a4dc6cd579d52fc440d44d7bba36d19be355780 -SIZE (xorg/driver/xf86-video-ati-6.6.3.tar.bz2) = 723083 +MD5 (xorg/driver/xf86-video-ati-6.7.192.tar.bz2) = b3207c1df5f6f8cf344efe4842bb2db7 +SHA256 (xorg/driver/xf86-video-ati-6.7.192.tar.bz2) = ea282de08e20a04df49e76970ec9944d95f5e8f1a40abe31e30eca11a7aa8263 +SIZE (xorg/driver/xf86-video-ati-6.7.192.tar.bz2) = 730601 diff --git a/x11-drivers/xf86-video-ati613/Makefile b/x11-drivers/xf86-video-ati613/Makefile index a529247c3365..b770360be9b9 100644 --- a/x11-drivers/xf86-video-ati613/Makefile +++ b/x11-drivers/xf86-video-ati613/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-ati -PORTVERSION= 6.6.3 -PORTREVISION= 2 +PORTVERSION= 6.7.192 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-ati613/distinfo b/x11-drivers/xf86-video-ati613/distinfo index b618867a33c5..cb9e6bf6773e 100644 --- a/x11-drivers/xf86-video-ati613/distinfo +++ b/x11-drivers/xf86-video-ati613/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-ati-6.6.3.tar.bz2) = f6d559f9d20f61567d381916b376590f -SHA256 (xorg/driver/xf86-video-ati-6.6.3.tar.bz2) = d08a429e1fb1620ae81839181a4dc6cd579d52fc440d44d7bba36d19be355780 -SIZE (xorg/driver/xf86-video-ati-6.6.3.tar.bz2) = 723083 +MD5 (xorg/driver/xf86-video-ati-6.7.192.tar.bz2) = b3207c1df5f6f8cf344efe4842bb2db7 +SHA256 (xorg/driver/xf86-video-ati-6.7.192.tar.bz2) = ea282de08e20a04df49e76970ec9944d95f5e8f1a40abe31e30eca11a7aa8263 +SIZE (xorg/driver/xf86-video-ati-6.7.192.tar.bz2) = 730601 diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile index d4e60adc2b8f..66ce8d1d528a 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.1.0 +PORTVERSION= 2.1.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 b102e21621cd..f8459338fd93 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.1.0.tar.bz2) = a564a1fbb7ed9fcbcf81e15aedc92578 -SHA256 (xorg/driver/xf86-video-intel-2.1.0.tar.bz2) = a407c355c9d333853e1a7afb9eb380595b407860c5873ef0418e726107c99fcb -SIZE (xorg/driver/xf86-video-intel-2.1.0.tar.bz2) = 544558 +MD5 (xorg/driver/xf86-video-intel-2.1.1.tar.bz2) = a645aa1a8e1e6031e1f817d2cda9db1d +SHA256 (xorg/driver/xf86-video-intel-2.1.1.tar.bz2) = 4f7215b2cc9ab4b35be56fd26fb858d64665ffd241c59a2c2c81eb39f0d5c51c +SIZE (xorg/driver/xf86-video-intel-2.1.1.tar.bz2) = 584729 diff --git a/x11-drivers/xf86-video-intel29/Makefile b/x11-drivers/xf86-video-intel29/Makefile index d4e60adc2b8f..66ce8d1d528a 100644 --- a/x11-drivers/xf86-video-intel29/Makefile +++ b/x11-drivers/xf86-video-intel29/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-video-intel -PORTVERSION= 2.1.0 +PORTVERSION= 2.1.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-intel29/distinfo b/x11-drivers/xf86-video-intel29/distinfo index b102e21621cd..f8459338fd93 100644 --- a/x11-drivers/xf86-video-intel29/distinfo +++ b/x11-drivers/xf86-video-intel29/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-intel-2.1.0.tar.bz2) = a564a1fbb7ed9fcbcf81e15aedc92578 -SHA256 (xorg/driver/xf86-video-intel-2.1.0.tar.bz2) = a407c355c9d333853e1a7afb9eb380595b407860c5873ef0418e726107c99fcb -SIZE (xorg/driver/xf86-video-intel-2.1.0.tar.bz2) = 544558 +MD5 (xorg/driver/xf86-video-intel-2.1.1.tar.bz2) = a645aa1a8e1e6031e1f817d2cda9db1d +SHA256 (xorg/driver/xf86-video-intel-2.1.1.tar.bz2) = 4f7215b2cc9ab4b35be56fd26fb858d64665ffd241c59a2c2c81eb39f0d5c51c +SIZE (xorg/driver/xf86-video-intel-2.1.1.tar.bz2) = 584729 diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile index e4ec426b464e..15079f535661 100644 --- a/x11-drivers/xf86-video-mga/Makefile +++ b/x11-drivers/xf86-video-mga/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xf86-video-mga -PORTVERSION= 1.4.6.1 -PORTREVISION= 1 +PORTVERSION= 1.4.7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-mga/distinfo b/x11-drivers/xf86-video-mga/distinfo index 84a79c17200e..76b33640feaa 100644 --- a/x11-drivers/xf86-video-mga/distinfo +++ b/x11-drivers/xf86-video-mga/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-mga-1.4.6.1.tar.bz2) = a678b429a35648f96d3ebf328300de46 -SHA256 (xorg/driver/xf86-video-mga-1.4.6.1.tar.bz2) = a7ace8c088cc214122c5f9d85f5566b0790207c8f15b960a4fc673d1bdaffdfc -SIZE (xorg/driver/xf86-video-mga-1.4.6.1.tar.bz2) = 376624 +MD5 (xorg/driver/xf86-video-mga-1.4.7.tar.bz2) = a7f0857a1d7fa0f615bd18515775d2af +SHA256 (xorg/driver/xf86-video-mga-1.4.7.tar.bz2) = a1c3a91f3d5f17ffc21fdb5ed3c1bcc953ab6602fbfaae2954ae7bd5e9ee5952 +SIZE (xorg/driver/xf86-video-mga-1.4.7.tar.bz2) = 389212 diff --git a/x11-drivers/xf86-video-nsc/Makefile b/x11-drivers/xf86-video-nsc/Makefile index 43a40a233d6c..8e8664831d72 100644 --- a/x11-drivers/xf86-video-nsc/Makefile +++ b/x11-drivers/xf86-video-nsc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-video-nsc -PORTVERSION= 2.8.2 +PORTVERSION= 2.8.3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-nsc/distinfo b/x11-drivers/xf86-video-nsc/distinfo index ca2fd1878d41..6b5601152db8 100644 --- a/x11-drivers/xf86-video-nsc/distinfo +++ b/x11-drivers/xf86-video-nsc/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/driver/xf86-video-nsc-2.8.2.tar.bz2) = 1fbdd5e9b5508b032c0102f72d1e555c -SHA256 (xorg/driver/xf86-video-nsc-2.8.2.tar.bz2) = 060493a9dcad81e8912381d2a8d14a3e32a34414296a089756868f3442103c8c -SIZE (xorg/driver/xf86-video-nsc-2.8.2.tar.bz2) = 479445 +MD5 (xorg/driver/xf86-video-nsc-2.8.3.tar.bz2) = f3ffacdc9f19e00b66bdff71b6df9b4e +SHA256 (xorg/driver/xf86-video-nsc-2.8.3.tar.bz2) = e5c5a2021877b8975bee39c06096316324e04f1eac5261bc882b96353a8b1839 +SIZE (xorg/driver/xf86-video-nsc-2.8.3.tar.bz2) = 465597 diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile index 5c74c2e52a83..68e37d905899 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.2 -PORTREVISION= 2 +PORTVERSION= 2.1.3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-savage/distinfo b/x11-drivers/xf86-video-savage/distinfo index 6d16a63d6167..39e16869811c 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.2.tar.bz2) = 6367e921a98f6a7fec9d0a9bc5ff0a47 -SHA256 (xorg/driver/xf86-video-savage-2.1.2.tar.bz2) = 1a9aa442152c139e3c54bc6c323bd13edf0bfff70a81c03969bcb1159317edb2 -SIZE (xorg/driver/xf86-video-savage-2.1.2.tar.bz2) = 303497 +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 diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile index cda2eb02c3ab..bc33772fcbf7 100644 --- a/x11-drivers/xf86-video-siliconmotion/Makefile +++ b/x11-drivers/xf86-video-siliconmotion/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-video-siliconmotion -PORTVERSION= 1.4.2 +PORTVERSION= 1.5.1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-siliconmotion/distinfo b/x11-drivers/xf86-video-siliconmotion/distinfo index 2a735f8620d3..a8822e45239b 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.4.2.tar.bz2) = 31fa07bfc6f06e07216bf34a35091af0 -SHA256 (xorg/driver/xf86-video-siliconmotion-1.4.2.tar.bz2) = a47a60920c454342a212260b5ec74c93f7889a6df4942bd2d6c0c0672aa25fdd -SIZE (xorg/driver/xf86-video-siliconmotion-1.4.2.tar.bz2) = 279048 +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 diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile index ca50e650a30c..fb40cbb219de 100644 --- a/x11-drivers/xf86-video-vmware/Makefile +++ b/x11-drivers/xf86-video-vmware/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86-video-vmware -PORTVERSION= 10.14.1 +PORTVERSION= 10.15.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-vmware/distinfo b/x11-drivers/xf86-video-vmware/distinfo index 68bb42406ba3..e73e8b9511c9 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.14.1.tar.bz2) = eaf1ce9fa23363799140602afaa10f37 -SHA256 (xorg/driver/xf86-video-vmware-10.14.1.tar.bz2) = 1971fd356ba54204c3611edb9144c43c25c21167a5fa5ee725d3f2e3f9864fa9 -SIZE (xorg/driver/xf86-video-vmware-10.14.1.tar.bz2) = 265946 +MD5 (xorg/driver/xf86-video-vmware-10.15.0.tar.bz2) = 9ad83ec872917a9c35bf3254ef455399 +SHA256 (xorg/driver/xf86-video-vmware-10.15.0.tar.bz2) = b5a3a7f9e5d7aef3ad294c1a10271cef3d0fe0ff90fba1dc0afbf95009e45d51 +SIZE (xorg/driver/xf86-video-vmware-10.15.0.tar.bz2) = 261255 diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile index 17418fe27406..6b6478b9f0d8 100644 --- a/x11-drivers/xorg-drivers/Makefile +++ b/x11-drivers/xorg-drivers/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorg-drivers -PORTVERSION= 7.2 -PORTREVISION= 2 +PORTVERSION= 7.3 CATEGORIES= x11-drivers MASTER_SITES= # none DISTFILES= # none @@ -29,8 +28,8 @@ VIDEO_ON= ati \ i810 \ nv \ vesa vga via -VIDEO_OFF= apm ark \ - chips cirrus cyrix \ +VIDEO_OFF= apm ark \ + chips cirrus cyrix \ dummy \ fbdev \ glint \ @@ -61,7 +60,17 @@ INPUT_OFF= acecad \ palmax penmount \ spaceorb summa \ tek4957 \ - void + vmmouse void + +QUIRKS= keyboard:kbd jamstudio:js_x + +.if defined(XORG_COMPLETE) +. for type in input video +${type:U}_ON:= ${${type:U}_ON} ${${type:U}_OFF} +${type:U}_OFF= # nil +. endfor +.endif + .for default in on off . for type in input video @@ -81,8 +90,12 @@ IGNORE= You can't choose both i810 and intel drivers as they are conflicting . for type in input video . for i in ${${type:U}_${default:U}} DEFAULT=${default} -. if (${DEFAULT} == "on" && !defined(WITHOUT_${i:U})) || (${DEFAULT} == "off" && defined(WITH_${i:U})) -RUN_DEPENDS+= ${${type:U}DIR}/${i:C/jamstudio/js_x/}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-${i} +. if (${DEFAULT} == "on" && !defined(WITHOUT_${i:U})) || (${DEFAULT} == "off" && defined(WITH_${i:U})) +. if ${QUIRKS:M${i}\:*:C/.*://} != "" +RUN_DEPENDS+= ${${type:U}DIR}/${QUIRKS:M${i}\:*:C/.*://}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-${i} +. else +RUN_DEPENDS+= ${${type:U}DIR}/${i}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-${i} +. endif . endif . endfor . endfor diff --git a/x11-fonts/XFree86-4-font100dpi/Makefile b/x11-fonts/XFree86-4-font100dpi/Makefile index 6e3f9089a526..a0da8d3a53cc 100644 --- a/x11-fonts/XFree86-4-font100dpi/Makefile +++ b/x11-fonts/XFree86-4-font100dpi/Makefile @@ -22,6 +22,9 @@ RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo CONFLICTS= xorg-fonts-100dpi-* +DEPRECATED= isn't maintained anymore +EXPIRATION_DATE= 2007-12-25 + USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc diff --git a/x11-fonts/XFree86-4-font75dpi/Makefile b/x11-fonts/XFree86-4-font75dpi/Makefile index fa9713170876..b3436e7392dd 100644 --- a/x11-fonts/XFree86-4-font75dpi/Makefile +++ b/x11-fonts/XFree86-4-font75dpi/Makefile @@ -22,6 +22,9 @@ RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo CONFLICTS= xorg-fonts-75dpi-* +DEPRECATED= isn't maintained anymore +EXPIRATION_DATE= 2007-12-25 + USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc diff --git a/x11-fonts/XFree86-4-fontCyrillic/Makefile b/x11-fonts/XFree86-4-fontCyrillic/Makefile index 21b62333608d..1fe0f66bac69 100644 --- a/x11-fonts/XFree86-4-fontCyrillic/Makefile +++ b/x11-fonts/XFree86-4-fontCyrillic/Makefile @@ -22,6 +22,9 @@ RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo CONFLICTS= xorg-fonts-cyrillic-* +DEPRECATED= isn't maintained anymore +EXPIRATION_DATE= 2007-12-25 + USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile index 02eeb9f273d1..a1145f180cc9 100644 --- a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile +++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile @@ -24,6 +24,9 @@ RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo CONFLICTS= xorg-fonts-miscbitmaps-* +DEPRECATED= isn't maintained anymore +EXPIRATION_DATE= 2007-12-25 + USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc diff --git a/x11-fonts/XFree86-4-fontEncodings/Makefile b/x11-fonts/XFree86-4-fontEncodings/Makefile index e5ea1d9c07c0..e995c2967fa7 100644 --- a/x11-fonts/XFree86-4-fontEncodings/Makefile +++ b/x11-fonts/XFree86-4-fontEncodings/Makefile @@ -21,6 +21,9 @@ BUILD_DEPENDS= ucs2any:${PORTSDIR}/x11/XFree86-4-clients CONFLICTS= encodings-* +DEPRECATED= isn't maintained anymore +EXPIRATION_DATE= 2007-12-25 + USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc diff --git a/x11-fonts/XFree86-4-fontScalable/Makefile b/x11-fonts/XFree86-4-fontScalable/Makefile index d1120c797035..0627355ace99 100644 --- a/x11-fonts/XFree86-4-fontScalable/Makefile +++ b/x11-fonts/XFree86-4-fontScalable/Makefile @@ -24,6 +24,9 @@ RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo CONFLICTS= xorg-fonts-type1-* xorg-fonts-truetype-* +DEPRECATED= isn't maintained anymore +EXPIRATION_DATE= 2007-12-25 + USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile index c3075b0fea39..d255b420bc3a 100644 --- a/x11-fonts/libXfont/Makefile +++ b/x11-fonts/libXfont/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXfont -PORTVERSION= 1.2.8 +PORTVERSION= 1.3.1 PORTEPOCH= 1 CATEGORIES= x11-fonts diff --git a/x11-fonts/libXfont/distinfo b/x11-fonts/libXfont/distinfo index 234774a23667..bf35c32dadf0 100644 --- a/x11-fonts/libXfont/distinfo +++ b/x11-fonts/libXfont/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXfont-1.2.8.tar.bz2) = 83b8e21f6ee22512a8f72ba51e2d74f6 -SHA256 (xorg/lib/libXfont-1.2.8.tar.bz2) = 374a2ca12f62a4d9f09a17a34765a5289cefa9db7f9f0913e1c3731b4088aad8 -SIZE (xorg/lib/libXfont-1.2.8.tar.bz2) = 583236 +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 diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile index 25e9c1654bab..2b345487b28c 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.2 +PORTVERSION= 7.3 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 f7d2be831c5a..8d2ddf05908a 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.2 +PORTVERSION= 7.3 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 e80346d7a92e..8c3d28922f2b 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.2 +PORTVERSION= 7.3 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 709c1d774105..9045889143a8 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.2 +PORTVERSION= 7.3 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 e12139ca914e..aceaeecb6bb2 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.2 +PORTVERSION= 7.3 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 1352145f0c5d..25e1141e3f50 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.2 +PORTVERSION= 7.3 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile index 1ececd434bdd..eb3137a0bfa1 100644 --- a/x11-fonts/xorg-fonts/Makefile +++ b/x11-fonts/xorg-fonts/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-fonts -PORTVERSION= 7.2 +PORTVERSION= 7.3 CATEGORIES= x11-fonts MASTER_SITES= # none DISTFILES= # none diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile index f33cfb621af0..164c8db70706 100644 --- a/x11-servers/XFree86-4-FontServer/Makefile +++ b/x11-servers/XFree86-4-FontServer/Makefile @@ -7,7 +7,7 @@ PORTNAME= FontServer PORTVERSION= 4.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-servers x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} @@ -19,7 +19,10 @@ DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 font server -CONFLICTS= xorg-fontserver-* +CONFLICTS= xorg-fontserver-* xfs-* + +DEPRECATED= isn't maintained anymore +EXPIRATION_DATE= 2007-12-25 MAN1= xfs.1 XBUILD_DIRS= programs/xfs diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile index 804011d15195..2fc0d6df6791 100644 --- a/x11-servers/XFree86-4-NestServer/Makefile +++ b/x11-servers/XFree86-4-NestServer/Makefile @@ -21,6 +21,9 @@ COMMENT= XFree86-4 nested X server CONFLICTS= xorg-nestserver-[0-9]* +DEPRECATED= isn't maintained anymore +EXPIRATION_DATE= 2007-12-25 + EXTRA_PATCHES= ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_bitmap_pcfread.c MAN1= Xnest.1 PLIST_FILES= bin/Xnest diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile index 4c87db7060af..1def8b743ffb 100644 --- a/x11-servers/XFree86-4-PrintServer/Makefile +++ b/x11-servers/XFree86-4-PrintServer/Makefile @@ -21,6 +21,9 @@ COMMENT= XFree86-4 print server CONFLICTS= xorg-printserver-* +DEPRECATED= isn't maintained anymore +EXPIRATION_DATE= 2007-12-25 + EXTRA_PATCHES= ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_bitmap_pcfread.c PLIST_FILES= bin/Xprt XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index bb61988dbde6..72b971d8ffa6 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -21,6 +21,9 @@ COMMENT= XFree86-4 X server and related programs CONFLICTS= xorg-server-[0-9]* +DEPRECATED= isn't maintained anymore +EXPIRATION_DATE= 2007-12-25 + # Override default from XFree86-4-libraries/Makefile.inc PATCHDIR= ${MASTERDIR}/files diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile index ef300eec9412..6219da01741f 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile @@ -21,6 +21,9 @@ COMMENT= XFree86-4 virtual framebuffer server CONFLICTS= xorg-vfbserver-[0-9]* +DEPRECATED= isn't maintained anymore +EXPIRATION_DATE= 2007-12-25 + EXTRA_PATCHES= ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_bitmap_pcfread.c MAN1= Xvfb.1 PLIST_FILES= bin/Xvfb diff --git a/x11-servers/synaptics/Makefile b/x11-servers/synaptics/Makefile index 7a39ce27f533..857b3ed766a6 100644 --- a/x11-servers/synaptics/Makefile +++ b/x11-servers/synaptics/Makefile @@ -7,7 +7,7 @@ PORTNAME= synaptics PORTVERSION= 0.14.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-servers MASTER_SITES= http://web.telia.com/~u89404340/touchpad/files/:synaptics DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:synaptics \ @@ -36,9 +36,10 @@ MASTER_SITES+= ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/:x11 \ DIST_SUBDIR= xorg/xserver X_DISTFILES= xorg-server-${X11VERSION}.tar.bz2 PLIST_SUB+= XORG="" XFREE86="@comment " +EXTRA_PATCHES= ${FILESDIR}/extra-xorg-server-1.4 post-patch: - @${REINPLACE_CMD} 's|\(ALLINCLUDES = -I.\)|\1 -I${X11BASE}/include|' \ + @${REINPLACE_CMD} 's|\(ALLINCLUDES = -I.\)|\1 -I${LOCALBASE}/include -I${LOCALBASE}/include/pixman-1|' \ ${WRKSRC}/Makefile .elif ${X_WINDOW_SYSTEM:L} == xfree86-4 diff --git a/x11-servers/synaptics/distinfo b/x11-servers/synaptics/distinfo index a4b8415f3a1e..2028c8c16605 100644 --- a/x11-servers/synaptics/distinfo +++ b/x11-servers/synaptics/distinfo @@ -1,9 +1,9 @@ MD5 (xorg/xserver/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af SHA256 (xorg/xserver/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429 SIZE (xorg/xserver/synaptics-0.14.6.tar.bz2) = 126833 -MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6 -SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85 -SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596 +MD5 (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 (xc/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af SHA256 (xc/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429 SIZE (xc/synaptics-0.14.6.tar.bz2) = 126833 diff --git a/x11-servers/synaptics/files/extra-xorg-server-1.4 b/x11-servers/synaptics/files/extra-xorg-server-1.4 new file mode 100644 index 000000000000..d6f2ab11f0a7 --- /dev/null +++ b/x11-servers/synaptics/files/extra-xorg-server-1.4 @@ -0,0 +1,63 @@ +diff -u Makefile.orig Makefile +--- Makefile.orig 2006-07-15 17:58:26.000000000 +0200 ++++ Makefile 2007-09-07 15:03:17.386179198 +0200 +@@ -34,10 +34,9 @@ + LDCOMBINEFLAGS = -shared -lc + PICFLAG = $(call check_gcc,-fPIC,) + X_INCLUDES_ROOT = $(INSTALLED_X) +- SDKDIR = $(shell pkg-config xorg-server --variable=sdkdir) + ALLINCLUDES = -I. -I$(INSTALLED_X)/include/X11 \ + -I$(INSTALLED_X)/include/X11/extensions \ +- -I$(SDKDIR) ++ `pkg-config xorg-server --cflags` + else + INSTALLED_X = /usr/X11R6 + INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input +diff -u synaptics.c.orig synaptics.c +--- synaptics.c.orig 2006-07-15 17:54:29.000000000 +0200 ++++ synaptics.c 2007-09-07 15:10:24.910542275 +0200 +@@ -321,7 +321,9 @@ + local->private_flags = 0; + local->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS; + local->conf_idev = dev; ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 + local->motion_history_proc = xf86GetMotionEvents; ++#endif + local->history_size = 0; + local->always_core_feedback = 0; + +@@ -613,8 +615,17 @@ + + InitPointerDeviceStruct((DevicePtr)dev, map, + SYN_MAX_BUTTONS, +- miPointerGetMotionEvents, SynapticsCtrl, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 ++ miPointerGetMotionEvents, ++#else ++ GetMotionHistory, ++#endif ++ SynapticsCtrl, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 + miPointerGetMotionBufferSize()); ++#else ++ GetMotionHistorySize(), 2); ++#endif + + /* X valuator */ + xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1); +diff -u synaptics.h.orig synaptics.h +--- synaptics.h.orig 2006-07-15 17:54:29.000000000 +0200 ++++ synaptics.h 2007-09-07 15:10:12.409829887 +0200 +@@ -226,5 +226,11 @@ + + #endif /* SYNAPTICS_PRIVATE */ + ++/* Previously found in xf86Xinput.h */ ++#ifdef DBG ++#undef DBG ++#endif ++ ++#define DBG(lvl, f) {if ((lvl) <= xf86GetVerbosity()) f;} + + #endif /* _SYNAPTICS_H_ */ + diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile index fb4a3751d88f..a62198ab80a2 100644 --- a/x11-servers/xorg-dmx/Makefile +++ b/x11-servers/xorg-dmx/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-dmx -PORTVERSION= 1.2.0 +PORTVERSION= 1.4 PORTEPOCH= 1 CATEGORIES= x11-servers @@ -25,7 +25,7 @@ USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ compositeproto trapproto recordproto resourceproto \ xineramaproto evieproto xkbfile xfont fontenc xkbui \ xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \ - xau dmx xtst xres + xau dmx xtst xres pixman CONFIGURE_ARGS= --disable-xprint --disable-xvfb --disable-xorg --disable-xnest \ --enable-dmx --localstatedir=/var diff --git a/x11-servers/xorg-dmx/distinfo b/x11-servers/xorg-dmx/distinfo index b208692af414..70c76c2b2663 100644 --- a/x11-servers/xorg-dmx/distinfo +++ b/x11-servers/xorg-dmx/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6 -SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85 -SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596 +MD5 (xorg/xserver/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 diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile index 7cbd05677367..aa605d5ba04a 100644 --- a/x11-servers/xorg-nestserver/Makefile +++ b/x11-servers/xorg-nestserver/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-nestserver -PORTVERSION= 1.2.0 +PORTVERSION= 1.4 PORTEPOCH= 1 CATEGORIES= x11-servers @@ -24,7 +24,7 @@ USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ resourceproto fontsproto xf86dgaproto videoproto \ compositeproto trapproto recordproto resourceproto \ xineramaproto evieproto xkbfile xfont fontenc xkbui \ - xxf86misc xxf86vm xaw7 xmu xpm xext + xxf86misc xxf86vm xaw7 xmu xpm xext pixman CONFIGURE_ARGS= --disable-dmx --disable-xvfb --disable-xorg --disable-xprint \ --localstatedir=/var diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo index b208692af414..70c76c2b2663 100644 --- a/x11-servers/xorg-nestserver/distinfo +++ b/x11-servers/xorg-nestserver/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6 -SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85 -SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596 +MD5 (xorg/xserver/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 diff --git a/x11-servers/xorg-printserver/Makefile b/x11-servers/xorg-printserver/Makefile index ad79d66c09c3..46bf04232310 100644 --- a/x11-servers/xorg-printserver/Makefile +++ b/x11-servers/xorg-printserver/Makefile @@ -15,6 +15,10 @@ COMMENT= X Print server from X.Org CONFLICTS= XFree86-PrintServer-* +DEPRECATED= is obsolete +EXPIRATION_DATE= 2007-12-25 +IGNORE= ${DEPRECATED} + XORG_CAT= xserver LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile index 6f53725843cb..0ba3f4574f53 100644 --- a/x11-servers/xorg-server-snap/Makefile +++ b/x11-servers/xorg-server-snap/Makefile @@ -24,6 +24,8 @@ RUN_DEPENDS= ${X11BASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-c CONFLICTS= XFree86-Server-* +IGNORE= is outdated + XORG_CAT= xserver USE_XORG= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \ diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index cb2ba615090e..e29687b9dbd3 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -6,15 +6,14 @@ # PORTNAME= xorg-server -PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTVERSION= 1.4 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-6.5.2.tar.bz2:mesa + MesaLib-7.0.1.tar.bz2:mesa MAINTAINER= x11@FreeBSD.org COMMENT= X.Org X server and related programs @@ -32,13 +31,19 @@ USE_XORG= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \ xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ resourceproto fontsproto inputproto xf86dgaproto \ videoproto compositeproto trapproto recordproto xineramaproto \ - evieproto xfont fontenc xkbui + evieproto xfont fontenc xkbui pixman USE_PERL5_BUILD=yes -CONFIGURE_ARGS= --with-mesa-source=${WRKDIR}/Mesa-6.5.2 \ +CONFIGURE_ARGS= --with-mesa-source=${WRKDIR}/Mesa-7.0.1 \ --disable-dmx --disable-xvfb --disable-xnest --disable-xprint \ --localstatedir=/var +.if !defined(WITHOUT_HAL) +LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal +.else +CONFIGURE_ARGS+= --disable-config-hal +.endif + .if !defined(WITHOUT_AIGLX) CONFIGURE_ARGS+= --enable-aiglx=yes .endif @@ -52,11 +57,11 @@ MAN1= Xorg.1 \ cvt.1 \ gtf.1 \ pcitweak.1 \ - xorgcfg.1 \ xorgconfig.1 MAN4= exa.4 \ fbdevhw.4 -MAN5= xorg.conf.5 +MAN5= xorg.conf.5 \ + SecurityPolicy.5 NOT_FOR_ARCHS= ia64 .include <bsd.port.pre.mk> @@ -90,7 +95,7 @@ PLIST_SUB+= AMD64_I386="@comment " .endif .if ${OSVERSION} > 700042 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gcc42 +CFLAGS+= -O0 .endif .if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO @@ -103,4 +108,14 @@ pre-everything:: @${ECHO_MSG} "NO_SUID_XSERVER=YES in /etc/make.conf." .endif +#post-patch: +# ${ECHO_CMD} "XXX - Remove post-patch target!" +# ${REINPLACE_CMD} -e 's|pixman|pixman-1|' ${WRKSRC}/configure +# ${REINPLACE_CMD} -e 's|pixman/pixman.h|pixman.h|' \ +# ${WRKSRC}/fb/fb.h \ +# ${WRKSRC}/include/miscstruct.h \ +# ${WRKSRC}/mi/miregion.c \ +# ${WRKSRC}/render/picture.h +# ${CP} ${FILESDIR}/GL-glx-glxbyteorder.h ${WRKSRC}/GL/glx/glxbyteorder.h + .include <bsd.port.post.mk> diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc deleted file mode 100644 index 6b9286e9c814..000000000000 --- a/x11-servers/xorg-server/Makefile.inc +++ /dev/null @@ -1,92 +0,0 @@ -# Include before bsd.port.pre.mk for XFree86-4 ports which share -# XFree86-4-libraries's patches. -# The purpose of this file is to reduce the duplicated code among the XFree86-4 -# ports which each do only part of a standard XFree86 build. -# -# XBUILD_DIRS is the group of directories under ${WRKSRC} that will -# be built in. -# XINCLUDE_DIRS is the group of directories under ${WRKSRC} that need -# to be Makefilesed or included in besides XBUILD_DIRS -# XINSTALL_DIRS is the group of directories which will have -# their install targets run. -# XMAN_DIRS is the group of directories which will have -# their install.man targets run. - -DIST_SUBDIR?= xorg -WRKSRC?= ${WRKDIR}/xc -USE_X_PREFIX?= no -PREFIX?= ${X11BASE} -MTREE_FILE= ${PORTSDIR}/Templates/BSD.local.dist -EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* - -USE_IMAKE= YES -.if defined(XMAN_DIRS) -XFREE86_HTML_MAN?= yes -.else -XFREE86_HTML_MAN?= no -.endif -SCRIPTS_ENV+= CC="${CC}" \ - CXX="${CXX}" \ - CFLAGS="${CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" - -XINSTALL_DIRS?= ${XBUILD_DIRS} -_XINCLUDE_DIRS= include ${XBUILD_DIRS} ${XINCLUDE_DIRS} - -CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-Imake.rules \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-Imake.tmpl \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-Library.tmpl \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.rules \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.h \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-font-FreeType-ftsystem.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-imake.c - -SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-mitri.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-servermd.h \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c - -.if !target(do-configure) -do-configure: - @cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf - @cp ${X11BASE}/lib/X11/config/date.def ${WRKSRC}/config/cf - @cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} Makefile.boot - @for dir in ${_XINCLUDE_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${WRKSRC}/config/imake/imake \ - -DTOPDIR=${WRKSRC} -DCURDIR=$${dir} -I${WRKSRC}/config/cf; \ - done - @for dir in ${_XINCLUDE_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} Makefiles; \ - done - @for dir in ${_XINCLUDE_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} includes; \ - done - @for dir in include ${XBUILD_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} depend; \ - done -.endif - -.if !target(do-build) -do-build: - @for dir in ${XBUILD_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} all; \ - done -.endif - -.if !target(do-install) -do-install: - @for dir in ${XINSTALL_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install; \ - done - @for dir in ${XMAN_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install.man; \ - done -.endif - diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo index 428c09bca0cf..8e7e17dba21e 100644 --- a/x11-servers/xorg-server/distinfo +++ b/x11-servers/xorg-server/distinfo @@ -1,6 +1,6 @@ -MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6 -SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85 -SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596 -MD5 (xorg/xserver/MesaLib-6.5.2.tar.bz2) = e4d894181f1859651658b3704633e10d -SHA256 (xorg/xserver/MesaLib-6.5.2.tar.bz2) = 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f -SIZE (xorg/xserver/MesaLib-6.5.2.tar.bz2) = 3295166 +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/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 diff --git a/x11-servers/xorg-server/files/extra-patch-gcc42 b/x11-servers/xorg-server/files/extra-patch-gcc42 deleted file mode 100644 index 4bf5a81558a4..000000000000 --- a/x11-servers/xorg-server/files/extra-patch-gcc42 +++ /dev/null @@ -1,11 +0,0 @@ ---- hw/xfree86/scanpci/Makefile.in.orig Wed Jun 20 12:50:37 2007 -+++ hw/xfree86/scanpci/Makefile.in Wed Jun 20 12:50:57 2007 -@@ -132,7 +132,7 @@ - CCDEPMODE = @CCDEPMODE@ - CFB_FALSE = @CFB_FALSE@ - CFB_TRUE = @CFB_TRUE@ --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ -O0 - COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@ - COMPOSITE_FALSE = @COMPOSITE_FALSE@ - COMPOSITE_TRUE = @COMPOSITE_TRUE@ diff --git a/x11-servers/xorg-server/files/patch-Xext_xcmisc.c b/x11-servers/xorg-server/files/patch-Xext_xcmisc.c deleted file mode 100644 index c3637ac038d2..000000000000 --- a/x11-servers/xorg-server/files/patch-Xext_xcmisc.c +++ /dev/null @@ -1,38 +0,0 @@ -diff --git Xext/xcmisc.c Xext/xcmisc.c -index f26218e..8c7a86e 100644 ---- Xext/xcmisc.c -+++ Xext/xcmisc.c -@@ -42,6 +42,12 @@ #include "swaprep.h" - #include <X11/extensions/xcmiscstr.h> - #include "modinit.h" - -+#if HAVE_STDINT_H -+#include <stdint.h> -+#elif !defined(UINT32_MAX) -+#define UINT32_MAX 0xffffffffU -+#endif -+ - #if 0 - static unsigned char XCMiscCode; - #endif -@@ -143,7 +149,10 @@ ProcXCMiscGetXIDList(client) - - REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq); - -- pids = (XID *)ALLOCATE_LOCAL(stuff->count * sizeof(XID)); -+ if (stuff->count > UINT32_MAX / sizeof(XID)) -+ return BadAlloc; -+ -+ pids = (XID *)Xalloc(stuff->count * sizeof(XID)); - if (!pids) - { - return BadAlloc; -@@ -164,7 +173,7 @@ ProcXCMiscGetXIDList(client) - client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; - WriteSwappedDataToClient(client, count * sizeof(XID), pids); - } -- DEALLOCATE_LOCAL(pids); -+ Xfree(pids); - return(client->noClientException); - } - diff --git a/x11-servers/xorg-server/files/patch-at_scancode.c b/x11-servers/xorg-server/files/patch-at_scancode.c deleted file mode 100644 index 68ffceb41e86..000000000000 --- a/x11-servers/xorg-server/files/patch-at_scancode.c +++ /dev/null @@ -1,31 +0,0 @@ ---- hw/xfree86/os-support/shared/at_scancode.c.orig Sun Jul 3 09:01:35 2005 -+++ hw/xfree86/os-support/shared/at_scancode.c Sat Oct 7 21:27:29 2006 -@@ -84,6 +84,10 @@ - case KEY_Prefix0: - pKbd->scanPrefix = 0; - switch (*scanCode) { -+ case 0x1e: *scanCode = KEY_AudioRaise;break; -+ case 0x1f: *scanCode = KEY_AudioLower;break; -+ case 0x20: *scanCode = KEY_Power; break; -+ case 0x25: *scanCode = KEY_Mute; break; - case KEY_KP_7: *scanCode = KEY_Home; break; /* curs home */ - case KEY_KP_8: *scanCode = KEY_Up; break; /* curs up */ - case KEY_KP_9: *scanCode = KEY_PgUp; break; /* curs pgup */ -@@ -104,6 +108,17 @@ - case 0x5b: *scanCode = KEY_LMeta; break; - case 0x5c: *scanCode = KEY_RMeta; break; - case 0x5d: *scanCode = KEY_Menu; break; -+ case 0x5e: *scanCode = KEY_L1; break; /* stop */ -+ case 0x5f: *scanCode = KEY_L2; break; /* again */ -+ case 0x60: *scanCode = KEY_L3; break; /* props */ -+ case 0x61: *scanCode = KEY_L4; break; /* undo */ -+ case 0x62: *scanCode = KEY_L5; break; /* front */ -+ case 0x63: *scanCode = KEY_L6; break; /* copy */ -+ case 0x64: *scanCode = KEY_L7; break; /* open */ -+ case 0x65: *scanCode = KEY_L8; break; /* paste */ -+ case 0x66: *scanCode = KEY_L9; break; /* find */ -+ case 0x67: *scanCode = KEY_L10; break; /* cut */ -+ case 0x68: *scanCode = KEY_Help; break; - case KEY_F3: *scanCode = KEY_F13; break; - case KEY_F4: *scanCode = KEY_F14; break; - case KEY_F5: *scanCode = KEY_F15; break; diff --git a/x11-servers/xorg-server/files/patch-bsd_kbd.c b/x11-servers/xorg-server/files/patch-bsd_kbd.c deleted file mode 100644 index a7d8cb3fdd48..000000000000 --- a/x11-servers/xorg-server/files/patch-bsd_kbd.c +++ /dev/null @@ -1,32 +0,0 @@ ---- hw/xfree86/os-support/bsd/bsd_kbd.c.orig Mon Oct 3 18:46:14 2005 -+++ hw/xfree86/os-support/bsd/bsd_kbd.c Fri Sep 29 23:26:17 2006 -@@ -75,6 +75,17 @@ - KbdDevPtr pKbd = (KbdDevPtr) pInfo->private; - int real_leds = 0; - -+#if defined (SYSCONS_SUPPORT) -+ if (pKbd->sunKbd) { -+ if (leds & 0x08) real_leds |= XLED1; -+ if (leds & 0x04) real_leds |= XLED4; -+ if (leds & 0x02) real_leds |= XLED3; -+ if (leds & 0x01) real_leds |= XLED2; -+ leds = real_leds; -+ real_leds = 0; -+ } -+#endif -+ - #ifdef LED_CAP - if (leds & XLED1) real_leds |= LED_CAP; - #endif -@@ -83,7 +94,11 @@ - #endif - #ifdef LED_SCR - if (leds & XLED3) real_leds |= LED_SCR; -+#ifdef LED_COMP -+ if (leds & XLED4) real_leds |= LED_COMP; -+#else - if (leds & XLED4) real_leds |= LED_SCR; -+#endif - #endif - - switch (pKbd->consType) { diff --git a/x11-servers/xorg-server/files/patch-damageext-damageext.c b/x11-servers/xorg-server/files/patch-damageext-damageext.c deleted file mode 100644 index c732aed5e234..000000000000 --- a/x11-servers/xorg-server/files/patch-damageext-damageext.c +++ /dev/null @@ -1,50 +0,0 @@ -commit 8274ea6aa97b06a56b7468c3908894c0ff72b687 -Author: Eric Anholt <eric@anholt.net> -Date: Thu Feb 1 12:15:54 2007 -0800 - - Set the Damage version supported in the server, instead of using damageproto. - - This was caught by distributions upgrading damageproto to 1.1, before the - server they had supported it. The server then advertised the new version - without supporting the protocol. - -diff --git a/damageext/damageext.c b/damageext/damageext.c -index ae1091e..739d20f 100755 ---- damageext/damageext.c -+++ damageext/damageext.c -@@ -35,6 +35,13 @@ int DamageClientPrivateIndex; - RESTYPE DamageExtType; - RESTYPE DamageExtWinType; - -+/* Version of the damage extension supported by the server, as opposed to the -+ * DAMAGE_* defines from damageproto for what version the proto header -+ * supports. -+ */ -+#define SERVER_DAMAGE_MAJOR 1 -+#define SERVER_DAMAGE_MINOR 0 -+ - #define prScreen screenInfo.screens[0] - - static void -@@ -143,16 +150,16 @@ ProcDamageQueryVersion(ClientPtr client) - rep.type = X_Reply; - rep.length = 0; - rep.sequenceNumber = client->sequence; -- if (stuff->majorVersion < DAMAGE_MAJOR) { -+ if (stuff->majorVersion < SERVER_DAMAGE_MAJOR) { - rep.majorVersion = stuff->majorVersion; - rep.minorVersion = stuff->minorVersion; - } else { -- rep.majorVersion = DAMAGE_MAJOR; -- if (stuff->majorVersion == DAMAGE_MAJOR && -- stuff->minorVersion < DAMAGE_MINOR) -+ rep.majorVersion = SERVER_DAMAGE_MAJOR; -+ if (stuff->majorVersion == SERVER_DAMAGE_MAJOR && -+ stuff->minorVersion < SERVER_DAMAGE_MINOR) - rep.minorVersion = stuff->minorVersion; - else -- rep.minorVersion = DAMAGE_MINOR; -+ rep.minorVersion = SERVER_DAMAGE_MINOR; - } - pDamageClient->major_version = rep.majorVersion; - pDamageClient->minor_version = rep.minorVersion; diff --git a/x11-servers/xorg-server/files/patch-randr.c b/x11-servers/xorg-server/files/patch-randr.c deleted file mode 100644 index 956527beeec4..000000000000 --- a/x11-servers/xorg-server/files/patch-randr.c +++ /dev/null @@ -1,13 +0,0 @@ ---- randr/randr.c.orig Thu Mar 15 13:21:48 2007 -+++ randr/randr.c Thu Mar 15 13:22:00 2007 -@@ -472,8 +472,8 @@ - rep.type = X_Reply; - rep.length = 0; - rep.sequenceNumber = client->sequence; -- rep.majorVersion = RANDR_MAJOR; -- rep.minorVersion = RANDR_MINOR; -+ rep.majorVersion = 1; -+ rep.minorVersion = 2; - if (client->swapped) { - swaps(&rep.sequenceNumber, n); - swapl(&rep.length, n); diff --git a/x11-servers/xorg-server/files/patch-xf86Events.c b/x11-servers/xorg-server/files/patch-xf86Events.c deleted file mode 100644 index 2d88773233b8..000000000000 --- a/x11-servers/xorg-server/files/patch-xf86Events.c +++ /dev/null @@ -1,76 +0,0 @@ ---- hw/xfree86/common/xf86Events.c.orig Sun Sep 26 04:17:42 2004 -+++ hw/xfree86/common/xf86Events.c Sun Sep 26 04:17:25 2004 -@@ -448,7 +448,7 @@ - #if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT) - static Bool first_time = TRUE; - #endif --#if defined(__sparc__) && defined(__linux__) -+#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__)) - static int kbdSun = -1; - #endif - /* Disable any keyboard processing while in suspend */ -@@ -464,7 +464,7 @@ - } - #endif - --#if defined (__sparc__) && defined(__linux__) -+#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__)) - if (kbdSun == -1) { - if ((xf86Info.xkbmodel && !strcmp(xf86Info.xkbmodel, "sun")) - || (xf86Info.xkbrules && !strcmp(xf86Info.xkbrules, "sun"))) -@@ -474,7 +474,7 @@ - } - if (kbdSun) - goto special; --#endif /* __sparc__ && __linux__ */ -+#endif /* __sparc__ && (__linux__ || __FreeBSD__) */ - - #ifdef __linux__ - if (xf86Info.kbdCustomKeycodes) { -@@ -525,6 +525,7 @@ - } else - #endif /* i386 && SVR4 */ - { -+ if (!xf86IsPc98()) { - switch (scanCode) { - case 0x59: scanCode = KEY_0x59; break; - case 0x5a: scanCode = KEY_0x5A; break; -@@ -555,6 +556,7 @@ - case 0x75: scanCode = KEY_0x75; break; - case 0x76: scanCode = KEY_0x76; break; - } -+ } /* end if (!xf86IsPc98()) */ - } - } - -@@ -636,10 +638,12 @@ - * they need to get the same key code as the base key on the same - * physical keyboard key. - */ -+ if (!xf86IsPc98()) { - if (scanCode == KEY_SysReqest) - scanCode = KEY_Print; - else if (scanCode == KEY_Break) - scanCode = KEY_Pause; -+ } - #endif - - /* -@@ -676,7 +680,7 @@ - } - } - #endif --#if defined (__sparc__) && defined(__linux__) -+#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__)) - special: - if (kbdSun) { - switch (scanCode) { -@@ -710,7 +714,7 @@ - */ - scanCode--; - } --#endif /* defined (__sparc__) && defined(__linux__) */ -+#endif /* __sparc__ && (__linux__ || __FreeBSD__) */ - - #ifdef XKB - if ((xf86Info.ddxSpecialKeys == SKWhenNeeded && diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist index 6bab6980acdc..4d42df873573 100644 --- a/x11-servers/xorg-server/pkg-plist +++ b/x11-servers/xorg-server/pkg-plist @@ -11,25 +11,7 @@ bin/gtf %%SPARC64_NA%%%%PPC_NA%%bin/outw bin/pcitweak %%AMD64_I386%%bin/scanpci -bin/xorgcfg bin/xorgconfig -include/X11/bitmaps/card.xbm -include/X11/bitmaps/down.xbm -include/X11/bitmaps/keyboard.xbm -include/X11/bitmaps/left.xbm -include/X11/bitmaps/monitor.xbm -include/X11/bitmaps/mouse.xbm -include/X11/bitmaps/narrower.xbm -include/X11/bitmaps/right.xbm -include/X11/bitmaps/shorter.xbm -include/X11/bitmaps/taller.xbm -include/X11/bitmaps/up.xbm -include/X11/bitmaps/wider.xbm -include/X11/pixmaps/card.xpm -include/X11/pixmaps/computer.xpm -include/X11/pixmaps/keyboard.xpm -include/X11/pixmaps/monitor.xpm -include/X11/pixmaps/mouse.xpm include/xorg/BT.h include/xorg/IBM.h include/xorg/TI.h @@ -84,6 +66,7 @@ include/xorg/gc.h include/xorg/gcstruct.h include/xorg/globals.h include/xorg/glyphstr.h +include/xorg/hotplug.h include/xorg/i2c_def.h include/xorg/input.h include/xorg/inputstr.h @@ -140,8 +123,8 @@ include/xorg/uda1380.h include/xorg/validate.h include/xorg/vbe.h include/xorg/vbeModes.h -include/xorg/vdif.h include/xorg/vgaHW.h +include/xorg/wfbrename.h include/xorg/window.h include/xorg/windowstr.h include/xorg/xaa.h @@ -151,18 +134,23 @@ include/xorg/xaarop.h include/xorg/xf1bpp.h include/xorg/xf4bpp.h include/xorg/xf86.h +include/xorg/xf86Crtc.h include/xorg/xf86Cursor.h include/xorg/xf86DDC.h +include/xorg/xf86Modes.h include/xorg/xf86Module.h -include/xorg/xf86OSKbd.h include/xorg/xf86OSmouse.h include/xorg/xf86Opt.h +include/xorg/xf86Optrec.h +include/xorg/xf86Parser.h include/xorg/xf86Pci.h include/xorg/xf86PciInfo.h include/xorg/xf86Priv.h include/xorg/xf86Privstr.h include/xorg/xf86RAC.h +include/xorg/xf86RandR12.h include/xorg/xf86RamDac.h +include/xorg/xf86Rename.h include/xorg/xf86Resources.h include/xorg/xf86Version.h include/xorg/xf86Xinput.h @@ -180,6 +168,7 @@ include/xorg/xf86xv.h include/xorg/xf86xvmc.h include/xorg/xf86xvpriv.h include/xorg/xisb.h +include/xorg/xkbsrv.h include/xorg/xorg-server.h include/xorg/xorgVersion.h include/xorg/xvdix.h @@ -210,22 +199,16 @@ lib/xorg/modules/libcfb.la lib/xorg/modules/libcfb.so lib/xorg/modules/libcfb32.la lib/xorg/modules/libcfb32.so -lib/xorg/modules/libddc.la -lib/xorg/modules/libddc.so lib/xorg/modules/libexa.la lib/xorg/modules/libexa.so lib/xorg/modules/libfb.la lib/xorg/modules/libfb.so -lib/xorg/modules/libi2c.la -lib/xorg/modules/libi2c.so lib/xorg/modules/libint10.la lib/xorg/modules/libint10.so lib/xorg/modules/libmfb.la lib/xorg/modules/libmfb.so lib/xorg/modules/libpcidata.la lib/xorg/modules/libpcidata.so -lib/xorg/modules/libramdac.la -lib/xorg/modules/libramdac.so lib/xorg/modules/libscanpci.la lib/xorg/modules/libscanpci.so lib/xorg/modules/libshadow.la @@ -236,6 +219,8 @@ lib/xorg/modules/libvbe.la lib/xorg/modules/libvbe.so lib/xorg/modules/libvgahw.la lib/xorg/modules/libvgahw.so +lib/xorg/modules/libwfb.la +lib/xorg/modules/libwfb.so lib/xorg/modules/libxaa.la lib/xorg/modules/libxaa.so lib/xorg/modules/libxf1bpp.la @@ -264,7 +249,6 @@ lib/xorg/modules/multimedia/uda1380_drv.la lib/xorg/modules/multimedia/uda1380_drv.so lib/xserver/SecurityPolicy libdata/pkgconfig/xorg-server.pc -share/X11/app-defaults/XOrgCfg share/X11/xkb/compiled/README.compiled share/aclocal/xorg-server.m4 @dirrm include/xorg diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile index 8b1b72c7e918..beef5fd0d8a1 100644 --- a/x11-servers/xorg-vfbserver/Makefile +++ b/x11-servers/xorg-vfbserver/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-vfbserver -PORTVERSION= 1.2.0 +PORTVERSION= 1.4 PORTEPOCH= 1 CATEGORIES= x11-servers @@ -24,7 +24,7 @@ USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ resourceproto fontsproto xf86dgaproto videoproto \ compositeproto trapproto recordproto resourceproto \ xineramaproto evieproto xkbfile xfont fontenc xkbui xxf86misc \ - xxf86vm xaw7 xmu xpm xext + xxf86vm xaw7 xmu xpm xext pixman CONFIGURE_ARGS= --disable-dmx --disable-xnest --disable-xorg --disable-xprint \ --localstatedir=/var diff --git a/x11-servers/xorg-vfbserver/distinfo b/x11-servers/xorg-vfbserver/distinfo index b208692af414..70c76c2b2663 100644 --- a/x11-servers/xorg-vfbserver/distinfo +++ b/x11-servers/xorg-vfbserver/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = ea291c89e68832d570d9d5e007218bd6 -SHA256 (xorg/xserver/xorg-server-1.2.0.tar.bz2) = e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85 -SIZE (xorg/xserver/xorg-server-1.2.0.tar.bz2) = 6014596 +MD5 (xorg/xserver/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 diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile index 75139e0597df..2c36ad31e5bb 100644 --- a/x11-toolkits/libXaw/Makefile +++ b/x11-toolkits/libXaw/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXaw -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 PORTEPOCH= 1 CATEGORIES= x11-toolkits diff --git a/x11-toolkits/libXaw/distinfo b/x11-toolkits/libXaw/distinfo index f29c606f3398..e99e5c7481e4 100644 --- a/x11-toolkits/libXaw/distinfo +++ b/x11-toolkits/libXaw/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXaw-1.0.3.tar.bz2) = ee215536ea78798268ab3a444d10135a -SHA256 (xorg/lib/libXaw-1.0.3.tar.bz2) = 45ca55bdac904a07b8118618c65ddb5bf8826e626c4c927e3c2508c58e231514 -SIZE (xorg/lib/libXaw-1.0.3.tar.bz2) = 515197 +MD5 (xorg/lib/libXaw-1.0.4.tar.bz2) = 73671d8f1cf36fdd81395328cc3539c9 +SHA256 (xorg/lib/libXaw-1.0.4.tar.bz2) = 11f4ab184fb8dc853fd95238d4de7b251427dd036643d11fd2a669232fa35af9 +SIZE (xorg/lib/libXaw-1.0.4.tar.bz2) = 517275 diff --git a/x11/Makefile b/x11/Makefile index 39dd6f51e06d..820c32cc65c0 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -224,6 +224,7 @@ SUBDIR += padkey SUBDIR += panoramixext SUBDIR += peeper + SUBDIR += pixman SUBDIR += portoseguro SUBDIR += powershell SUBDIR += printext @@ -305,6 +306,7 @@ SUBDIR += xauth SUBDIR += xautolock SUBDIR += xautomation + SUBDIR += xbacklight SUBDIR += xballoon SUBDIR += xbanner SUBDIR += xbelld diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile index 1d7ac13361a7..653ff9f0cc13 100644 --- a/x11/XFree86-4-clients/Makefile +++ b/x11/XFree86-4-clients/Makefile @@ -29,6 +29,9 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ CONFLICTS= xorg-clients-[0-9]* +DEPRECATED= isn't maintained anymore +EXPIRATION_DATE= 2007-12-25 + SCRIPTS_ENV= InstallXdmConfig=${InstallXdmConfig} \ InstallXinitConfig=${InstallXinitConfig} \ InstallAppDefFiles=${InstallAppDefFiles} diff --git a/x11/XFree86-4-documents/Makefile b/x11/XFree86-4-documents/Makefile index e70fa16fb0cc..e85f5ffbf831 100644 --- a/x11/XFree86-4-documents/Makefile +++ b/x11/XFree86-4-documents/Makefile @@ -18,6 +18,9 @@ DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 documentation +DEPRECATED= isn't maintained anymore +EXPIRATION_DATE= 2007-12-25 + USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index e7df1a8d6181..5e98682a8e17 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -33,6 +33,9 @@ CONFLICTS= Mesa-[0-9]* libX11-[0-9]* libGL-[0-9]* libGLU-[0-9]* \ xextensions-[0-9]* xf86ext-[0-9]* xlibs-[0-9]* \ xorg-libraries-[0-9]* xpm-[0-9]* xproto-[0-9]* +DEPRECATED= isn't maintained anymore +EXPIRATION_DATE= 2007-12-25 + USE_X_PREFIX= no PREFIX?= ${X11BASE} MTREE_FILE= ${PORTSDIR}/Templates/BSD.local.dist diff --git a/x11/XFree86-4-manuals/Makefile b/x11/XFree86-4-manuals/Makefile index 148345523265..b7849ec8b0c0 100644 --- a/x11/XFree86-4-manuals/Makefile +++ b/x11/XFree86-4-manuals/Makefile @@ -19,6 +19,9 @@ COMMENT= XFree86-4 man pages CONFLICTS= xorg-manpages-[0-9]* +DEPRECATED= isn't maintained anymore +EXPIRATION_DATE= 2007-12-25 + USE_IMAKE= yes EXTRACT_TARGET= xc/doc/man \ xc/extras/ogl-sample/main/doc/man diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile index 1f04cc7c7f99..04752f160d3a 100644 --- a/x11/XFree86-4/Makefile +++ b/x11/XFree86-4/Makefile @@ -17,6 +17,9 @@ EXTRACT_ONLY= # none MAINTAINER= x11@FreeBSD.org COMMENT= X11/XFree86 core distribution (complete, using mini/meta-ports) +DEPRECATED= isn't maintained anymore +EXPIRATION_DATE= 2007-12-25 + LIB_DEPENDS= X11.6:${PORTSDIR}/x11/XFree86-4-libraries RUN_DEPENDS= xvinfo:${PORTSDIR}/x11/XFree86-4-clients \ ${X11BASE}/share/doc/XFree86/ddx.txt:${PORTSDIR}/x11/XFree86-4-documents \ diff --git a/x11/compositeproto/Makefile b/x11/compositeproto/Makefile index 75e6a6a203ed..d91e3c61957e 100644 --- a/x11/compositeproto/Makefile +++ b/x11/compositeproto/Makefile @@ -6,7 +6,7 @@ # PORTNAME= compositeproto -PORTVERSION= 0.3.1 +PORTVERSION= 0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/compositeproto/distinfo b/x11/compositeproto/distinfo index 1a4c5e25086f..163eaf2e50dc 100644 --- a/x11/compositeproto/distinfo +++ b/x11/compositeproto/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/proto/compositeproto-0.3.1.tar.bz2) = 54f1fbd567f57093df054f8440a60a5e -SHA256 (xorg/proto/compositeproto-0.3.1.tar.bz2) = c7608611a7e42604777bdf7db20d17e7f4b62da98f154da762d12c735812e0cf -SIZE (xorg/proto/compositeproto-0.3.1.tar.bz2) = 37322 +MD5 (xorg/proto/compositeproto-0.4.tar.bz2) = 6281344d656d4e0c8e9db4918efe3d1d +SHA256 (xorg/proto/compositeproto-0.4.tar.bz2) = 6013d1ca63b2b7540f6f99977090812b899852acfbd9df123b5ebaa911e30003 +SIZE (xorg/proto/compositeproto-0.4.tar.bz2) = 45390 diff --git a/x11/compositeproto/pkg-plist b/x11/compositeproto/pkg-plist index 22845d18c4b8..ae280eb91fab 100644 --- a/x11/compositeproto/pkg-plist +++ b/x11/compositeproto/pkg-plist @@ -1,4 +1,6 @@ include/X11/extensions/composite.h include/X11/extensions/compositeproto.h libdata/pkgconfig/compositeproto.pc +share/doc/compositeproto/compositeproto.txt +@dirrm share/doc/compositeproto @dirrmtry include/X11/extensions diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile index 105d797ee050..5cd0b59d5d8b 100644 --- a/x11/iceauth/Makefile +++ b/x11/iceauth/Makefile @@ -6,7 +6,7 @@ # PORTNAME= iceauth -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/iceauth/distinfo b/x11/iceauth/distinfo index 126b13043954..7f8e6e961ded 100644 --- a/x11/iceauth/distinfo +++ b/x11/iceauth/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/iceauth-1.0.1.tar.bz2) = 50df9a5718b3cb6544a1c9f38b392b09 -SHA256 (xorg/app/iceauth-1.0.1.tar.bz2) = 23e2c701493c26470506f2aaffac9ddc9ac79fb8bbcbefb21dbeb67bb72185d6 -SIZE (xorg/app/iceauth-1.0.1.tar.bz2) = 84339 +MD5 (xorg/app/iceauth-1.0.2.tar.bz2) = 7ab8b64edf0212a9d9a3c8129901a450 +SHA256 (xorg/app/iceauth-1.0.2.tar.bz2) = 06401591de57a2c4cf2255e3d5230ea19351c5516cf8dae98c61092392bab5bb +SIZE (xorg/app/iceauth-1.0.2.tar.bz2) = 97052 diff --git a/x11/ico/Makefile b/x11/ico/Makefile index bfa14ba7087b..b612fb930351 100644 --- a/x11/ico/Makefile +++ b/x11/ico/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ico -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/ico/distinfo b/x11/ico/distinfo index 5b12495fe46b..10a83d0d9913 100644 --- a/x11/ico/distinfo +++ b/x11/ico/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/ico-1.0.1.tar.bz2) = 8c04178b7f78014567b6b8b2b7d7a10f -SHA256 (xorg/app/ico-1.0.1.tar.bz2) = 13bd6c3f40a4f27ccfd34a101a179fb15c783be20f7ba8001b1ead1161b399f8 -SIZE (xorg/app/ico-1.0.1.tar.bz2) = 85723 +MD5 (xorg/app/ico-1.0.2.tar.bz2) = 5711827c5c2563620b56c33aababbc63 +SHA256 (xorg/app/ico-1.0.2.tar.bz2) = db2e96e18a2bcc29b91b9de7b758a7c67cebee27772fb540c44c7bc2c2218aa5 +SIZE (xorg/app/ico-1.0.2.tar.bz2) = 97445 diff --git a/x11/inputproto/Makefile b/x11/inputproto/Makefile index e6e406237ebb..b21dc4d9d485 100644 --- a/x11/inputproto/Makefile +++ b/x11/inputproto/Makefile @@ -6,7 +6,7 @@ # PORTNAME= inputproto -PORTVERSION= 1.3.2 +PORTVERSION= 1.4.2.1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/inputproto/distinfo b/x11/inputproto/distinfo index 8e57a7d57c11..f3852aa8b815 100644 --- a/x11/inputproto/distinfo +++ b/x11/inputproto/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/proto/inputproto-1.3.2.tar.bz2) = e0b7df0fc69f0712aa7f2161faa94e1d -SHA256 (xorg/proto/inputproto-1.3.2.tar.bz2) = af6323d63fb5715bc9928d787f09795d875271f40636e031919372f185a51298 -SIZE (xorg/proto/inputproto-1.3.2.tar.bz2) = 46502 +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 diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile index a27bb99da059..77a0407c9a7f 100644 --- a/x11/libICE/Makefile +++ b/x11/libICE/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libICE -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/libICE/distinfo b/x11/libICE/distinfo index b513b8104f38..a4f6ed9128ca 100644 --- a/x11/libICE/distinfo +++ b/x11/libICE/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libICE-1.0.3.tar.bz2) = 071f96648ac25c8e87a3de11a7de2d8a -SHA256 (xorg/lib/libICE-1.0.3.tar.bz2) = ffd46270dae30cad147d73559142a701a8ff8d0658f4abfb2341edefabb8161d -SIZE (xorg/lib/libICE-1.0.3.tar.bz2) = 246976 +MD5 (xorg/lib/libICE-1.0.4.tar.bz2) = 4ab4e67e0b8845aa201e984153087f4a +SHA256 (xorg/lib/libICE-1.0.4.tar.bz2) = 13055e2f4c645cbd135ce97a7974a5866f9ba3ed8988e686b552f55c30514f04 +SIZE (xorg/lib/libICE-1.0.4.tar.bz2) = 252304 diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index 3a005f09680c..715e1d2203ff 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libX11 -PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTVERSION= 1.1.3 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo index 76b0a1d09677..9fb62bb72a68 100644 --- a/x11/libX11/distinfo +++ b/x11/libX11/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libX11-1.1.2.tar.bz2) = 710bf38a9477a5a1b235bc94f1d0593c -SHA256 (xorg/lib/libX11-1.1.2.tar.bz2) = b77e4fd2bbd4092e7e78d0964760ad8ab160caccd4bc6d7d0c87a23febaea85e -SIZE (xorg/lib/libX11-1.1.2.tar.bz2) = 1523644 +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 diff --git a/x11/libX11/files/patch-src::GetMoEv.c b/x11/libX11/files/patch-src::GetMoEv.c deleted file mode 100644 index 9dd8ff744acc..000000000000 --- a/x11/libX11/files/patch-src::GetMoEv.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/GetMoEv.c.orig Thu Jun 21 19:45:32 2007 -+++ src/GetMoEv.c Thu Jun 21 19:45:45 2007 -@@ -33,9 +33,9 @@ - - XTimeCoord *XGetMotionEvents( - register Display *dpy, -+ Window w, - Time start, - Time stop, -- Window w, - int *nEvents) /* RETURN */ - { - xGetMotionEventsReply rep; diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile index 2a92757f31b3..eb8ab75eaa6c 100644 --- a/x11/libXcomposite/Makefile +++ b/x11/libXcomposite/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXcomposite -PORTVERSION= 0.3.2 +PORTVERSION= 0.4.0 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/libXcomposite/distinfo b/x11/libXcomposite/distinfo index d1bd2317ca30..7f7a424888e1 100644 --- a/x11/libXcomposite/distinfo +++ b/x11/libXcomposite/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXcomposite-0.3.2.tar.bz2) = 50dd31bed383280433404a405d3dcf8f -SHA256 (xorg/lib/libXcomposite-0.3.2.tar.bz2) = 22a541727fffc0f23823fc09f0830f3cd555edfa50c5dceac9b0ee9ae8519263 -SIZE (xorg/lib/libXcomposite-0.3.2.tar.bz2) = 219562 +MD5 (xorg/lib/libXcomposite-0.4.0.tar.bz2) = 7e95395dea89be21bae929b9b7f16641 +SHA256 (xorg/lib/libXcomposite-0.4.0.tar.bz2) = 7db759e82dd1f68094e4c4d257025f7893dafb2913ed249e00cbe18fa13c7510 +SIZE (xorg/lib/libXcomposite-0.4.0.tar.bz2) = 217145 diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile index 1f84ddbbbcad..817bc94dd4a5 100644 --- a/x11/libXcursor/Makefile +++ b/x11/libXcursor/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libXcursor -PORTVERSION= 1.1.8 -PORTREVISION= 1 +PORTVERSION= 1.1.9 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -18,6 +17,37 @@ USE_XORG= xrender x11 xfixes renderproto fixesproto xproto:both CONFIGURE_ARGS= --with-icondir=${PREFIX}/lib/X11/icons -MAN3= Xcursor.3 +MAN3= Xcursor.3 \ + XcursorImageCreate.3 \ + XcursorImageDestroy.3 \ + XcursorImagesCreate.3 \ + XcursorImagesDestroy.3 \ + XcursorCursorsCreate.3 \ + XcursorCursorsDestroy.3 \ + XcursorXcFileLoadImage.3 \ + XcursorXcFileLoadImages.3 \ + XcursorXcFileLoadAllImages.3 \ + XcursorXcFileLoad.3 \ + XcursorXcFileSave.3 \ + XcursorFilenameLoadImage.3 \ + XcursorFilenameLoadImages.3 \ + XcursorFilenameLoadAllImages.3 \ + XcursorFilenameLoad.3 \ + XcursorFilenameSaveImages.3 \ + XcursorFilenameSave.3 \ + XcursorLibraryLoadImage.3 \ + XcursorLibraryLoadImages.3 \ + XcursorFilenameLoadCursor.3 \ + XcursorLibraryLoadCursor.3 \ + XcursorLibraryLoadCursors.3 \ + XcursorShapeLoadImage.3 \ + XcursorShapeLoadImages.3 \ + XcursorShapeLoadCursor.3 \ + XcursorShapeLoadCursors.3 \ + XcursorSupportsARGB.3 \ + XcursorSetDefaultSize.3 \ + XcursorGetDefaultSize.3 \ + XcursorSetTheme.3 \ + XcursorGetTheme.3 .include <bsd.port.mk> diff --git a/x11/libXcursor/distinfo b/x11/libXcursor/distinfo index 3c8e7874d4d1..459db7d00f82 100644 --- a/x11/libXcursor/distinfo +++ b/x11/libXcursor/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXcursor-1.1.8.tar.bz2) = ec2acd10a7736a85dd1e1ed9ea5bec96 -SHA256 (xorg/lib/libXcursor-1.1.8.tar.bz2) = 8f039f81af52c88d583fba48b878abd074542221cb0030638ad52336b4ae1377 -SIZE (xorg/lib/libXcursor-1.1.8.tar.bz2) = 251641 +MD5 (xorg/lib/libXcursor-1.1.9.tar.bz2) = 99b7554037a92b260891091e81815a0a +SHA256 (xorg/lib/libXcursor-1.1.9.tar.bz2) = 1dffb3542271c8ce964066d561474caec5b639d6588b257b21cfb8225a15d2b4 +SIZE (xorg/lib/libXcursor-1.1.9.tar.bz2) = 234749 diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile index 2f984bbaf3f6..0b0615b4ce1e 100644 --- a/x11/libXi/Makefile +++ b/x11/libXi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXi -PORTVERSION= 1.0.2 +PORTVERSION= 1.1.3 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/libXi/distinfo b/x11/libXi/distinfo index 54f273204622..82a7ca5a9395 100644 --- a/x11/libXi/distinfo +++ b/x11/libXi/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXi-1.0.2.tar.bz2) = 4a5207a29a6b220e5462129854689844 -SHA256 (xorg/lib/libXi-1.0.2.tar.bz2) = 7e6339539d3d0a4fc95cc23ca2b13ae67dd783e011b3cc5ca76040e376bff57f -SIZE (xorg/lib/libXi-1.0.2.tar.bz2) = 244920 +MD5 (xorg/lib/libXi-1.1.3.tar.bz2) = 7c510abb0cad8dc20493fb27ff7859d8 +SHA256 (xorg/lib/libXi-1.1.3.tar.bz2) = c77a5bbe97d0d0a6493adefcf1bd57aca91bc33279633b3f6cf1d2bb8812153f +SIZE (xorg/lib/libXi-1.1.3.tar.bz2) = 248007 diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile index b944653382eb..9288deb9a59f 100644 --- a/x11/libXpm/Makefile +++ b/x11/libXpm/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libXpm -PORTVERSION= 3.5.6 -PORTREVISION= 1 +PORTVERSION= 3.5.7 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXpm/distinfo b/x11/libXpm/distinfo index 43dea7b5eacf..a06bdb8bd956 100644 --- a/x11/libXpm/distinfo +++ b/x11/libXpm/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXpm-3.5.6.tar.bz2) = 37b7d1826c6a02107269632a93b8791f -SHA256 (xorg/lib/libXpm-3.5.6.tar.bz2) = 2d5c5242b8417db6aa758e5be387de33385d9960ff21c801af7d6a4730b4fd0d -SIZE (xorg/lib/libXpm-3.5.6.tar.bz2) = 371577 +MD5 (xorg/lib/libXpm-3.5.7.tar.bz2) = cd15ee542d9f515538b4462a6f79d977 +SHA256 (xorg/lib/libXpm-3.5.7.tar.bz2) = 64701ae67ce5b0797307b75d8255bec3a0d371d0c50715ea618f5a68bcc92baa +SIZE (xorg/lib/libXpm-3.5.7.tar.bz2) = 358241 diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile index ba1db1581572..cee1292dc523 100644 --- a/x11/libXrandr/Makefile +++ b/x11/libXrandr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXrandr -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXrandr/distinfo b/x11/libXrandr/distinfo index 4b12f1fbaf10..d9f575f08bb5 100644 --- a/x11/libXrandr/distinfo +++ b/x11/libXrandr/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXrandr-1.2.1.tar.bz2) = 5860360f5b038cc728f388f875ce525d -SHA256 (xorg/lib/libXrandr-1.2.1.tar.bz2) = 2d2df642eb8e0527936cdf4ed1c096f69df53e9b95e2532c8ed0cabd06a45407 -SIZE (xorg/lib/libXrandr-1.2.1.tar.bz2) = 220679 +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 diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile index 6b996ca1cdc6..ef6d7e5f5e41 100644 --- a/x11/libXrender/Makefile +++ b/x11/libXrender/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXrender -PORTVERSION= 0.9.2 +PORTVERSION= 0.9.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXrender/distinfo b/x11/libXrender/distinfo index f4a9c28b4f70..61d5242d086b 100644 --- a/x11/libXrender/distinfo +++ b/x11/libXrender/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXrender-0.9.2.tar.bz2) = 2f1b2c6e8dcbcb6d760e59f445abd92c -SHA256 (xorg/lib/libXrender-0.9.2.tar.bz2) = 0f749183ab1a0ece14d33c3299b3f70893122349c0bfa9d7bd0e66ce19d1802a -SIZE (xorg/lib/libXrender-0.9.2.tar.bz2) = 246023 +MD5 (xorg/lib/libXrender-0.9.4.tar.bz2) = dc266e850c51368f964e0d67bf5fb5e6 +SHA256 (xorg/lib/libXrender-0.9.4.tar.bz2) = 5682d343dd4e7ef291a6577e956c331946ce5801d8fa076284a01b41de3017ec +SIZE (xorg/lib/libXrender-0.9.4.tar.bz2) = 226512 diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile index d236f80c8bb7..739f27112db7 100644 --- a/x11/libXres/Makefile +++ b/x11/libXres/Makefile @@ -7,7 +7,7 @@ PORTNAME= libXres PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -23,7 +23,4 @@ MAN3= XRes.3 \ XResQueryExtension.3 \ XResQueryVersion.3 -post-install: - ${MKDIR} ${PREFIX}/share/X11/app-defaults - .include <bsd.port.mk> diff --git a/x11/libXres/pkg-plist b/x11/libXres/pkg-plist index 9de732019606..ea8918ab97c5 100644 --- a/x11/libXres/pkg-plist +++ b/x11/libXres/pkg-plist @@ -4,6 +4,3 @@ lib/libXRes.la lib/libXRes.so lib/libXRes.so.1 libdata/pkgconfig/xres.pc -@dirrmtry share/X11/app-defaults -@dirrmtry share/X11 -@exec mkdir -p %D/share/X11/app-defaults 2>/dev/null diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile index 407aaced9191..b597d6b5bf14 100644 --- a/x11/libXtst/Makefile +++ b/x11/libXtst/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXtst -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXtst/distinfo b/x11/libXtst/distinfo index 2e583d8305ba..1bbf04582e3a 100644 --- a/x11/libXtst/distinfo +++ b/x11/libXtst/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXtst-1.0.2.tar.bz2) = 032d5c1d3914fc0224837328c88aef96 -SHA256 (xorg/lib/libXtst-1.0.2.tar.bz2) = eef98ad3d35254384c3714cd63826fc2009f9b394f2b489718aba9be7be0a10b -SIZE (xorg/lib/libXtst-1.0.2.tar.bz2) = 224741 +MD5 (xorg/lib/libXtst-1.0.3.tar.bz2) = 090c1ad04e34982eada5cf3b1a0792fd +SHA256 (xorg/lib/libXtst-1.0.3.tar.bz2) = b4a8dd3d9ceb04cd7322c1f7e5d2320d6ccf85ba8c81d736fd6d6c83c658c905 +SIZE (xorg/lib/libXtst-1.0.3.tar.bz2) = 224637 diff --git a/x11/libXxf86/Makefile b/x11/libXxf86/Makefile index 68ee8a7575fb..6db42940006d 100644 --- a/x11/libXxf86/Makefile +++ b/x11/libXxf86/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libXxf86 -PORTVERSION= 1.0 -PORTREVISION= 1 +PORTVERSION= 1.0.2 CATEGORIES= x11 MASTER_SITES= http://xorg.freedesktop.org/X11R6.7.0/src/ \ ${MASTER_SITE_XORG} diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile index b93018a0efdd..c81cd3802e59 100644 --- a/x11/libXxf86dga/Makefile +++ b/x11/libXxf86dga/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libXxf86dga -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/libXxf86dga/distinfo b/x11/libXxf86dga/distinfo index 9a027810bbc8..26caf50e6b9c 100644 --- a/x11/libXxf86dga/distinfo +++ b/x11/libXxf86dga/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/libXxf86dga-1.0.1.tar.bz2) = 5b0e752c71a23e9d1290cad44a7c7c75 -SHA256 (xorg/lib/libXxf86dga-1.0.1.tar.bz2) = 8c68f429942b1258cff0fb27505645a463690374ecf318ae660ff4cde7a03db9 -SIZE (xorg/lib/libXxf86dga-1.0.1.tar.bz2) = 231533 +MD5 (xorg/lib/libXxf86dga-1.0.2.tar.bz2) = 6f5f621804ee652b6cc6f2025c517c78 +SHA256 (xorg/lib/libXxf86dga-1.0.2.tar.bz2) = 59175230a00a1fb359148f36eadb50fc6cb080849379ccb0e43c6cbb97309a25 +SIZE (xorg/lib/libXxf86dga-1.0.2.tar.bz2) = 217092 diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile new file mode 100644 index 000000000000..e8a806239d3f --- /dev/null +++ b/x11/pixman/Makefile @@ -0,0 +1,24 @@ +# New ports collection makefile for: pixman +# Date Created: Aug 9 2003 +# Whom: Florent Thoumie <flz@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= pixman +PORTVERSION= 0.9.5 +CATEGORIES= x11 + +MAINTAINER= x11@FreeBSD.org +COMMENT= Low-level pixel manipulation library + +XORG_CAT= lib +WANT_GNOME= yes + +.include <bsd.port.pre.mk> + +.if ${HAVE_GNOME:Mgtk20} != "" || defined(WITH_GTK2) +USE_GNOME= gtk20 +.endif + +.include <bsd.port.post.mk> diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo new file mode 100644 index 000000000000..a32367807f28 --- /dev/null +++ b/x11/pixman/distinfo @@ -0,0 +1,3 @@ +MD5 (xorg/lib/pixman-0.9.5.tar.bz2) = f9fea77e46ec7a3a16e925e137f146e7 +SHA256 (xorg/lib/pixman-0.9.5.tar.bz2) = a9d4545b5dfc018cdd33fd21bc73c3f1b3c9c207f1bb6843606cc180eb10c6c8 +SIZE (xorg/lib/pixman-0.9.5.tar.bz2) = 290622 diff --git a/x11/pixman/pkg-descr b/x11/pixman/pkg-descr new file mode 100644 index 000000000000..a2150dc2411f --- /dev/null +++ b/x11/pixman/pkg-descr @@ -0,0 +1,6 @@ +This package contains the pixman library. + +WWW: http://www.freedesktop.org/Software/xlibs + +- Florent Thoumie +flz@FreeBSD.org diff --git a/x11/pixman/pkg-plist b/x11/pixman/pkg-plist new file mode 100644 index 000000000000..43a14ba948cc --- /dev/null +++ b/x11/pixman/pkg-plist @@ -0,0 +1,7 @@ +include/pixman-1/pixman.h +lib/libpixman-1.a +lib/libpixman-1.la +lib/libpixman-1.so +lib/libpixman-1.so.9 +libdata/pkgconfig/pixman-1.pc +@dirrm include/pixman-1 diff --git a/x11/renderproto/Makefile b/x11/renderproto/Makefile index f06f3af06d34..04f97b98ae7f 100644 --- a/x11/renderproto/Makefile +++ b/x11/renderproto/Makefile @@ -6,7 +6,7 @@ # PORTNAME= renderproto -PORTVERSION= 0.9.2 +PORTVERSION= 0.9.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/renderproto/distinfo b/x11/renderproto/distinfo index 00ced5d63ca5..db7ada8b4864 100644 --- a/x11/renderproto/distinfo +++ b/x11/renderproto/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/proto/renderproto-0.9.2.tar.bz2) = 28fbe8a59ebd31f098b90ec64f3d133a -SHA256 (xorg/proto/renderproto-0.9.2.tar.bz2) = 7754dfbbb1e3818f28720fa9647b8a593e9d54626a7896771c2bfac7f75e2726 -SIZE (xorg/proto/renderproto-0.9.2.tar.bz2) = 40056 +MD5 (xorg/proto/renderproto-0.9.3.tar.bz2) = 598bc9a493deee2e48e4434e94467189 +SHA256 (xorg/proto/renderproto-0.9.3.tar.bz2) = c98a08b877e98a8fa7daa04be472de7e0cb38a99593faca8b987effcea2dd45b +SIZE (xorg/proto/renderproto-0.9.3.tar.bz2) = 54128 diff --git a/x11/renderproto/pkg-plist b/x11/renderproto/pkg-plist index 0b7b61817bdb..7f83469673e4 100644 --- a/x11/renderproto/pkg-plist +++ b/x11/renderproto/pkg-plist @@ -1,4 +1,6 @@ include/X11/extensions/render.h include/X11/extensions/renderproto.h libdata/pkgconfig/renderproto.pc +share/doc/renderproto/renderproto.txt +@dirrm share/doc/renderproto @dirrmtry include/X11/extensions diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile index effe0637e665..b20546b36df7 100644 --- a/x11/sessreg/Makefile +++ b/x11/sessreg/Makefile @@ -6,7 +6,7 @@ # PORTNAME= sessreg -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/sessreg/distinfo b/x11/sessreg/distinfo index 34b2e135aba4..15eadc003898 100644 --- a/x11/sessreg/distinfo +++ b/x11/sessreg/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/sessreg-1.0.2.tar.bz2) = bee5d87d40615e67c84ab0b0c65049ba -SHA256 (xorg/app/sessreg-1.0.2.tar.bz2) = c23c12259854c7cec6d19bf397afff4a542a22170b14de73b321aa8cafcf3a86 -SIZE (xorg/app/sessreg-1.0.2.tar.bz2) = 94745 +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 diff --git a/x11/sessreg/files/patch-sessreg.h b/x11/sessreg/files/patch-sessreg.h deleted file mode 100644 index 4c4683b11cfc..000000000000 --- a/x11/sessreg/files/patch-sessreg.h +++ /dev/null @@ -1,10 +0,0 @@ ---- sessreg.h.orig Wed Dec 6 16:33:46 2006 -+++ sessreg.h Wed Dec 6 16:34:00 2006 -@@ -55,6 +55,7 @@ - - #include "config.h" - -+#include <sys/types.h> - #include <time.h> - #include <utmp.h> - diff --git a/x11/setxkbmap/Makefile b/x11/setxkbmap/Makefile index 70a9ca71f562..de4245338302 100644 --- a/x11/setxkbmap/Makefile +++ b/x11/setxkbmap/Makefile @@ -6,7 +6,7 @@ # PORTNAME= setxkbmap -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/setxkbmap/distinfo b/x11/setxkbmap/distinfo index f872272e8521..ce37b1be9094 100644 --- a/x11/setxkbmap/distinfo +++ b/x11/setxkbmap/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/setxkbmap-1.0.3.tar.bz2) = 2b53542095a35a8a5731164118643883 -SHA256 (xorg/app/setxkbmap-1.0.3.tar.bz2) = 086f67c8272ceca059c64e127dbdb66ccad8de6f532aee02d22786543718a508 -SIZE (xorg/app/setxkbmap-1.0.3.tar.bz2) = 86655 +MD5 (xorg/app/setxkbmap-1.0.4.tar.bz2) = 6fab3bb176be9e510c5613d054ef1ca4 +SHA256 (xorg/app/setxkbmap-1.0.4.tar.bz2) = 9b5b139238419757d57de584c2ad30b853367245eef49221ce02a3b403cf2bac +SIZE (xorg/app/setxkbmap-1.0.4.tar.bz2) = 92758 diff --git a/x11/xbacklight/Makefile b/x11/xbacklight/Makefile new file mode 100644 index 000000000000..2130579ee442 --- /dev/null +++ b/x11/xbacklight/Makefile @@ -0,0 +1,21 @@ +# New ports collection makefile for: xbacklight +# Date Created: 11 Sep 2007 +# Whom: Florent Thoumie <flz@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= xbacklight +PORTVERSION= 1.1 +CATEGORIES= x11 + +MAINTAINER= x11@FreeBSD.org +COMMENT= Program to adjust backlight brightness + +XORG_CAT= app +USE_XORG= x11 xrender xrandr + +MAN1= xbacklight.1 +PLIST_FILES= bin/xbacklight + +.include <bsd.port.mk> diff --git a/x11/xbacklight/distinfo b/x11/xbacklight/distinfo new file mode 100644 index 000000000000..6049f5e5478c --- /dev/null +++ b/x11/xbacklight/distinfo @@ -0,0 +1,3 @@ +MD5 (xorg/app/xbacklight-1.1.tar.bz2) = 51b4a1c0ae2b3bd77417306fd78a3e94 +SHA256 (xorg/app/xbacklight-1.1.tar.bz2) = c795001f15974569e16f25b201ac2ac7666c5a646f8d0de3afa0c3a1ba5d64a4 +SIZE (xorg/app/xbacklight-1.1.tar.bz2) = 79964 diff --git a/x11/xbacklight/pkg-descr b/x11/xbacklight/pkg-descr new file mode 100644 index 000000000000..220f1b596e24 --- /dev/null +++ b/x11/xbacklight/pkg-descr @@ -0,0 +1,2 @@ +The xbacklight program adjusts backlight brightness +using RandR extension. diff --git a/x11/xcalc/Makefile b/x11/xcalc/Makefile index c42a2c7c3d57..72b23a14478f 100644 --- a/x11/xcalc/Makefile +++ b/x11/xcalc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xcalc -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xcalc/distinfo b/x11/xcalc/distinfo index a4c944349f8d..de9a191412ee 100644 --- a/x11/xcalc/distinfo +++ b/x11/xcalc/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xcalc-1.0.1.tar.bz2) = 07b948cf671fde88df1a59bfb0cab3b8 -SHA256 (xorg/app/xcalc-1.0.1.tar.bz2) = 17484e5fec0ebe7dd8df7218fde1449c52be3f4c6377a85a9fd86e377a7f4248 -SIZE (xorg/app/xcalc-1.0.1.tar.bz2) = 93745 +MD5 (xorg/app/xcalc-1.0.2.tar.bz2) = d31a99795b9668f047aa11bf36df6df0 +SHA256 (xorg/app/xcalc-1.0.2.tar.bz2) = 96375e2d212e7249d14d0beac73c1a6d89252b5fcf571bd9f5c7303a14bb4a32 +SIZE (xorg/app/xcalc-1.0.2.tar.bz2) = 106117 diff --git a/x11/xclock/Makefile b/x11/xclock/Makefile index 23bfdc02bb29..e7861d5d94bd 100644 --- a/x11/xclock/Makefile +++ b/x11/xclock/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xclock -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xclock/distinfo b/x11/xclock/distinfo index e30567695300..b5888a5b09bb 100644 --- a/x11/xclock/distinfo +++ b/x11/xclock/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xclock-1.0.2.tar.bz2) = 6b930326f71993fb54b7203902b387cd -SHA256 (xorg/app/xclock-1.0.2.tar.bz2) = ced648762382eab09e0ccb87371cb745646ede08ffcb068faa6025d20c4d1f3d -SIZE (xorg/app/xclock-1.0.2.tar.bz2) = 104335 +MD5 (xorg/app/xclock-1.0.3.tar.bz2) = 2b1a3d030d87e62a591db8ee4c0072e6 +SHA256 (xorg/app/xclock-1.0.3.tar.bz2) = 10b5777ae9ef2a10d4cf447bd1bf13372d7061573835c2c87d5c948b65e9577f +SIZE (xorg/app/xclock-1.0.3.tar.bz2) = 113967 diff --git a/x11/xconsole/Makefile b/x11/xconsole/Makefile index cc6795e93578..02a2731c2036 100644 --- a/x11/xconsole/Makefile +++ b/x11/xconsole/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xconsole -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xconsole/distinfo b/x11/xconsole/distinfo index c8d887af52b2..ee19b97a57da 100644 --- a/x11/xconsole/distinfo +++ b/x11/xconsole/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xconsole-1.0.2.tar.bz2) = 8678ddd23573022d68dcd883ae239be8 -SHA256 (xorg/app/xconsole-1.0.2.tar.bz2) = 45db847e810a932bb962041a4c242f97779142f7e36feec64ec5f9073bd9b377 -SIZE (xorg/app/xconsole-1.0.2.tar.bz2) = 86486 +MD5 (xorg/app/xconsole-1.0.3.tar.bz2) = 0e1a3110bebabecc2897d67a973526b0 +SHA256 (xorg/app/xconsole-1.0.3.tar.bz2) = 1b1ec25fefad34f5c33c74474358c1f5a8702d8c04defc854826bccb7a46bc45 +SIZE (xorg/app/xconsole-1.0.3.tar.bz2) = 98733 diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile index 57e5bcff4cbc..ea875d8d3b2d 100644 --- a/x11/xcursorgen/Makefile +++ b/x11/xcursorgen/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xcursorgen -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xcursorgen/distinfo b/x11/xcursorgen/distinfo index 21665c40bb99..ed02e837bff5 100644 --- a/x11/xcursorgen/distinfo +++ b/x11/xcursorgen/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xcursorgen-1.0.1.tar.bz2) = 39e1e62f5bd92603b0230b8b948c2fc4 -SHA256 (xorg/app/xcursorgen-1.0.1.tar.bz2) = 18d3e0d64853089c2154f1f867df087fc15f87e03e09fabc98ee5e265d8a53ef -SIZE (xorg/app/xcursorgen-1.0.1.tar.bz2) = 82300 +MD5 (xorg/app/xcursorgen-1.0.2.tar.bz2) = 6fc90896b8c786cb1a2100b4167f7874 +SHA256 (xorg/app/xcursorgen-1.0.2.tar.bz2) = e009322bd2afef8d4ad91bcb6b17874e1cd00b1aaf397e7019a82cc44f3c174e +SIZE (xorg/app/xcursorgen-1.0.2.tar.bz2) = 89978 diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile index 67578d1a322a..41d073fdf8f9 100644 --- a/x11/xdm/Makefile +++ b/x11/xdm/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xdm -PORTVERSION= 1.1.4 -PORTREVISION= 3 +PORTVERSION= 1.1.6 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -15,16 +14,14 @@ COMMENT= X.Org X display manager XORG_CAT= app USE_XORG= xmu x11 xau xinerama xpm xdmcp xt xext xaw -MAKE_ENV= EXAMPLESDIR=${EXAMPLESDIR} +CONFIGURE_ARGS+= --with-xdmconfigdir=${EXAMPLESDIR} \ + --with-xdmscriptdir=${EXAMPLESDIR} MAN1= xdm.1 CFFILES= GiveConsole TakeConsole Xaccess Xreset Xresources \ Xservers Xsession Xsetup_0 Xstartup Xwilling xdm-config -post-patch: - ${REINPLACE_CMD} -e "s,XDMCONFIGDIR,${PREFIX}/lib/X11/xdm,g" ${WRKSRC}/config/Xreset.cpp ${WRKSRC}/config/Xstartup.cpp - post-install: .for f in ${CFFILES} ${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f diff --git a/x11/xdm/distinfo b/x11/xdm/distinfo index 422010e75603..e689ef94eb86 100644 --- a/x11/xdm/distinfo +++ b/x11/xdm/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xdm-1.1.4.tar.bz2) = a2b4c280f3e324d081a0d9ed76a8a123 -SHA256 (xorg/app/xdm-1.1.4.tar.bz2) = 928238ea20e074372659b2902de0e0d754083196911319319795fdbfd1ca6073 -SIZE (xorg/app/xdm-1.1.4.tar.bz2) = 386272 +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 diff --git a/x11/xdm/files/patch-config_Makefile.in b/x11/xdm/files/patch-config_Makefile.in deleted file mode 100644 index 1a27563f4d7b..000000000000 --- a/x11/xdm/files/patch-config_Makefile.in +++ /dev/null @@ -1,68 +0,0 @@ ---- config/Makefile.in.orig Tue Feb 6 20:47:18 2007 -+++ config/Makefile.in Thu Jun 21 15:08:28 2007 -@@ -370,13 +370,13 @@ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-dist_xdmscriptSCRIPTS: $(dist_xdmscript_SCRIPTS) - @$(NORMAL_INSTALL) -- test -z "$(xdmscriptdir)" || $(mkdir_p) "$(DESTDIR)$(xdmscriptdir)" -+ test -z "$(EXAMPLESDIR)" || $(mkdir_p) "$(DESTDIR)$(EXAMPLESDIR)" - @list='$(dist_xdmscript_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ -- echo " $(dist_xdmscriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(xdmscriptdir)/$$f'"; \ -- $(dist_xdmscriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(xdmscriptdir)/$$f"; \ -+ echo " $(dist_xdmscriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(EXAMPLESDIR)/$$f'"; \ -+ $(dist_xdmscriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(EXAMPLESDIR)/$$f"; \ - else :; fi; \ - done - -@@ -389,13 +389,13 @@ - done - install-xdmscriptSCRIPTS: $(xdmscript_SCRIPTS) - @$(NORMAL_INSTALL) -- test -z "$(xdmscriptdir)" || $(mkdir_p) "$(DESTDIR)$(xdmscriptdir)" -+ test -z "$(EXAMPLESDIR)" || $(mkdir_p) "$(DESTDIR)$(EXAMPLESDIR)" - @list='$(xdmscript_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ -- echo " $(xdmscriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(xdmscriptdir)/$$f'"; \ -- $(xdmscriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(xdmscriptdir)/$$f"; \ -+ echo " $(xdmscriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(EXAMPLESDIR)/$$f'"; \ -+ $(xdmscriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(EXAMPLESDIR)/$$f"; \ - else :; fi; \ - done - -@@ -435,12 +435,12 @@ - done - install-dist_xdmconfigDATA: $(dist_xdmconfig_DATA) - @$(NORMAL_INSTALL) -- test -z "$(xdmconfigdir)" || $(mkdir_p) "$(DESTDIR)$(xdmconfigdir)" -+ test -z "$(EXAMPLESDIR)" || $(mkdir_p) "$(DESTDIR)$(EXAMPLESDIR)" - @list='$(dist_xdmconfig_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -- echo " $(dist_xdmconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdmconfigdir)/$$f'"; \ -- $(dist_xdmconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdmconfigdir)/$$f"; \ -+ echo " $(dist_xdmconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(EXAMPLESDIR)/$$f'"; \ -+ $(dist_xdmconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(EXAMPLESDIR)/$$f"; \ - done - - uninstall-dist_xdmconfigDATA: -@@ -452,12 +452,12 @@ - done - install-xdmconfigDATA: $(xdmconfig_DATA) - @$(NORMAL_INSTALL) -- test -z "$(xdmconfigdir)" || $(mkdir_p) "$(DESTDIR)$(xdmconfigdir)" -+ test -z "$(EXAMPLESDIR)" || $(mkdir_p) "$(DESTDIR)$(EXAMPLESDIR)" - @list='$(xdmconfig_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -- echo " $(xdmconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdmconfigdir)/$$f'"; \ -- $(xdmconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdmconfigdir)/$$f"; \ -+ echo " $(xdmconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(EXAMPLESDIR)/$$f'"; \ -+ $(xdmconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(EXAMPLESDIR)/$$f"; \ - done - - uninstall-xdmconfigDATA: diff --git a/x11/xdm/files/patch-session.c b/x11/xdm/files/patch-session.c deleted file mode 100644 index a657f9cdcc44..000000000000 --- a/x11/xdm/files/patch-session.c +++ /dev/null @@ -1,43 +0,0 @@ ---- session.c.orig Sun Jun 3 22:49:51 2007 -+++ session.c Sun Jun 3 22:56:06 2007 -@@ -543,6 +543,7 @@ - pid_t pid; - #ifdef HAS_SETUSERCONTEXT - struct passwd* pwd; -+ extern char **environ; - #endif - #ifdef USE_PAM - pam_handle_t *pamh = thepamh (); -@@ -627,6 +628,7 @@ - return (0); - } - #endif /* QNX4 doesn't support multi-groups, no initgroups() */ -+#endif /* !HAS_SETUSERCONTEXT */ - #ifdef USE_PAM - if (pamh) { - long i; -@@ -647,6 +649,7 @@ - - } - #endif -+#ifndef HAS_SETUSERCONTEXT - if (setuid(verify->uid) < 0) { - LogError ("setuid %d (user \"%s\") failed, errno=%d\n", - verify->uid, name, errno); -@@ -657,6 +660,8 @@ - * Set the user's credentials: uid, gid, groups, - * environment variables, resource limits, and umask. - */ -+ /* destroy user environment before calling setusercontext */ -+ environ = verify->userEnviron; - pwd = getpwnam(name); - if (pwd) { - if (setusercontext(NULL, pwd, pwd->pw_uid, LOGIN_SETALL) < 0) { -@@ -664,6 +669,7 @@ - errno); - return (0); - } -+ verify->userEnviron = environ; - endpwent(); - } else { - LogError ("getpwnam for \"%s\" failed, errno=%d\n", name, errno); diff --git a/x11/xdriinfo/Makefile b/x11/xdriinfo/Makefile index 1f6a3008c2ad..b3bf781c5fdc 100644 --- a/x11/xdriinfo/Makefile +++ b/x11/xdriinfo/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xdriinfo -PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTVERSION= 1.0.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xdriinfo/distinfo b/x11/xdriinfo/distinfo index 5610c99178bb..ea842f032185 100644 --- a/x11/xdriinfo/distinfo +++ b/x11/xdriinfo/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xdriinfo-1.0.1.tar.bz2) = be3c5a9b242a57226b5bb5f22ec341ca -SHA256 (xorg/app/xdriinfo-1.0.1.tar.bz2) = f693977bdaea7eb6b095a6b6bc60b8a62110ecdef4c455211346e592f59c3772 -SIZE (xorg/app/xdriinfo-1.0.1.tar.bz2) = 81557 +MD5 (xorg/app/xdriinfo-1.0.2.tar.bz2) = a5ec51ed9f0a55dc3462d90d52ff899c +SHA256 (xorg/app/xdriinfo-1.0.2.tar.bz2) = 7b03ac095b6c79688c20ad61e3576d4698e3f16c09a7f3f1e7c50826814e7265 +SIZE (xorg/app/xdriinfo-1.0.2.tar.bz2) = 88240 diff --git a/x11/xf86dgaproto/Makefile b/x11/xf86dgaproto/Makefile index 070a66a55cd6..be4d701a3bc1 100644 --- a/x11/xf86dgaproto/Makefile +++ b/x11/xf86dgaproto/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xf86dgaproto -PORTVERSION= 2.0.2 +PORTVERSION= 2.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xf86dgaproto/distinfo b/x11/xf86dgaproto/distinfo index 4d9afff2c34c..5ffd2751e13a 100644 --- a/x11/xf86dgaproto/distinfo +++ b/x11/xf86dgaproto/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/proto/xf86dgaproto-2.0.2.tar.bz2) = 461aa291a23e8cf387b70f3efa71b05c -SHA256 (xorg/proto/xf86dgaproto-2.0.2.tar.bz2) = 3ee1db2481ea222269bd201eef4d0e5d8ca4dbdb5eeb4852cf1efc42d4269b60 -SIZE (xorg/proto/xf86dgaproto-2.0.2.tar.bz2) = 40066 +MD5 (xorg/proto/xf86dgaproto-2.0.3.tar.bz2) = 42fdcebc66efac02ab4beec2b1b0ad6e +SHA256 (xorg/proto/xf86dgaproto-2.0.3.tar.bz2) = 5ac4d4a308b032727c61fd56db5a2eaadaedfbce5bc9dc504320bff9d696b002 +SIZE (xorg/proto/xf86dgaproto-2.0.3.tar.bz2) = 43191 diff --git a/x11/xgamma/Makefile b/x11/xgamma/Makefile index 651fc44e01fb..950bb7012809 100644 --- a/x11/xgamma/Makefile +++ b/x11/xgamma/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xgamma -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xgamma/distinfo b/x11/xgamma/distinfo index e4d70f2270a7..d7029e635d49 100644 --- a/x11/xgamma/distinfo +++ b/x11/xgamma/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xgamma-1.0.1.tar.bz2) = 45d8fa3c85d4bfda87251798fd605a45 -SHA256 (xorg/app/xgamma-1.0.1.tar.bz2) = 085330064fdb90a152d2d44474fa20bb81ccb6c587c144f5f9c323cb9cc31eee -SIZE (xorg/app/xgamma-1.0.1.tar.bz2) = 74971 +MD5 (xorg/app/xgamma-1.0.2.tar.bz2) = f13ddedaa63a608d3b025d326f4f5b5d +SHA256 (xorg/app/xgamma-1.0.2.tar.bz2) = 5d3d5b230fc60aefae8f4865c17add133b5fb11377fd61c80897ef94fcccf41e +SIZE (xorg/app/xgamma-1.0.2.tar.bz2) = 86528 diff --git a/x11/xhost/Makefile b/x11/xhost/Makefile index c8c84546ff78..86ee9ee304b4 100644 --- a/x11/xhost/Makefile +++ b/x11/xhost/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xhost -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xhost/distinfo b/x11/xhost/distinfo index 5e173eddbb7a..4759e957cd94 100644 --- a/x11/xhost/distinfo +++ b/x11/xhost/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xhost-1.0.1.tar.bz2) = 5300c9aafa58878c8f6e85379d5c199c -SHA256 (xorg/app/xhost-1.0.1.tar.bz2) = b03b8c9a083064c35c2e7b76af2b0c28d756ced17d3c31549300fea057fd3822 -SIZE (xorg/app/xhost-1.0.1.tar.bz2) = 90034 +MD5 (xorg/app/xhost-1.0.2.tar.bz2) = f746aba36f075ae4cae313d849a94f4e +SHA256 (xorg/app/xhost-1.0.2.tar.bz2) = edab2cc49d230f58e54c0f7b83fd726fec5fc31356668a11589649f19ba90db6 +SIZE (xorg/app/xhost-1.0.2.tar.bz2) = 98006 diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile index 43fcab666025..7a439b5696d6 100644 --- a/x11/xinit/Makefile +++ b/x11/xinit/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xinit -PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTVERSION= 1.0.5 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo index 9e3b90b25086..721c02feb167 100644 --- a/x11/xinit/distinfo +++ b/x11/xinit/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xinit-1.0.4.tar.bz2) = 9df52a504dc04313a6650fae364ae04a -SHA256 (xorg/app/xinit-1.0.4.tar.bz2) = 1e7056db4441ccb0dff0f77503e3fd49a370aecdecf95ce6066116ca8244bf52 -SIZE (xorg/app/xinit-1.0.4.tar.bz2) = 106555 +MD5 (xorg/app/xinit-1.0.5.tar.bz2) = 9a2aad51042141a0e6ad066015397595 +SHA256 (xorg/app/xinit-1.0.5.tar.bz2) = 95d55283f32d241c8e6750b7998408da43e910d2b918c80089a3012684f1c62d +SIZE (xorg/app/xinit-1.0.5.tar.bz2) = 106673 diff --git a/x11/xinit/files/patch-startx.cpp b/x11/xinit/files/patch-startx.cpp deleted file mode 100644 index 8da9ac250d83..000000000000 --- a/x11/xinit/files/patch-startx.cpp +++ /dev/null @@ -1,48 +0,0 @@ -commit fc6cc81be41af58ffd996994e1325dd072a9ab34 -Author: Eric Anholt <eric@anholt.net> -Date: Fri Jul 13 15:34:43 2007 -0700 - - Use /dev/random to generate the cookie if mcookie is unavailable. - - Setting XAUTHORITY without having actually generated a cookie and created - .Xauthority led to issues if somebody like ssh later came around and made the - .Xauthority file for their own setup. So, simply make it so that we never - fail to create one. - -diff --git a/startx.cpp b/startx.cpp -index eba83b8..f4e24fd 100644 ---- startx.cpp -+++ startx.cpp -@@ -170,7 +170,6 @@ fi - - removelist= - --#if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE) - XCOMM set up default Xauth info for this machine - case `uname` in - Linux*) -@@ -186,7 +185,15 @@ Linux*) - esac - - authdisplay=${display:-:0} -+#if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE) - mcookie=`MK_COOKIE` -+#else -+mcookie=`dd if=/dev/random bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"` -+if x"$mcookie" = x; then -+ echo "Couldn't create cookie" -+ exit 1 -+fi -+#endif - dummy=0 - - XCOMM create a file with auth information for the server. ':0' is a dummy. -@@ -215,8 +222,6 @@ EOF - fi - done - --#endif -- - #if defined(__SCO__) || defined(__UNIXWARE__) - if [ "$REMOTE_SERVER" = "TRUE" ]; then - exec SHELL_CMD ${client} diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile index b5edabcbd966..64c47ea40b81 100644 --- a/x11/xmag/Makefile +++ b/x11/xmag/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xmag -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xmag/distinfo b/x11/xmag/distinfo index d1457369ab63..771733429c19 100644 --- a/x11/xmag/distinfo +++ b/x11/xmag/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xmag-1.0.1.tar.bz2) = 058d168d1c7c991b8d12158433ea5f63 -SHA256 (xorg/app/xmag-1.0.1.tar.bz2) = 1f239057cdfb2164b2e8fc229e2518d20b27a853f975e73618a4a81f09ebeb02 -SIZE (xorg/app/xmag-1.0.1.tar.bz2) = 93719 +MD5 (xorg/app/xmag-1.0.2.tar.bz2) = 7c6a783e42c88360ac31d259a864a19d +SHA256 (xorg/app/xmag-1.0.2.tar.bz2) = 51dd943e607ddd8067fd13cd597998fb00560cbf06450a8c374563a78a86da43 +SIZE (xorg/app/xmag-1.0.2.tar.bz2) = 106793 diff --git a/x11/xman/Makefile b/x11/xman/Makefile index 4b31fda28156..069964b6bbb9 100644 --- a/x11/xman/Makefile +++ b/x11/xman/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xman -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xman/distinfo b/x11/xman/distinfo index 150dd47e8a83..773d58a7ace0 100644 --- a/x11/xman/distinfo +++ b/x11/xman/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xman-1.0.2.tar.bz2) = 855f2dbfa2aff58b8b9cd6a1c1120fad -SHA256 (xorg/app/xman-1.0.2.tar.bz2) = 00bc616892388c94505b09564daffbad2df2e7c684686dea2d78dbcd210212f2 -SIZE (xorg/app/xman-1.0.2.tar.bz2) = 138214 +MD5 (xorg/app/xman-1.0.3.tar.bz2) = 3d3a4b310a65ccce82472ef83acbbf97 +SHA256 (xorg/app/xman-1.0.3.tar.bz2) = 38e03bfa2d3d109d55342e3539be952268e405fb458fb8c4f87739594a25394a +SIZE (xorg/app/xman-1.0.3.tar.bz2) = 142846 diff --git a/x11/xmessage/Makefile b/x11/xmessage/Makefile index 050a3ab2cfd0..61f40ff22dae 100644 --- a/x11/xmessage/Makefile +++ b/x11/xmessage/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xmessage -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xmessage/distinfo b/x11/xmessage/distinfo index 022e7a0291ce..1d795d74c182 100644 --- a/x11/xmessage/distinfo +++ b/x11/xmessage/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xmessage-1.0.1.tar.bz2) = b3674c3a00a089764d86aa94e257ccec -SHA256 (xorg/app/xmessage-1.0.1.tar.bz2) = b921aef62c2a2f5c32048502cd96630e9d42493cd39d1841fde247274f24bbda -SIZE (xorg/app/xmessage-1.0.1.tar.bz2) = 83465 +MD5 (xorg/app/xmessage-1.0.2.tar.bz2) = b4b561ef11fd184989a6062962e86748 +SHA256 (xorg/app/xmessage-1.0.2.tar.bz2) = 02b4016e93acab94105fa61f6dbe13082669276ab4650b871835fb7884b0c3c3 +SIZE (xorg/app/xmessage-1.0.2.tar.bz2) = 94805 diff --git a/x11/xmodmap/Makefile b/x11/xmodmap/Makefile index 4674c0dff9bb..c252f7b22bf1 100644 --- a/x11/xmodmap/Makefile +++ b/x11/xmodmap/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xmodmap -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xmodmap/distinfo b/x11/xmodmap/distinfo index d199a6bd64b5..1fbcd64f9b46 100644 --- a/x11/xmodmap/distinfo +++ b/x11/xmodmap/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xmodmap-1.0.2.tar.bz2) = ea78b3e32e27c3662f86ea68b3aec22f -SHA256 (xorg/app/xmodmap-1.0.2.tar.bz2) = 4bed79ba6efcaabb3ce055cf88419a5190f8ab9d3408e7b14d722351cbaf4b44 -SIZE (xorg/app/xmodmap-1.0.2.tar.bz2) = 94755 +MD5 (xorg/app/xmodmap-1.0.3.tar.bz2) = 626731003ec22a74ecf9e44ed098bbdf +SHA256 (xorg/app/xmodmap-1.0.3.tar.bz2) = c3bfc724792858222c138c1ae9a017e69e7d3bdda3fc9f5da38b232ab031147f +SIZE (xorg/app/xmodmap-1.0.3.tar.bz2) = 102730 diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile index 5ebb3fcb337c..6188712b4d16 100644 --- a/x11/xorg-apps/Makefile +++ b/x11/xorg-apps/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-apps -PORTVERSION= 7.2 +PORTVERSION= 7.3 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none @@ -44,6 +44,7 @@ RUN_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ 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 \ diff --git a/x11/xorg-docs/Makefile b/x11/xorg-docs/Makefile index 81f6c429fd16..aa91641ec1a8 100644 --- a/x11/xorg-docs/Makefile +++ b/x11/xorg-docs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-docs -PORTVERSION= 1.3 +PORTVERSION= 1.4 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/xorg-docs/distinfo b/x11/xorg-docs/distinfo index 5744a5a00b44..ab078fe744de 100644 --- a/x11/xorg-docs/distinfo +++ b/x11/xorg-docs/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/doc/xorg-docs-1.3.tar.bz2) = 792d41a7a9f2e652b2ede4538c4bdf14 -SHA256 (xorg/doc/xorg-docs-1.3.tar.bz2) = 589072096406e67d467de3ec83a66da1ae65bf51a8fd25c8958b0fc54a78d9a1 -SIZE (xorg/doc/xorg-docs-1.3.tar.bz2) = 8248288 +MD5 (xorg/doc/xorg-docs-1.4.tar.bz2) = 4f2005bdd430a98c262901383459009e +SHA256 (xorg/doc/xorg-docs-1.4.tar.bz2) = fffc67e50ce396e6ddd95e842fa8351954b8f09cb729a9a062e0496a8bda4925 +SIZE (xorg/doc/xorg-docs-1.4.tar.bz2) = 8300321 diff --git a/x11/xorg-docs/pkg-plist b/x11/xorg-docs/pkg-plist index ef07c6d420fc..33fde33489f8 100644 --- a/x11/xorg-docs/pkg-plist +++ b/x11/xorg-docs/pkg-plist @@ -80,6 +80,20 @@ share/X11/doc/hardcopy/xtrans/Xtrans.PS.gz share/X11/doc/hardcopy/Xv/video share/X11/doc/hardcopy/Xv/xv-protocol-v2.PS share/X11/doc/MAINTAINERS +@exec mkdir -p %D/share/X11/doc/core +@exec mkdir -p %D/share/X11/doc/ddx +@exec mkdir -p %D/share/X11/doc/fonts +@exec mkdir -p %D/share/X11/doc/graphics +@exec mkdir -p %D/share/X11/doc/input +@exec mkdir -p %D/share/X11/doc/output +@exec mkdir -p %D/share/X11/doc/platforms +@exec mkdir -p %D/share/X11/doc/registry +@exec mkdir -p %D/share/X11/doc/security +@dirrm share/X11/doc/security +@dirrm share/X11/doc/registry +@dirrm share/X11/doc/platforms +@dirrm share/X11/doc/output +@dirrm share/X11/doc/input @dirrm share/X11/doc/hardcopy/BDF @dirrm share/X11/doc/hardcopy/CTEXT @dirrm share/X11/doc/hardcopy/FSProtocol @@ -108,5 +122,9 @@ share/X11/doc/MAINTAINERS @dirrm share/X11/doc/hardcopy/xtrans @dirrm share/X11/doc/hardcopy/Xv @dirrm share/X11/doc/hardcopy +@dirrm share/X11/doc/graphics +@dirrm share/X11/doc/fonts +@dirrm share/X11/doc/ddx +@dirrm share/X11/doc/core @dirrm share/X11/doc @dirrmtry share/X11 diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile index 1863d5d466fe..756a13a129e1 100644 --- a/x11/xorg-libraries/Makefile +++ b/x11/xorg-libraries/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xorg-libraries -PORTVERSION= 7.2 -PORTREVISION= 2 +PORTVERSION= 7.3 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none @@ -20,8 +19,6 @@ NO_BUILD= yes PREFIX?= ${X11BASE} -# Needs: libGL - RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \ ${X11BASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \ ${X11BASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache \ @@ -63,7 +60,8 @@ RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \ ${X11BASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \ ${X11BASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans \ ${X11BASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS \ - ${X11BASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX + ${X11BASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX \ + ${X11BASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman .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 2cfa35154d01..92d043b9823d 100644 --- a/x11/xorg-protos/Makefile +++ b/x11/xorg-protos/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg-protos -PORTVERSION= 7.2 +PORTVERSION= 7.3 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile index 1337bc11183c..fcebb0c8dd22 100644 --- a/x11/xorg/Makefile +++ b/x11/xorg/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xorg -PORTVERSION= 7.2 +PORTVERSION= 7.3 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none @@ -35,10 +35,9 @@ RUN_DEPENDS+= ${X11BASE}/libdata/xorg/apps:${PORTSDIR}/x11/xorg-apps \ ${X11BASE}/libdata/xorg/protos:${PORTSDIR}/x11/xorg-protos \ ${X11BASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server -.if defined(COMPLETE_BUILD) +.if defined(XORG_COMPLETE) RUN_DEPENDS+= Xnest:${PORTSDIR}/x11-servers/xorg-nestserver \ Xdmx:${PORTSDIR}/x11-servers/xorg-dmx \ - Xprt:${PORTSDIR}/x11-servers/xorg-printserver \ Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver .endif diff --git a/x11/xprop/Makefile b/x11/xprop/Makefile index cef614ec73b1..65912f744dba 100644 --- a/x11/xprop/Makefile +++ b/x11/xprop/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xprop -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xprop/distinfo b/x11/xprop/distinfo index 590dca6cee33..d134e1589102 100644 --- a/x11/xprop/distinfo +++ b/x11/xprop/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xprop-1.0.2.tar.bz2) = 5b6f02a3b1cda0cadc35f84814fe53d4 -SHA256 (xorg/app/xprop-1.0.2.tar.bz2) = 88b1e65703c68f14ac6cb735737d1a0e52751a18fdc8a39d2d1e5eaa07875ca0 -SIZE (xorg/app/xprop-1.0.2.tar.bz2) = 99762 +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 diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile index d1b9a6beaa31..c289a5bf1de6 100644 --- a/x11/xrandr/Makefile +++ b/x11/xrandr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xrandr -PORTVERSION= 1.2.0 +PORTVERSION= 1.2.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xrandr/distinfo b/x11/xrandr/distinfo index bf9c8ce2ab4b..bf733e1702dd 100644 --- a/x11/xrandr/distinfo +++ b/x11/xrandr/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xrandr-1.2.0.tar.bz2) = 9e74e6919cf731ec10ce26fd6a4483fa -SHA256 (xorg/app/xrandr-1.2.0.tar.bz2) = 7bf3bd3cf46a6a29e35b9dd1c8d3d14494be76da0d24c6ef5dab36974445004d -SIZE (xorg/app/xrandr-1.2.0.tar.bz2) = 92498 +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 diff --git a/x11/xrdb/Makefile b/x11/xrdb/Makefile index 7927276ea3b2..e0d38abe4dbf 100644 --- a/x11/xrdb/Makefile +++ b/x11/xrdb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xrdb -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xrdb/distinfo b/x11/xrdb/distinfo index 91eb1b10a9d4..edc775def489 100644 --- a/x11/xrdb/distinfo +++ b/x11/xrdb/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xrdb-1.0.3.tar.bz2) = 380b2ef545306354cc150834de567be7 -SHA256 (xorg/app/xrdb-1.0.3.tar.bz2) = a4a3b8cd821adc201a072f8c0214d73ee6a7e7b898de90e18f7d89a4453fb12c -SIZE (xorg/app/xrdb-1.0.3.tar.bz2) = 99840 +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 diff --git a/x11/xset/Makefile b/x11/xset/Makefile index f26644fda9eb..e6f03e2782fd 100644 --- a/x11/xset/Makefile +++ b/x11/xset/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xset -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xset/distinfo b/x11/xset/distinfo index bf8a79c6e067..accb4a2412eb 100644 --- a/x11/xset/distinfo +++ b/x11/xset/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xset-1.0.2.tar.bz2) = 1b781a0802c7b8fb9619a6665607b3f0 -SHA256 (xorg/app/xset-1.0.2.tar.bz2) = ce1e17c513a4499526e648a59c39ba01777c99c86093433cf392f27654b795c9 -SIZE (xorg/app/xset-1.0.2.tar.bz2) = 92940 +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 diff --git a/x11/xsetpointer/Makefile b/x11/xsetpointer/Makefile index 0f73574a928b..5e38412bfef7 100644 --- a/x11/xsetpointer/Makefile +++ b/x11/xsetpointer/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xsetpointer -PORTVERSION= 1.0.0 +PORTVERSION= 1.0.1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xsetpointer/distinfo b/x11/xsetpointer/distinfo index cef7fe3428f3..f630ef3d2acc 100644 --- a/x11/xsetpointer/distinfo +++ b/x11/xsetpointer/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xsetpointer-1.0.0.tar.bz2) = c94ea103e27e370e4e5030e50c5d5d69 -SHA256 (xorg/app/xsetpointer-1.0.0.tar.bz2) = 7d65f450420b4f764dcf38e4ccee9d608b5a5874706e716cb861bfe2586b7d4a -SIZE (xorg/app/xsetpointer-1.0.0.tar.bz2) = 73861 +MD5 (xorg/app/xsetpointer-1.0.1.tar.bz2) = 9e5bcbeda4aaf02bfa095e41d30baee4 +SHA256 (xorg/app/xsetpointer-1.0.1.tar.bz2) = 495d88871eb5081e98bbae55f813f73cb3ce4145d6ca3e8f2826800166c04571 +SIZE (xorg/app/xsetpointer-1.0.1.tar.bz2) = 83260 diff --git a/x11/xsetroot/Makefile b/x11/xsetroot/Makefile index bfc0700ee62e..796333308f54 100644 --- a/x11/xsetroot/Makefile +++ b/x11/xsetroot/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xsetroot -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xsetroot/distinfo b/x11/xsetroot/distinfo index b682db4c3cbf..f5f9b99aae52 100644 --- a/x11/xsetroot/distinfo +++ b/x11/xsetroot/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xsetroot-1.0.1.tar.bz2) = fc7eeb7130bb54345671a9dbaab567ac -SHA256 (xorg/app/xsetroot-1.0.1.tar.bz2) = 897d77acd3f4a366472386139827eaac24cc423c811ef0e65e0d5eca099a3155 -SIZE (xorg/app/xsetroot-1.0.1.tar.bz2) = 77709 +MD5 (xorg/app/xsetroot-1.0.2.tar.bz2) = 9af7db9f3052aef0b11636720b3101dd +SHA256 (xorg/app/xsetroot-1.0.2.tar.bz2) = 4f9a751f4830d479fae8ccb68ed04896dc99612789310b7917bd15c04aa3351d +SIZE (xorg/app/xsetroot-1.0.2.tar.bz2) = 88136 diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile index 509a9a060033..d351b70d8340 100644 --- a/x11/xtrans/Makefile +++ b/x11/xtrans/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xtrans -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xtrans/distinfo b/x11/xtrans/distinfo index be976168456e..bc5bfd6f7588 100644 --- a/x11/xtrans/distinfo +++ b/x11/xtrans/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/xtrans-1.0.3.tar.bz2) = bb196907ea1e182dcb396eb22f7d2c1a -SHA256 (xorg/lib/xtrans-1.0.3.tar.bz2) = e1a3c4986f16a5fbca611d0547cc7499a1fa47ca2096593644037e2609363085 -SIZE (xorg/lib/xtrans-1.0.3.tar.bz2) = 102657 +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 diff --git a/x11/xvinfo/Makefile b/x11/xvinfo/Makefile index 2ce5daba6c65..80dfc8a71a86 100644 --- a/x11/xvinfo/Makefile +++ b/x11/xvinfo/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xvinfo -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xvinfo/distinfo b/x11/xvinfo/distinfo index 5fa630b6b907..139b7efd11d7 100644 --- a/x11/xvinfo/distinfo +++ b/x11/xvinfo/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xvinfo-1.0.1.tar.bz2) = 0a5bd8e43de6eb8ff5b5bc673204401d -SHA256 (xorg/app/xvinfo-1.0.1.tar.bz2) = 439b3c7ad96fc7b1ef9156c716e10b607883a9a58b777f8dc02f03284eb33fb3 -SIZE (xorg/app/xvinfo-1.0.1.tar.bz2) = 74829 +MD5 (xorg/app/xvinfo-1.0.2.tar.bz2) = e1e318436f49e2f0f3764593dadd9ad2 +SHA256 (xorg/app/xvinfo-1.0.2.tar.bz2) = 126e2a612ac723f9688904fcfa612688d62e520ce55c56eb34eb5390074cf150 +SIZE (xorg/app/xvinfo-1.0.2.tar.bz2) = 86657 diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile index ef0e33221cdb..9c2760db07d0 100644 --- a/x11/xwininfo/Makefile +++ b/x11/xwininfo/Makefile @@ -6,7 +6,7 @@ # PORTNAME= xwininfo -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xwininfo/distinfo b/x11/xwininfo/distinfo index 56c05096d87f..e419fc49aec8 100644 --- a/x11/xwininfo/distinfo +++ b/x11/xwininfo/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xwininfo-1.0.2.tar.bz2) = e5dbc8866a55958297f5f38205b6be1e -SHA256 (xorg/app/xwininfo-1.0.2.tar.bz2) = 9fdfd3259b335531cdba831872ec0e32c5f6df01e14b87c3187b494be75b7b66 -SIZE (xorg/app/xwininfo-1.0.2.tar.bz2) = 91625 +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 |