diff options
Diffstat (limited to 'x11-servers')
27 files changed, 147 insertions, 406 deletions
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 |