Attachment #179056 for bug #214591





COMMENT=	X server from X.Org based on kdrive

LICENSE=	MIT

LIB_DEPENDS+=	libxcb-image.so:x11/xcb-util-image \
		libxcb-icccm.so:x11/xcb-util-wm \
		libxcb-keysyms.so:x11/xcb-util-keysyms \
		libxcb-render-util.so:x11/xcb-util-renderutil \
		libxcb-util.so:x11/xcb-util

MASTERDIR=	${.CURDIR}/../xorg-server
DESCR=		${.CURDIR}/pkg-descr
USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
		dri2proto damageproto xcmiscproto xtrans inputproto \
		xf86bigfontproto scrnsaverproto bigreqsproto \
		resourceproto fontsproto videoproto \
		compositeproto trapproto recordproto \
		xineramaproto xinerama evieproto xkbfile xfont \
		xau xdmcp xext fontenc xv pixman presentproto

SLAVE_PORT=	yes
OPTIONS_EXCLUDE=DEVD HAL SUID
		--disable-xnest --localstatedir=/var --without-dtrace

USE_XORG=	x11 xcb

CONFIGURE_ARGS+=--enable-xephyr --disable-dmx --disable-xnest --disable-xvfb \
		--enable-kdrive

PLIST_FILES=	bin/Xephyr man/man1/Xephyr.1.gz

do-install:
	cd ${WRKSRC}/hw/kdrive/ephyr; DESTDIR=${STAGEDIR} ${MAKE} install
	${INSTALL_MAN} ${WRKSRC}/hw/kdrive/ephyr/man/Xephyr.1 ${STAGEDIR}${PREFIX}/man/man1/

.include "${MASTERDIR}/Makefile"

Lines 1-2 Link Here

(-)x11-servers/xephyr/distinfo (-2 lines)
1	SHA256 (xorg/xserver/xorg-server-1.10.4.tar.bz2) = fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
2	SIZE (xorg/xserver/xorg-server-1.10.4.tar.bz2) = 5386174





COMMENT=	Distributed Multihead X from X.Org

LICENSE=	MIT

MASTERDIR=	${.CURDIR}/../xorg-server
DESCR=		${.CURDIR}/pkg-descr
USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
		dri2proto damageproto xcmiscproto xextproto xf86miscproto \
		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
		resourceproto fontsproto xf86dgaproto videoproto \
		compositeproto trapproto recordproto resourceproto \
		xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
		xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
		xau dmx xtst xres pixman xtrans presentproto

CONFIGURE_ARGS=	--disable-xvfb --disable-xnest \
		--without-xmlto	--disable-docs --disable-devel-docs \
		--enable-dmx --localstatedir=/var --without-dtrace

SLAVE_PORT=	yes
OPTIONS_EXCLUDE=DEVD HAL SUID

USE_XORG=	dmx dmxproto x11 xaw7 xext xfixes xi xmu xpm xrender xres xt xtst

CONFIGURE_ARGS+=--enable-dmx --disable-xephyr --disable-xnest --disable-xvfb

do-install:
	cd ${WRKSRC}/hw/dmx; DESTDIR=${STAGEDIR} ${MAKE} install


Lines 1-2 Link Here

(-)x11-servers/xorg-dmx/distinfo (-2 lines)
1	SHA256 (xorg/xserver/xorg-server-1.10.4.tar.bz2) = fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
2	SIZE (xorg/xserver/xorg-server-1.10.4.tar.bz2) = 5386174




PORTNAME=	xorg-nestserver
PORTVERSION=	1.19.1
PORTEPOCH=	2
CATEGORIES=	x11-servers
MASTER_SITES=	XORG/individual/xserver
DISTNAME=	xorg-server-${PORTVERSION}
DIST_SUBDIR=	xorg/xserver

MAINTAINER=	x11@FreeBSD.org
COMMENT=	Nesting X server from X.Org

LICENSE=	MIT

MASTERDIR=	${.CURDIR}/../xorg-server
DESCR=		${.CURDIR}/pkg-descr
DISTINFO_FILE=	${.CURDIR}/distinfo

RUN_DEPENDS=	xkeyboard-config>=2.5:x11/xkeyboard-config

SLAVE_PORT=	yes
OPTIONS_EXCLUDE=DEVD HAL SUID
GNU_CONFIGURE=	yes
CONFIGURE_ARGS= --disable-dmx \
		--disable-xephyr \
		--enable-xnest \
		--disable-xfbdev \
		--disable-kdrive \
		--disable-xfake \
		--disable-screensaver \
		--disable-xwin \
		--disable-xwayland \
		--disable-xorg \
		--without-xmlto \
		--disable-docs \
		--disable-devel-docs \
		--localstatedir=/var \
		--without-dtrace \
		--without-doxygen \
		--disable-glx \
		--disable-dri  \
		--disable-config-hal \
		--disable-libdrm \
		--disable-glx-tls \
		--disable-vbe \
		--disable-vgahw \
		--disable-xvfb \
		--with-fontrootdir=${PREFIX}/share/fonts

USE_XORG=	x11 xext xfont2
		damageproto xcmiscproto xextproto xf86miscproto inputproto \
		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
		dri2proto resourceproto fontsproto xf86dgaproto videoproto \
		compositeproto trapproto recordproto resourceproto \
		xineramaproto xinerama evieproto xkbfile xfont2 fontenc xkbui \
		xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans presentproto

CONFIGURE_ARGS+=--enable-xnest --disable-dmx --disable-xephyr --disable-xvfb
		man/man1/Xnest.1.gz

PLIST_FILES=	bin/Xnest man/man1/Xnest.1.gz

do-install:
	cd ${WRKSRC}/hw/xnest; DESTDIR=${STAGEDIR} ${MAKE} install

.include "${MASTERDIR}/Makefile"




# $FreeBSD$

PORTNAME?=	xorg-server
PORTVERSION?=	1.18.4
PORTREVISION?=	0
PORTEPOCH?=	1
CATEGORIES=	x11-servers


LICENSE=	MIT

LIB_DEPENDS+=	libdrm.so:graphics/libdrm \
		libepoxy.so:graphics/libepoxy
RUN_DEPENDS+=	xkeyboard-config>=2.5:x11/xkeyboard-config \
		xkbcomp:x11/xkbcomp


OPTIONS_SUB=	yes
OPTIONS_DEFINE=	SUID
OPTIONS_RADIO=	CONF
OPTIONS_RADIO_CONF=	DEVD HAL
DEVD_DESC=	Use devd for autoconfiguration of input devices
HAL_DESC=	Use hald for autoconfiguration of input devices
SUID_DESC=	Install the Xorg server with setuid bit set
OPTIONS_DEFAULT=DEVD SUID
DEVD_DESC=	Use devd for autoconfiguration of input devices
OPTIONS_DEFAULT=SUID DEVD

OPTIONS_EXCLUDE_sparc64=	HAL

.include <bsd.port.options.mk>

USES=		gmake libtool perl5 ssl tar:bzip2
USE_PERL5=	build
USE_GL+=	gl
USE_XORG+=	bigreqsproto compositeproto damageproto dri2proto \
		fixesproto fontsproto glproto inputproto kbproto pixman \
		presentproto randrproto recordproto renderproto \
		resourceproto scrnsaverproto videoproto xau \
		xcmiscproto xdmcp xextproto xf86driproto xfont \
		xineramaproto xkbfile xproto xshmfence xtrans
CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \
		--localstatedir=/var --with-shared-memory-dir=/tmp \
		--without-dtrace --disable-xwayland --disable-dri3 --enable-glamor
CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \
		--without-xmlto --disable-docs --disable-devel-docs \
		--localstatedir=/var --without-dtrace --disable-xephyr \
		--enable-record=yes --disable-dri3 --disable-xwayland \
		--enable-glamor
INSTALL_TARGET=	install-strip

.if ${SLAVE_PORT} == "no" || ${PORTNAME} == "xephyr"
LIB_DEPENDS+=	libdrm.so:graphics/libdrm \
		libepoxy.so:graphics/libepoxy
.endif

.if ${SLAVE_PORT} == "no"
USE_GL+=	gbm
USE_XORG+=	pciaccess xf86dgaproto xf86vidmodeproto
CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb
SUB_FILES=	pkg-install pkg-deinstall
.else
CONFIGURE_ARGS+=--disable-xorg
# for slave ports we need to overwrite PLIST, so it doesn't overwrite
# PLIST_FILES, with the masterport plist.
PLIST=		${.CURDIR}/pkg-plist
.endif

.include <bsd.port.pre.mk>

.if ${SSL_DEFAULT} == base


.if ${PORT_OPTIONS:MHAL}
LIB_DEPENDS+=	libhal.so:sysutils/hal
CONFIGURE_ARGS+=	--enable-config-hal
.else
CONFIGURE_ARGS+=	--disable-config-hal
.endif

# We handle Xorg setuid in the plist. This allows to build xorg-server as a user.
CONFIGURE_ARGS+=--disable-install-setuid

.if ${ARCH} == "i386" || ${ARCH} == "amd64"
LIB_DEPENDS+=	libunwind.so:devel/libunwind
.endif

.if ${ARCH} == "sparc64"
EXTRA_PATCHES+=	${FILESDIR}/extra-arch-ia64
.endif

.if ${ARCH} == powerpc || ${ARCH} == powerpc64
EXTRA_PATCHES+=	${FILESDIR}/extra-arch-powerpc
.endif

.if ${ARCH} == sparc64
PLIST_SUB+=	SPARC64=""
EXTRA_PATCHES+=	${FILESDIR}/extra-arch-sparc64
.else
PLIST_SUB+=	SPARC64="@comment "
.endif

Lines 1-2 Link Here

(-)x11-servers/xorg-server/distinfo (-2 / +3 lines)
1	SHA256 (xorg/xserver/xorg-server-1.17.4.tar.bz2) = 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457	1	TIMESTAMP = 1482894502
2	SIZE (xorg/xserver/xorg-server-1.17.4.tar.bz2) = 5791384	2	SHA256 (xorg/xserver/xorg-server-1.18.4.tar.bz2) = 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8
		3	SIZE (xorg/xserver/xorg-server-1.18.4.tar.bz2) = 6009508




--- hw/xfree86/common/compiler.h.orig	2015-06-05 17:19:40.000000000 +0200
+++ hw/xfree86/common/compiler.h	2015-10-12 15:41:30.817470000 +0200
@@ -968,6 +968,59 @@ inl(unsigned PORT_SIZE port)
 #endif                          /* NDS32_MMIO_SWAP */
 
 #elif defined(__i386__) || defined(__ia64__)
+#if defined(__clang__)
+
+/*
+ * If gcc uses gas rather than the native assembler, the syntax of these
+ * inlines has to be different.		DHD
+ */
+
+static __inline__ void
+outb(unsigned short port, unsigned char val)
+{
+    __asm__ __volatile__("outb %0,%1"::"a"(val), "d"(port));
+}
+
+static __inline__ void
+outw(unsigned short port, unsigned short val)
+{
+    __asm__ __volatile__("outw %0,%1"::"a"(val), "d"(port));
+}
+
+static __inline__ void
+outl(unsigned short port, unsigned int val)
+{
+    __asm__ __volatile__("outl %0,%1"::"a"(val), "d"(port));
+}
+
+static __inline__ unsigned int
+inb(unsigned short port)
+{
+    unsigned char ret;
+    __asm__ __volatile__("inb %1,%0":"=a"(ret):"d"(port));
+
+    return ret;
+}
+
+static __inline__ unsigned int
+inw(unsigned short port)
+{
+    unsigned short ret;
+    __asm__ __volatile__("inw %1,%0":"=a"(ret):"d"(port));
+
+    return ret;
+}
+
+static __inline__ unsigned int
+inl(unsigned short port)
+{
+    unsigned int ret;
+    __asm__ __volatile__("inl %1,%0":"=a"(ret):"d"(port));
+
+    return ret;
+}
+
+#else /* !__clang__, presumable GAS */
 
 static __inline__ void
 outb(unsigned short port, unsigned char val)
@@ -1014,6 +1067,7 @@ inl(unsigned short port)
     return ret;
 }
 
+#endif /* !__clang__, GAS part */
 #endif                          /* arch madness */
 
 #else                           /* !GNUC */




--- configure.dist	2009-06-18 17:05:59.000000000 -0700
+++ configure	2009-06-18 17:08:47.000000000 -0700
@@ -1097,6 +1097,8 @@
 SPARC64_VIDEO_TRUE
 PPC_VIDEO_FALSE
 PPC_VIDEO_TRUE
+IA64_VIDEO_FALSE
+IA64_VIDEO_TRUE
 I386_VIDEO_FALSE
 I386_VIDEO_TRUE
 ARM_VIDEO_FALSE
@@ -19134,6 +19136,7 @@
 	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
 	;;
   ia64*)
+	IA64_VIDEO=yes
   	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
 	;;
   s390*)
@@ -19166,6 +19169,14 @@
   I386_VIDEO_FALSE=
 fi
 
+ if test "x$IA64_VIDEO" = xyes; then
+  IA64_VIDEO_TRUE=
+  IA64_VIDEO_FALSE='#'
+else
+  IA64_VIDEO_TRUE='#'
+  IA64_VIDEO_FALSE=
+fi
+
  if test "x$PPC_VIDEO" = xyes; then
   PPC_VIDEO_TRUE=
   PPC_VIDEO_FALSE='#'
--- hw/xfree86/os-support/bsd/Makefile.in.dist	2009-06-18 17:45:13.000000000 -0700
+++ hw/xfree86/os-support/bsd/Makefile.in	2009-06-18 17:45:19.000000000 -0700
@@ -63,6 +63,7 @@
 @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@am__objects_1 = sparc64_video.lo \
 @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@	ioperm_noop.lo
 @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_TRUE@am__objects_1 = ppc_video.lo
+@IA64_VIDEO_TRUE@am__objects_1 = ia64_video.lo
 @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_TRUE@am__objects_1 = i386_video.lo
 @ALPHA_VIDEO_FALSE@@ARM_VIDEO_TRUE@am__objects_1 = arm_video.lo
 @ALPHA_VIDEO_TRUE@am__objects_1 = alpha_video.lo bsd_ev56.lo \
@@ -393,6 +394,7 @@
 
 @ARM_VIDEO_TRUE@ARCH_SOURCES = arm_video.c
 @I386_VIDEO_TRUE@ARCH_SOURCES = i386_video.c
+@IA64_VIDEO_TRUE@ARCH_SOURCES = ia64_video.c
 @PPC_VIDEO_TRUE@ARCH_SOURCES = ppc_video.c
 
 # Cheat here and piggyback other sparc64 bits on SPARC64_VIDEO.
--- /dev/null	2009-06-18 18:27:23.000000000 -0700
+++ hw/xfree86/os-support/bsd/ia64_video.c	2009-06-18 18:26:02.000000000 -0700
@@ -0,0 +1,150 @@
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+#include "xf86.h"
+#include "xf86Priv.h"
+
+#include "xf86_OSlib.h"
+#include "xf86OSpriv.h"
+
+#include "bus/Pci.h"
+
+#ifndef MAP_FAILED
+#define MAP_FAILED ((caddr_t)-1)
+#endif
+
+
+/***************************************************************************/
+/* Video Memory Mapping section                                            */
+/***************************************************************************/
+
+#define DEV_MEM "/dev/mem"
+
+static pointer ia64MapVidMem(int, unsigned long, unsigned long, int flags);
+static void ia64UnmapVidMem(int, pointer, unsigned long);
+
+Bool xf86EnableIO(void);
+void xf86DisableIO(void);
+
+void
+xf86OSInitVidMem(VidMemInfoPtr pVidMem)
+{
+	pVidMem->linearSupported = TRUE;
+	pVidMem->mapMem = ia64MapVidMem;
+	pVidMem->unmapMem = ia64UnmapVidMem;
+	pVidMem->initialised = TRUE;
+	xf86EnableIO();
+}
+
+
+_X_EXPORT volatile unsigned char *ioBase = MAP_FAILED;
+
+static pointer
+ia64MapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
+{
+	int fd = xf86Info.screenFd;
+	pointer base;
+#ifdef DEBUG
+	xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d", 
+		    Base, Size, fd);
+#endif
+
+	base = mmap(0, Size,
+		    (flags & VIDMEM_READONLY) ?
+		     PROT_READ : (PROT_READ | PROT_WRITE),
+		    MAP_SHARED, fd, Base);
+	if (base == MAP_FAILED)
+		FatalError("%s: could not mmap screen [s=%lx,a=%lx] (%s)",
+			   "xf86MapVidMem", Size, Base, strerror(errno));
+
+	return base;
+}
+
+static void
+ia64UnmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+{
+	munmap(Base, Size);
+}
+
+_X_EXPORT int
+xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
+	     int Len)
+{
+	int rv;
+	static int kmem = -1;
+
+	if (kmem == -1) {
+		kmem = open(DEV_MEM, 2);
+		if (kmem == -1) {
+			FatalError("xf86ReadBIOS: open %s", DEV_MEM);
+		}
+	}
+
+#ifdef DEBUG
+	xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS() %lx %lx, %x\n", 
+		    Base, Offset, Len);
+#endif
+
+
+	lseek(kmem, Base + Offset, 0);
+	rv = read(kmem, Buf, Len);
+
+	return rv;
+}
+
+Bool xf86EnableIO()
+{
+        int fd = xf86Info.screenFd;
+
+        xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
+        if (ioBase == MAP_FAILED)
+        {
+                ioBase=mmap(NULL, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, fd,
+                    0);
+                xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %p\n", ioBase);
+                if (ioBase == MAP_FAILED) {
+                        xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n");
+			return FALSE;
+		}
+        }
+	return TRUE;
+}
+
+void xf86DisableIO()
+{
+
+        if (ioBase != MAP_FAILED)
+        {
+                munmap((void *)(uintptr_t)(void *)ioBase, 0x10000);
+                ioBase = MAP_FAILED;
+        }
+}
+
+void outb(unsigned long port, unsigned char val)
+{
+}
+
+void outw(unsigned long port, unsigned short val)
+{
+}
+
+void outl(unsigned long port, unsigned int val)
+{
+}
+
+unsigned int inb(unsigned long port)
+{
+	return 0xff;
+}
+
+unsigned int inw(unsigned long port)
+{
+	return 0xffff;
+}
+
+unsigned int inl(unsigned long port)
+{
+	return 0xffffffff;
+}




--- hw/xfree86/os-support/bsd/ppc_video.c.orig	2015-06-05 17:19:40.000000000 +0200
+++ hw/xfree86/os-support/bsd/ppc_video.c	2015-10-12 15:23:47.470110000 +0200
@@ -79,7 +79,11 @@ xf86DisableIO()
 {
 
     if (ioBase != MAP_FAILED) {
+#if defined(__FreeBSD__)
+        munmap(__DEVOLATILE(unsigned char *, ioBase), 0x10000);
+#else
         munmap(__UNVOLATILE(ioBase), 0x10000);
+#endif
         ioBase = MAP_FAILED;
     }
 }




--- hw/xfree86/os-support/bsd/bsd_init.c.orig	2012-05-17 19:09:03.000000000 +0200
+++ hw/xfree86/os-support/bsd/bsd_init.c	2013-09-01 20:45:36.000000000 +0200
@@ -230,6 +230,9 @@
              * Add cases for other *BSD that behave the same.
              */
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__sparc64__)
+	    pci_system_init_dev_mem(fd);
+#endif
             uname(&uts);
             i = atof(uts.release) * 100;
             if (i >= 310)




Index: programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c
diff -u -p programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c
--- hw/xfree86/os-support/bsd/i386_video.c.orig	Tue Oct  4 01:46:14 2005
+++ hw/xfree86/os-support/bsd/i386_video.c	Thu Jan 26 14:57:56 2006
@@ -35,6 +35,7 @@
 #include "xf86Priv.h"
 
 #include <errno.h>
+#include <sys/types.h>
 #include <sys/mman.h>
 
 #ifdef HAS_MTRR_SUPPORT




--- hw/xfree86/os-support/misc/Makefile.in.orig	2015-09-23 10:21:18.470900000 +0200
+++ hw/xfree86/os-support/misc/Makefile.in	2015-09-23 10:22:34.979974000 +0200
@@ -530,7 +530,8 @@
 
 #AM_LDFLAGS = -r
 AM_CPPFLAGS = $(XORG_INCS)
-AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
+@I386_VIDEO_TRUE@I386_VIDEO_CFLAGS = -mno-sse
+AM_CFLAGS = $(I386_VIDEO_CFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS)
 EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS)
 all: all-am
 

Lines 1-6 Link Here

(-)x11-servers/xorg-server/files/patch-config_config-backends.h (-3 / +3 lines)
1	--- config/config-backends.h.orig 2014-12-09 22:02:34.000000000 +0100	1	--- config/config-backends.h.orig 2016-07-15 16:17:45 UTC
2	+++ config/config-backends.h 2014-12-21 23:08:34.268311262 +0100	2	+++ config/config-backends.h
3	@@ -44,3 +44,8 @@	3	@@ -44,3 +44,8 @@ void config_hal_fini(void);
4	int config_wscons_init(void);	4	int config_wscons_init(void);
5	void config_wscons_fini(void);	5	void config_wscons_fini(void);
6	#endif	6	#endif




--- config/config.c.orig	2016-07-19 17:07:29 UTC
+++ config/config.c
@@ -55,6 +55,9 @@ config_init(void)
 #elif defined(CONFIG_WSCONS)
     if (!config_wscons_init())
         ErrorF("[config] failed to initialise wscons\n");
+#elif defined(CONFIG_DEVD)
+    if (!config_devd_init())
+        ErrorF("[config] failed to initialise devd\n");
 #endif
 }
 
@@ -67,6 +70,8 @@ config_fini(void)
     config_hal_fini();
 #elif defined(CONFIG_WSCONS)
     config_wscons_fini();
+#elif defined(CONFIG_DEVD)
+    config_devd_fini();
 #endif
 }
 




--- config/devd.c.orig	2017-01-18 17:10:11 UTC
+++ config/devd.c
@@ -0,0 +1,532 @@
+/*
+ * Copyright (c) 2012 Baptiste Daroussin
+ * Copyright (c) 2013, 2014 Alex Kozlov

+static int sock_devd;
+static bool is_console_kbd = false;
+static bool is_kbdmux = false;
+static OsTimerPtr rtimer = NULL;
+
+struct hw_type {
+	const char *driver;

+			disconnect_devd(sock_devd);
+			rtimer = TimerSet(NULL, 0, 1, reconnect_handler, NULL);
+			LogMessage(X_WARNING, "config/devd: devd socket is lost\n");
+			free(buf);
+			return -1;
+		}
+		if (c == '\n')




--- configure.orig	2016-07-19 17:27:31 UTC
+++ configure
@@ -18019,7 +18019,7 @@ $as_echo_n "checking whether the $compil
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
   inherit_rpath=no
-  link_all_deplibs=unknown
+  link_all_deplibs=no
   module_cmds=
   module_expsym_cmds=
   old_archive_from_new_cmds=
@@ -18318,7 +18318,7 @@ _LT_EOF
 	wlarc=
       else
 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
       fi
       ;;
 
@@ -18337,7 +18337,7 @@ _LT_EOF
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -18366,7 +18366,7 @@ _LT_EOF
 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	    archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
 	  else
 	    ld_shlibs=no
 	  fi
@@ -18384,7 +18384,7 @@ _LT_EOF
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -19032,7 +19032,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
 	hardcode_direct_absolute=yes
 	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-version-script,$lib-ver'
 	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
 	  export_dynamic_flag_spec='$wl-E'
 	else
@@ -19881,7 +19881,7 @@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      library_names_spec='$libname$release$shared_ext$versuffix  $libname$release$shared_ext$major	 $libname$shared_ext'			 soname_spec='$libname$release$shared_ext$major'
       soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
@@ -21016,7 +21016,7 @@ striplib=
 old_striplib=
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 $as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -21738,7 +21738,7 @@ if test `${RAWCPP} < conftest.$ac_ext | 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 else
-	if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve   \"'` -eq 1 ; then
+	if true; then
 		TRADITIONALCPPFLAGS="-traditional"
 		RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -23168,9 +23168,14 @@ $as_echo "#define USE_ALPHA_PIO 1" >>con
 	esac
 	GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
 	;;

 	;;
   i*86)
 	I386_VIDEO=yes
@@ -25559,7 +25564,7 @@
 case "x$XTRANS_SEND_FDS" in
 xauto)
 	case "$host_os" in
-	linux*|solaris*)
+	linux*|solaris*|freebsd*|dragonfly*)
 		XTRANS_SEND_FDS=yes
 		;;
 	*)

Lines 1-6 Link Here

(-)x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Config.c (-2 / +2 lines)
1	--- hw/xfree86/common/xf86Config.c.orig 2014-04-15 01:01:57 UTC	1	--- hw/xfree86/common/xf86Config.c.orig 2016-07-19 17:14:30 UTC
2	+++ hw/xfree86/common/xf86Config.c	2	+++ hw/xfree86/common/xf86Config.c
3	@@ -1376,13 +1376,16 @@ checkCoreInputDevices(serverLayoutPtr se	3	@@ -1410,13 +1410,16 @@ checkCoreInputDevices(serverLayoutPtr se
4	}	4	}
5		5
6	if (!xf86Info.forceInputDevices && !(foundPointer && foundKeyboard)) {	6	if (!xf86Info.forceInputDevices && !(foundPointer && foundKeyboard)) {

Lines 1-7 Link Here

(-)x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Globals.c (-3 / +3 lines)
1	--- hw/xfree86/common/xf86Globals.c.orig 2014-04-12 15:29:14 UTC	1	--- hw/xfree86/common/xf86Globals.c.orig 2016-07-19 17:07:29 UTC
2	+++ hw/xfree86/common/xf86Globals.c	2	+++ hw/xfree86/common/xf86Globals.c
3	@@ -123,7 +123,8 @@ xf86InfoRec xf86Info = {	3	@@ -122,7 +122,8 @@ xf86InfoRec xf86Info = {
4	.log = LogNone,	4	.pmFlag = TRUE,
5	.disableRandR = FALSE,	5	.disableRandR = FALSE,
6	.randRFrom = X_DEFAULT,	6	.randRFrom = X_DEFAULT,
7	-#if defined(CONFIG_HAL) \|\| defined(CONFIG_UDEV) \|\| defined(CONFIG_WSCONS)	7	-#if defined(CONFIG_HAL) \|\| defined(CONFIG_UDEV) \|\| defined(CONFIG_WSCONS)

Lines 1-5 Link Here

(-)x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86Xinput.c (-2 / +12 lines)
1	Index: hw/xfree86/common/xf86Xinput.c	1	--- hw/xfree86/common/xf86Xinput.c.orig 2016-07-19 17:07:29 UTC
2	@@ -942,6 +942,7 @@	2	+++ hw/xfree86/common/xf86Xinput.c
		3	@@ -841,7 +841,7 @@ xf86NewInputDevice(InputInfoPtr pInfo, D
		4	{
		5	InputDriverPtr drv = NULL;
		6	DeviceIntPtr dev = NULL;
		7	- Bool paused;
		8	+ Bool paused = 0;
		9	int rval;
		10	char *path = NULL;
		11
		12	@@ -996,6 +996,7 @@ NewInputDeviceRequest(InputOption *optio
3	if (strcmp(key, "_source") == 0 &&	13	if (strcmp(key, "_source") == 0 &&
4	(strcmp(value, "server/hal") == 0 \|\|	14	(strcmp(value, "server/hal") == 0 \|\|
5	strcmp(value, "server/udev") == 0 \|\|	15	strcmp(value, "server/udev") == 0 \|\|

Lines 1-6 Link Here

(-)x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_bsd__init.c (-3 / +3 lines)
1	--- hw/xfree86/os-support/bsd/bsd_init.c.orig 2012-05-17 19:09:03.000000000 +0200	1	--- hw/xfree86/os-support/bsd/bsd_init.c.orig 2016-07-19 17:07:29 UTC
2	+++ hw/xfree86/os-support/bsd/bsd_init.c 2013-09-01 20:45:36.000000000 +0200	2	+++ hw/xfree86/os-support/bsd/bsd_init.c
3	@@ -230,6 +230,9 @@	3	@@ -230,6 +230,9 @@ xf86OpenConsole()
4	* Add cases for other *BSD that behave the same.	4	* Add cases for other *BSD that behave the same.
5	*/	5	*/
6	#if defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__)	6	#if defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__)

Lines 1-8 Link Here

(-)x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_i386__video.c (-5 / +4 lines)
1	Index: programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c	1	Index: programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c
2	diff -u -p programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c	2	--- hw/xfree86/os-support/bsd/i386_video.c.orig 2016-07-15 16:18:11 UTC
3	--- hw/xfree86/os-support/bsd/i386_video.c.orig Tue Oct 4 01:46:14 2005	3	+++ hw/xfree86/os-support/bsd/i386_video.c
4	+++ hw/xfree86/os-support/bsd/i386_video.c Thu Jan 26 14:57:56 2006	4	@@ -32,6 +32,7 @@
5	@@ -35,6 +35,7 @@
6	#include "xf86Priv.h"	5	#include "xf86Priv.h"
7		6
8	#include <errno.h>	7	#include <errno.h>
Lines 9-12 Link Here
9	+#include <sys/types.h>	8	+#include <sys/types.h>
10	#include <sys/mman.h>	9	#include <sys/mman.h>
11		10
12	#ifdef HAS_MTRR_SUPPORT	11	#include "xf86_OSlib.h"

Lines 1-5 Link Here

(-)x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_ppc__video.c (-2 / +2 lines)
1	--- hw/xfree86/os-support/bsd/ppc_video.c.orig 2015-06-05 17:19:40.000000000 +0200	1	--- hw/xfree86/os-support/bsd/ppc_video.c.orig 2016-07-15 16:18:11 UTC
2	+++ hw/xfree86/os-support/bsd/ppc_video.c 2015-10-12 15:23:47.470110000 +0200	2	+++ hw/xfree86/os-support/bsd/ppc_video.c
3	@@ -79,7 +79,11 @@ xf86DisableIO()	3	@@ -79,7 +79,11 @@ xf86DisableIO()
4	{	4	{
5		5

Lines 1-6 Link Here

(-)x11-servers/xorg-server/files/patch-xkb_Makefile.in (-3 / +3 lines)
1	--- xkb/Makefile.in.orig 2013-06-16 11:16:48.000000000 +0000	1	--- xkb/Makefile.in.orig 2017-01-18 17:10:11 UTC
2	+++ xkb/Makefile.in 2013-06-16 11:17:08.000000000 +0000	2	+++ xkb/Makefile.in
3	@@ -816,7 +816,7 @@	3	@@ -878,7 +878,7 @@ info: info-am
4		4
5	info-am:	5	info-am:
6		6




include/xorg/damagestr.h
include/xorg/dbestruct.h
include/xorg/dgaproc.h
include/xorg/displaymode.h
include/xorg/dix.h
include/xorg/dixaccess.h
include/xorg/dixevents.h

include/xorg/misyncshm.h
include/xorg/misyncstr.h
include/xorg/mizerarc.h
include/xorg/nonsdk_extinit.h
include/xorg/opaque.h
include/xorg/optionstr.h
include/xorg/os.h

include/xorg/shadowfb.h
include/xorg/shmint.h
include/xorg/site.h
include/xorg/swaprep.h
include/xorg/swapreq.h
include/xorg/syncsdk.h
include/xorg/validate.h
include/xorg/vbe.h
include/xorg/vbeModes.h
include/xorg/vgaHW.h
include/xorg/vidmodeproc.h
include/xorg/wfbrename.h
include/xorg/window.h
include/xorg/windowstr.h

include/xorg/xf86xv.h
include/xorg/xf86xvmc.h
include/xorg/xf86xvpriv.h
include/xorg/xfixes.h
include/xorg/xisb.h
include/xorg/xkbfile.h
include/xorg/xkbrules.h

include/xorg/xorg-server.h
include/xorg/xorgVersion.h
include/xorg/xserver-properties.h
@comment include/xorg/xserver_poll.h
include/xorg/xvdix.h
include/xorg/xvmcext.h
lib/xorg/modules/drivers/modesetting_drv.so




PORTNAME=	xorg-vfbserver
PORTVERSION=	1.19.1
PORTEPOCH=	1
CATEGORIES=	x11-servers
MASTER_SITES=	XORG/individual/xserver
DISTNAME=	xorg-server-${PORTVERSION}
DIST_SUBDIR=	xorg/xserver

MAINTAINER=	x11@FreeBSD.org
COMMENT=	X virtual framebuffer server from X.Org

LICENSE=	MIT

MASTERDIR=	${.CURDIR}/../xorg-server
DESCR=		${.CURDIR}/pkg-descr
DISTINFO_FILE=	${.CURDIR}/distinfo

SLAVE_PORT=	yes
OPTIONS_EXCLUDE=DEVD HAL SUID
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-dmx \
		--disable-xephyr \
		--disable-xnest \
		--disable-kdrive \
		--disable-xfbdev \
		--disable-xfake \
		--disable-screensaver \
		--disable-xwin \
		--disable-xwayland \
		--disable-xorg \
		--without-xmlto \
		--disable-docs \
		--disable-devel-docs \
		--localstatedir=/var \
		--without-dtrace \
		--without-doxygen \
		--disable-glx \
		--disable-dri  \
		--disable-config-hal \
		--disable-libdrm \
		--disable-glx-tls \
		--disable-vbe \
		--disable-vgahw \
		--enable-xvfb \
		--with-fontrootdir=${PREFIX}/share/fonts

USE_XORG=	xfont2
		bigreqsproto randrproto renderproto xextproto inputproto \
		videoproto compositeproto recordproto \
		fontsproto resourceproto xf86driproto glproto \
		presentproto xineramaproto xkbfile xfont2

CONFIGURE_ARGS+=--enable-xvfb --disable-dmx --disable-xephyr --disable-xnest
		man/man1/Xvfb.1.gz

PLIST_FILES=	bin/Xvfb man/man1/Xvfb.1.gz

do-install:
	cd ${WRKSRC}/hw/vfb; DESTDIR=${STAGEDIR} ${MAKE} install

.include "${MASTERDIR}/Makefile"

Return to bug 214591

Lines 4-33 Link Here

(-)x11-servers/xephyr/Makefile (-14 / +12 lines)
4		4
5	COMMENT= X server from X.Org based on kdrive	5	COMMENT= X server from X.Org based on kdrive
6		6
		7	LICENSE= MIT
		8
7	LIB_DEPENDS+= libxcb-image.so:x11/xcb-util-image \	9	LIB_DEPENDS+= libxcb-image.so:x11/xcb-util-image \
8	libxcb-icccm.so:x11/xcb-util-wm \	10	libxcb-icccm.so:x11/xcb-util-wm \
9	libxcb-keysyms.so:x11/xcb-util-keysyms \	11	libxcb-keysyms.so:x11/xcb-util-keysyms \
10	libxcb-render-util.so:x11/xcb-util-renderutil	12	libxcb-render-util.so:x11/xcb-util-renderutil \
		13	libxcb-util.so:x11/xcb-util
11		14
12	MASTERDIR= ${.CURDIR}/../xorg-server	15	MASTERDIR= ${.CURDIR}/../xorg-server
13	DESCR= ${.CURDIR}/pkg-descr	16	DESCR= ${.CURDIR}/pkg-descr
14	USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \
15	dri2proto damageproto xcmiscproto xtrans inputproto \
16	xf86bigfontproto scrnsaverproto bigreqsproto \
17	resourceproto fontsproto videoproto \
18	compositeproto trapproto recordproto \
19	xineramaproto xinerama evieproto xkbfile xfont \
20	xau xdmcp xext fontenc xv pixman presentproto
21		17
22	CONFIGURE_ARGS= --enable-kdrive --enable-xephyr --disable-dmx --disable-xvfb \	18	SLAVE_PORT= yes
23	--without-xmlto --disable-docs --disable-devel-docs \	19	OPTIONS_EXCLUDE=DEVD HAL SUID
24	--disable-xnest --localstatedir=/var --without-dtrace
25		20
26	SLAVE_PORT= yes	21	USE_XORG= x11 xcb
		22
		23	CONFIGURE_ARGS+=--enable-xephyr --disable-dmx --disable-xnest --disable-xvfb \
		24	--enable-kdrive
		25
27	PLIST_FILES= bin/Xephyr man/man1/Xephyr.1.gz	26	PLIST_FILES= bin/Xephyr man/man1/Xephyr.1.gz
28		27
29	do-install:	28	do-install:
30	${INSTALL_PROGRAM} ${WRKSRC}/hw/kdrive/ephyr/Xephyr ${STAGEDIR}${PREFIX}/bin/	29	cd ${WRKSRC}/hw/kdrive/ephyr; DESTDIR=${STAGEDIR} ${MAKE} install
31	${INSTALL_MAN} ${WRKSRC}/hw/kdrive/ephyr/man/Xephyr.1 ${STAGEDIR}${PREFIX}/man/man1/
32		30
33	.include "${MASTERDIR}/Makefile"	31	.include "${MASTERDIR}/Makefile"

Lines 5-27 Link Here

(-)x11-servers/xorg-dmx/Makefile (-12 / +7 lines)
5		5
6	COMMENT= Distributed Multihead X from X.Org	6	COMMENT= Distributed Multihead X from X.Org
7		7
		8	LICENSE= MIT
		9
8	MASTERDIR= ${.CURDIR}/../xorg-server	10	MASTERDIR= ${.CURDIR}/../xorg-server
9	DESCR= ${.CURDIR}/pkg-descr	11	DESCR= ${.CURDIR}/pkg-descr
10	USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \
11	dri2proto damageproto xcmiscproto xextproto xf86miscproto \
12	xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
13	resourceproto fontsproto xf86dgaproto videoproto \
14	compositeproto trapproto recordproto resourceproto \
15	xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
16	xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
17	xau dmx xtst xres pixman xtrans presentproto
18		12
19	CONFIGURE_ARGS= --disable-xvfb --disable-xnest \
20	--without-xmlto --disable-docs --disable-devel-docs \
21	--enable-dmx --localstatedir=/var --without-dtrace
22
23	SLAVE_PORT= yes	13	SLAVE_PORT= yes
		14	OPTIONS_EXCLUDE=DEVD HAL SUID
24		15
		16	USE_XORG= dmx dmxproto x11 xaw7 xext xfixes xi xmu xpm xrender xres xt xtst
		17
		18	CONFIGURE_ARGS+=--enable-dmx --disable-xephyr --disable-xnest --disable-xvfb
		19
25	do-install:	20	do-install:
26	cd ${WRKSRC}/hw/dmx; DESTDIR=${STAGEDIR} ${MAKE} install	21	cd ${WRKSRC}/hw/dmx; DESTDIR=${STAGEDIR} ${MAKE} install
27		22

Lines 4-60 Link Here

(-)x11-servers/xorg-nestserver/Makefile (-44 / +14 lines)
4	PORTNAME= xorg-nestserver	4	PORTNAME= xorg-nestserver
5	PORTVERSION= 1.19.1	5	PORTVERSION= 1.19.1
6	PORTEPOCH= 2	6	PORTEPOCH= 2
7	CATEGORIES= x11-servers
8	MASTER_SITES= XORG/individual/xserver
9	DISTNAME= xorg-server-${PORTVERSION}
10	DIST_SUBDIR= xorg/xserver
11		7
12	MAINTAINER= x11@FreeBSD.org
13	COMMENT= Nesting X server from X.Org	8	COMMENT= Nesting X server from X.Org
14		9
15	LICENSE= MIT	10	LICENSE= MIT
16		11
17	LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms	12	MASTERDIR= ${.CURDIR}/../xorg-server
		13	DESCR= ${.CURDIR}/pkg-descr
		14	DISTINFO_FILE= ${.CURDIR}/distinfo
		15
18	RUN_DEPENDS= xkeyboard-config>=2.5:x11/xkeyboard-config	16	RUN_DEPENDS= xkeyboard-config>=2.5:x11/xkeyboard-config
19		17
20	USES= tar:bzip2 pkgconfig ssl	18	SLAVE_PORT= yes
21	INSTALL_WRKSRC= ${WRKSRC}/hw/xnest	19	OPTIONS_EXCLUDE=DEVD HAL SUID
22	GNU_CONFIGURE= yes
23	CONFIGURE_ARGS= --disable-dmx \
24	--disable-xephyr \
25	--enable-xnest \
26	--disable-xfbdev \
27	--disable-kdrive \
28	--disable-xfake \
29	--disable-screensaver \
30	--disable-xwin \
31	--disable-xwayland \
32	--disable-xorg \
33	--without-xmlto \
34	--disable-docs \
35	--disable-devel-docs \
36	--localstatedir=/var \
37	--without-dtrace \
38	--without-doxygen \
39	--disable-glx \
40	--disable-dri \
41	--disable-config-hal \
42	--disable-libdrm \
43	--disable-glx-tls \
44	--disable-vbe \
45	--disable-vgahw \
46	--disable-xvfb \
47	--with-fontrootdir=${PREFIX}/share/fonts
48		20
49	USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \	21	USE_XORG= x11 xext xfont2
50	damageproto xcmiscproto xextproto xf86miscproto inputproto \
51	xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
52	dri2proto resourceproto fontsproto xf86dgaproto videoproto \
53	compositeproto trapproto recordproto resourceproto \
54	xineramaproto xinerama evieproto xkbfile xfont2 fontenc xkbui \
55	xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans presentproto
56		22
57	PLIST_FILES= bin/Xnest \	23	CONFIGURE_ARGS+=--enable-xnest --disable-dmx --disable-xephyr --disable-xvfb
58	man/man1/Xnest.1.gz
59		24
60	.include <bsd.port.mk>	25	PLIST_FILES= bin/Xnest man/man1/Xnest.1.gz
		26
		27	do-install:
		28	cd ${WRKSRC}/hw/xnest; DESTDIR=${STAGEDIR} ${MAKE} install
		29
		30	.include "${MASTERDIR}/Makefile"

Lines 2-8 Link Here

(-)x11-servers/xorg-server/Makefile (-37 / +30 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= xorg-server	4	PORTNAME?= xorg-server
5	PORTVERSION= 1.17.4	5	PORTVERSION?= 1.18.4
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	PORTEPOCH?= 1	7	PORTEPOCH?= 1
8	CATEGORIES= x11-servers	8	CATEGORIES= x11-servers
Lines 14-21 Link Here
14		14
15	LICENSE= MIT	15	LICENSE= MIT
16		16
17	LIB_DEPENDS+= libdrm.so:graphics/libdrm \
18	libepoxy.so:graphics/libepoxy
19	RUN_DEPENDS+= xkeyboard-config>=2.5:x11/xkeyboard-config \	17	RUN_DEPENDS+= xkeyboard-config>=2.5:x11/xkeyboard-config \
20	xkbcomp:x11/xkbcomp	18	xkbcomp:x11/xkbcomp
21		19
Lines 25-67 Link Here
25	OPTIONS_SUB= yes	23	OPTIONS_SUB= yes
26	OPTIONS_DEFINE= SUID	24	OPTIONS_DEFINE= SUID
27	OPTIONS_RADIO= CONF	25	OPTIONS_RADIO= CONF
28	OPTIONS_RADIO_CONF= HAL DEVD	26	OPTIONS_RADIO_CONF= DEVD HAL
		27	DEVD_DESC= Use devd for autoconfiguration of input devices
		28	HAL_DESC= Use hald for autoconfiguration of input devices
29	SUID_DESC= Install the Xorg server with setuid bit set	29	SUID_DESC= Install the Xorg server with setuid bit set
30	HAL_DESC= Compile with HAL config support	30	OPTIONS_DEFAULT=DEVD SUID
31	DEVD_DESC= Use devd for autoconfiguration of input devices
32	OPTIONS_DEFAULT=SUID DEVD
33		31
34	OPTIONS_EXCLUDE_sparc64= HAL	32	OPTIONS_EXCLUDE_sparc64= HAL
35		33
36	.include <bsd.port.options.mk>	34	.include <bsd.port.options.mk>
37		35
38	USES= gmake libtool perl5 tar:bzip2	36	USES= gmake libtool perl5 ssl tar:bzip2
39	USE_PERL5= build	37	USE_PERL5= build
40	USE_GL= gbm egl gl	38	USE_GL+= gl
41	USE_XORG?= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \	39	USE_XORG+= bigreqsproto compositeproto damageproto dri2proto \
42	xmu xt xpm xext randrproto renderproto fixesproto damageproto \	40	fixesproto fontsproto glproto inputproto kbproto pixman \
43	dri2proto xcmiscproto xextproto xproto xtrans \	41	presentproto randrproto recordproto renderproto \
44	xf86miscproto xf86vidmodeproto xf86bigfontproto scrnsaverproto \	42	resourceproto scrnsaverproto videoproto xau \
45	bigreqsproto resourceproto fontsproto inputproto xf86dgaproto \	43	xcmiscproto xdmcp xextproto xf86driproto xfont \
46	videoproto compositeproto trapproto presentproto recordproto \	44	xineramaproto xkbfile xproto xshmfence xtrans
47	xineramaproto xinerama evieproto xfont fontenc xkbui pixman \	45	CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \
48	pciaccess xshmfence	46	--localstatedir=/var --with-shared-memory-dir=/tmp \
49	USE_OPENSSL= yes	47	--without-dtrace --disable-xwayland --disable-dri3 --enable-glamor
50	CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \
51	--without-xmlto --disable-docs --disable-devel-docs \
52	--localstatedir=/var --without-dtrace --disable-xephyr \
53	--enable-record=yes --disable-dri3 --disable-xwayland \
54	--enable-glamor
55	INSTALL_TARGET= install-strip	48	INSTALL_TARGET= install-strip
56		49
		50	.if ${SLAVE_PORT} == "no" \|\| ${PORTNAME} == "xephyr"
		51	LIB_DEPENDS+= libdrm.so:graphics/libdrm \
		52	libepoxy.so:graphics/libepoxy
		53	.endif
		54
57	.if ${SLAVE_PORT} == "no"	55	.if ${SLAVE_PORT} == "no"
		56	USE_GL+= gbm
		57	USE_XORG+= pciaccess xf86dgaproto xf86vidmodeproto
		58	CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb
58	SUB_FILES= pkg-install pkg-deinstall	59	SUB_FILES= pkg-install pkg-deinstall
59	.else	60	.else
		61	CONFIGURE_ARGS+=--disable-xorg
60	# for slave ports we need to overwrite PLIST, so it doesn't overwrite	62	# for slave ports we need to overwrite PLIST, so it doesn't overwrite
61	# PLIST_FILES, with the masterport plist.	63	# PLIST_FILES, with the masterport plist.
62	PLIST= ${.CURDIR}/pkg-plist	64	PLIST= ${.CURDIR}/pkg-plist
63	.endif	65	.endif
64		66
65	.include <bsd.port.pre.mk>	67	.include <bsd.port.pre.mk>
66		68
67	.if ${SSL_DEFAULT} == base	69	.if ${SSL_DEFAULT} == base
Lines 73-101 Link Here
73		75
74	.if ${PORT_OPTIONS:MHAL}	76	.if ${PORT_OPTIONS:MHAL}
75	LIB_DEPENDS+= libhal.so:sysutils/hal	77	LIB_DEPENDS+= libhal.so:sysutils/hal
76	CONFIGURE_ARGS+= --enable-config-hal=yes	78	CONFIGURE_ARGS+= --enable-config-hal
77	.else	79	.else
78	CONFIGURE_ARGS+= --enable-config-hal=no	80	CONFIGURE_ARGS+= --disable-config-hal
79	.endif	81	.endif
80		82
81	# We handle Xorg setuid in the plist. This allows to build xorg-server as a user.	83	# We handle Xorg setuid in the plist. This allows to build xorg-server as a user.
82	CONFIGURE_ARGS+=--disable-install-setuid	84	CONFIGURE_ARGS+=--disable-install-setuid
83		85
84	.if ${ARCH} == i386	86	.if ${ARCH} == "i386" \|\| ${ARCH} == "amd64"
85	EXTRA_PATCHES+= ${FILESDIR}/extra-arch-i386	87	LIB_DEPENDS+= libunwind.so:devel/libunwind
86	.endif	88	.endif
87		89
88	.if ${ARCH} == ia64	90	.if ${ARCH} == "sparc64"
89	EXTRA_PATCHES+= ${FILESDIR}/extra-arch-ia64
90	.endif
91
92	.if ${ARCH} == powerpc \|\| ${ARCH} == powerpc64
93	EXTRA_PATCHES+= ${FILESDIR}/extra-arch-powerpc
94	.endif
95
96	.if ${ARCH} == sparc64
97	PLIST_SUB+= SPARC64=""	91	PLIST_SUB+= SPARC64=""
98	EXTRA_PATCHES+= ${FILESDIR}/extra-arch-sparc64
99	.else	92	.else
100	PLIST_SUB+= SPARC64="@comment "	93	PLIST_SUB+= SPARC64="@comment "
101	.endif	94	.endif

Lines 1-70 Link Here

(-)x11-servers/xorg-server/files/extra-arch-i386 (-70 lines)
1	--- hw/xfree86/common/compiler.h.orig 2015-06-05 17:19:40.000000000 +0200
2	+++ hw/xfree86/common/compiler.h 2015-10-12 15:41:30.817470000 +0200
3	@@ -968,6 +968,59 @@ inl(unsigned PORT_SIZE port)
4	#endif /* NDS32_MMIO_SWAP */
5
6	#elif defined(__i386__) \|\| defined(__ia64__)
7	+#if defined(__clang__)
8	+
9	+/*
10	+ * If gcc uses gas rather than the native assembler, the syntax of these
11	+ * inlines has to be different. DHD
12	+ */
13	+
14	+static __inline__ void
15	+outb(unsigned short port, unsigned char val)
16	+{
17	+ __asm__ __volatile__("outb %0,%1"::"a"(val), "d"(port));
18	+}
19	+
20	+static __inline__ void
21	+outw(unsigned short port, unsigned short val)
22	+{
23	+ __asm__ __volatile__("outw %0,%1"::"a"(val), "d"(port));
24	+}
25	+
26	+static __inline__ void
27	+outl(unsigned short port, unsigned int val)
28	+{
29	+ __asm__ __volatile__("outl %0,%1"::"a"(val), "d"(port));
30	+}
31	+
32	+static __inline__ unsigned int
33	+inb(unsigned short port)
34	+{
35	+ unsigned char ret;
36	+ __asm__ __volatile__("inb %1,%0":"=a"(ret):"d"(port));
37	+
38	+ return ret;
39	+}
40	+
41	+static __inline__ unsigned int
42	+inw(unsigned short port)
43	+{
44	+ unsigned short ret;
45	+ __asm__ __volatile__("inw %1,%0":"=a"(ret):"d"(port));
46	+
47	+ return ret;
48	+}
49	+
50	+static __inline__ unsigned int
51	+inl(unsigned short port)
52	+{
53	+ unsigned int ret;
54	+ __asm__ __volatile__("inl %1,%0":"=a"(ret):"d"(port));
55	+
56	+ return ret;
57	+}
58	+
59	+#else /* !__clang__, presumable GAS */
60
61	static __inline__ void
62	outb(unsigned short port, unsigned char val)
63	@@ -1014,6 +1067,7 @@ inl(unsigned short port)
64	return ret;
65	}
66
67	+#endif /* !__clang__, GAS part */
68	#endif /* arch madness */
69
70	#else /* !GNUC */

Lines 1-205 Link Here

(-)x11-servers/xorg-server/files/extra-arch-ia64 (-205 lines)
1	--- configure.dist 2009-06-18 17:05:59.000000000 -0700
2	+++ configure 2009-06-18 17:08:47.000000000 -0700
3	@@ -1097,6 +1097,8 @@
4	SPARC64_VIDEO_TRUE
5	PPC_VIDEO_FALSE
6	PPC_VIDEO_TRUE
7	+IA64_VIDEO_FALSE
8	+IA64_VIDEO_TRUE
9	I386_VIDEO_FALSE
10	I386_VIDEO_TRUE
11	ARM_VIDEO_FALSE
12	@@ -19134,6 +19136,7 @@
13	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
14	;;
15	ia64*)
16	+ IA64_VIDEO=yes
17	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
18	;;
19	s390*)
20	@@ -19166,6 +19169,14 @@
21	I386_VIDEO_FALSE=
22	fi
23
24	+ if test "x$IA64_VIDEO" = xyes; then
25	+ IA64_VIDEO_TRUE=
26	+ IA64_VIDEO_FALSE='#'
27	+else
28	+ IA64_VIDEO_TRUE='#'
29	+ IA64_VIDEO_FALSE=
30	+fi
31	+
32	if test "x$PPC_VIDEO" = xyes; then
33	PPC_VIDEO_TRUE=
34	PPC_VIDEO_FALSE='#'
35	--- hw/xfree86/os-support/bsd/Makefile.in.dist 2009-06-18 17:45:13.000000000 -0700
36	+++ hw/xfree86/os-support/bsd/Makefile.in 2009-06-18 17:45:19.000000000 -0700
37	@@ -63,6 +63,7 @@
38	@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@am__objects_1 = sparc64_video.lo \
39	@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@ ioperm_noop.lo
40	@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_TRUE@am__objects_1 = ppc_video.lo
41	+@IA64_VIDEO_TRUE@am__objects_1 = ia64_video.lo
42	@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_TRUE@am__objects_1 = i386_video.lo
43	@ALPHA_VIDEO_FALSE@@ARM_VIDEO_TRUE@am__objects_1 = arm_video.lo
44	@ALPHA_VIDEO_TRUE@am__objects_1 = alpha_video.lo bsd_ev56.lo \
45	@@ -393,6 +394,7 @@
46
47	@ARM_VIDEO_TRUE@ARCH_SOURCES = arm_video.c
48	@I386_VIDEO_TRUE@ARCH_SOURCES = i386_video.c
49	+@IA64_VIDEO_TRUE@ARCH_SOURCES = ia64_video.c
50	@PPC_VIDEO_TRUE@ARCH_SOURCES = ppc_video.c
51
52	# Cheat here and piggyback other sparc64 bits on SPARC64_VIDEO.
53	--- /dev/null 2009-06-18 18:27:23.000000000 -0700
54	+++ hw/xfree86/os-support/bsd/ia64_video.c 2009-06-18 18:26:02.000000000 -0700
55	@@ -0,0 +1,150 @@
56	+#ifdef HAVE_XORG_CONFIG_H
57	+#include <xorg-config.h>
58	+#endif
59	+
60	+#include <X11/X.h>
61	+#include "xf86.h"
62	+#include "xf86Priv.h"
63	+
64	+#include "xf86_OSlib.h"
65	+#include "xf86OSpriv.h"
66	+
67	+#include "bus/Pci.h"
68	+
69	+#ifndef MAP_FAILED
70	+#define MAP_FAILED ((caddr_t)-1)
71	+#endif
72	+
73	+
74	+/***************************************************************************/
75	+/* Video Memory Mapping section */
76	+/***************************************************************************/
77	+
78	+#define DEV_MEM "/dev/mem"
79	+
80	+static pointer ia64MapVidMem(int, unsigned long, unsigned long, int flags);
81	+static void ia64UnmapVidMem(int, pointer, unsigned long);
82	+
83	+Bool xf86EnableIO(void);
84	+void xf86DisableIO(void);
85	+
86	+void
87	+xf86OSInitVidMem(VidMemInfoPtr pVidMem)
88	+{
89	+ pVidMem->linearSupported = TRUE;
90	+ pVidMem->mapMem = ia64MapVidMem;
91	+ pVidMem->unmapMem = ia64UnmapVidMem;
92	+ pVidMem->initialised = TRUE;
93	+ xf86EnableIO();
94	+}
95	+
96	+
97	+_X_EXPORT volatile unsigned char *ioBase = MAP_FAILED;
98	+
99	+static pointer
100	+ia64MapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
101	+{
102	+ int fd = xf86Info.screenFd;
103	+ pointer base;
104	+#ifdef DEBUG
105	+ xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d",
106	+ Base, Size, fd);
107	+#endif
108	+
109	+ base = mmap(0, Size,
110	+ (flags & VIDMEM_READONLY) ?
111	+ PROT_READ : (PROT_READ \| PROT_WRITE),
112	+ MAP_SHARED, fd, Base);
113	+ if (base == MAP_FAILED)
114	+ FatalError("%s: could not mmap screen [s=%lx,a=%lx] (%s)",
115	+ "xf86MapVidMem", Size, Base, strerror(errno));
116	+
117	+ return base;
118	+}
119	+
120	+static void
121	+ia64UnmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
122	+{
123	+ munmap(Base, Size);
124	+}
125	+
126	+_X_EXPORT int
127	+xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
128	+ int Len)
129	+{
130	+ int rv;
131	+ static int kmem = -1;
132	+
133	+ if (kmem == -1) {
134	+ kmem = open(DEV_MEM, 2);
135	+ if (kmem == -1) {
136	+ FatalError("xf86ReadBIOS: open %s", DEV_MEM);
137	+ }
138	+ }
139	+
140	+#ifdef DEBUG
141	+ xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS() %lx %lx, %x\n",
142	+ Base, Offset, Len);
143	+#endif
144	+
145	+
146	+ lseek(kmem, Base + Offset, 0);
147	+ rv = read(kmem, Buf, Len);
148	+
149	+ return rv;
150	+}
151	+
152	+Bool xf86EnableIO()
153	+{
154	+ int fd = xf86Info.screenFd;
155	+
156	+ xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
157	+ if (ioBase == MAP_FAILED)
158	+ {
159	+ ioBase=mmap(NULL, 0x10000, PROT_READ\|PROT_WRITE, MAP_SHARED, fd,
160	+ 0);
161	+ xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %p\n", ioBase);
162	+ if (ioBase == MAP_FAILED) {
163	+ xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n");
164	+ return FALSE;
165	+ }
166	+ }
167	+ return TRUE;
168	+}
169	+
170	+void xf86DisableIO()
171	+{
172	+
173	+ if (ioBase != MAP_FAILED)
174	+ {
175	+ munmap((void )(uintptr_t)(void )ioBase, 0x10000);
176	+ ioBase = MAP_FAILED;
177	+ }
178	+}
179	+
180	+void outb(unsigned long port, unsigned char val)
181	+{
182	+}
183	+
184	+void outw(unsigned long port, unsigned short val)
185	+{
186	+}
187	+
188	+void outl(unsigned long port, unsigned int val)
189	+{
190	+}
191	+
192	+unsigned int inb(unsigned long port)
193	+{
194	+ return 0xff;
195	+}
196	+
197	+unsigned int inw(unsigned long port)
198	+{
199	+ return 0xffff;
200	+}
201	+
202	+unsigned int inl(unsigned long port)
203	+{
204	+ return 0xffffffff;
205	+}

Lines 1-12 Link Here

(-)x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in (-12 lines)
1	--- hw/xfree86/os-support/misc/Makefile.in.orig 2015-09-23 10:21:18.470900000 +0200
2	+++ hw/xfree86/os-support/misc/Makefile.in 2015-09-23 10:22:34.979974000 +0200
3	@@ -530,7 +530,8 @@
4
5	#AM_LDFLAGS = -r
6	AM_CPPFLAGS = $(XORG_INCS)
7	-AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
8	+@I386_VIDEO_TRUE@I386_VIDEO_CFLAGS = -mno-sse
9	+AM_CFLAGS = $(I386_VIDEO_CFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS)
10	EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS)
11	all: all-am
12

Lines 1-21 Link Here

(-)x11-servers/xorg-server/files/patch-config_config.c (-7 / +7 lines)
1	--- config/config.c.orig 2014-04-12 15:29:14 UTC	1	--- config/config.c.orig 2016-07-19 17:07:29 UTC
2	+++ config/config.c	2	+++ config/config.c
3	@@ -64,6 +64,9 @@ config_init(void)	3	@@ -55,6 +55,9 @@ config_init(void)
4	#elif defined(CONFIG_WSCONS)	4	#elif defined(CONFIG_WSCONS)
5	if (!config_wscons_init())	5	if (!config_wscons_init())
6	ErrorF("[config] failed to initialise wscons\n");	6	ErrorF("[config] failed to initialise wscons\n");
7	+#elif defined(CONFIG_DEVD)	7	+#elif defined(CONFIG_DEVD)
8	+ if (!config_devd_init())	8	+ if (!config_devd_init())
9	+ ErrorF("[config] failed to initialise devd\n");	9	+ ErrorF("[config] failed to initialise devd\n");
10	#endif	10	#endif
11	}	11	}
12		12
13	@@ -82,6 +85,8 @@ config_fini(void)	13	@@ -67,6 +70,8 @@ config_fini(void)
14	config_dbus_core_fini();	14	config_hal_fini();
15	#elif defined(CONFIG_WSCONS)	15	#elif defined(CONFIG_WSCONS)
16	config_wscons_fini();	16	config_wscons_fini();
17	+#elif defined(CONFIG_DEVD)	17	+#elif defined(CONFIG_DEVD)
18	+ config_devd_fini();	18	+ config_devd_fini();
19	#endif	19	#endif
20	}	20	}
21		21

Lines 1-6 Link Here

(-)x11-servers/xorg-server/files/patch-config_devd.c (-3 / +4 lines)
1	--- config/devd.c.orig 2015-05-19 19:41:49 UTC	1	--- config/devd.c.orig 2017-01-18 17:10:11 UTC
2	+++ config/devd.c	2	+++ config/devd.c
3	@@ -0,0 +1,531 @@	3	@@ -0,0 +1,532 @@
4	+/*	4	+/*
5	+ * Copyright (c) 2012 Baptiste Daroussin	5	+ * Copyright (c) 2012 Baptiste Daroussin
6	+ * Copyright (c) 2013, 2014 Alex Kozlov	6	+ * Copyright (c) 2013, 2014 Alex Kozlov
Lines 64-70 Link Here
64	+static int sock_devd;	64	+static int sock_devd;
65	+static bool is_console_kbd = false;	65	+static bool is_console_kbd = false;
66	+static bool is_kbdmux = false;	66	+static bool is_kbdmux = false;
67	+OsTimerPtr rtimer;	67	+static OsTimerPtr rtimer = NULL;
68	+	68	+
69	+struct hw_type {	69	+struct hw_type {
70	+ const char *driver;	70	+ const char *driver;
Lines 417-422 Link Here
417	+ disconnect_devd(sock_devd);	417	+ disconnect_devd(sock_devd);
418	+ rtimer = TimerSet(NULL, 0, 1, reconnect_handler, NULL);	418	+ rtimer = TimerSet(NULL, 0, 1, reconnect_handler, NULL);
419	+ LogMessage(X_WARNING, "config/devd: devd socket is lost\n");	419	+ LogMessage(X_WARNING, "config/devd: devd socket is lost\n");
		420	+ free(buf);
420	+ return -1;	421	+ return -1;
421	+ }	422	+ }
422	+ if (c == '\n')	423	+ if (c == '\n')

Lines 1-6 Link Here

(-)x11-servers/xorg-server/files/patch-configure (-12 / +84 lines)
1	--- configure.orig 2015-10-28 16:31:48.000000000 +0000	1	--- configure.orig 2016-07-19 17:27:31 UTC
2	+++ configure 2016-11-04 17:02:00.798706000 +0000	2	+++ configure
3	@@ -22637,9 +22637,14 @@	3	@@ -18019,7 +18019,7 @@ $as_echo_n "checking whether the $compil
		4	hardcode_minus_L=no
		5	hardcode_shlibpath_var=unsupported
		6	inherit_rpath=no
		7	- link_all_deplibs=unknown
		8	+ link_all_deplibs=no
		9	module_cmds=
		10	module_expsym_cmds=
		11	old_archive_from_new_cmds=
		12	@@ -18318,7 +18318,7 @@ _LT_EOF
		13	wlarc=
		14	else
		15	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
		16	- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
		17	+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s\|$\|;\|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
		18	fi
		19	;;
		20
		21	@@ -18337,7 +18337,7 @@ _LT_EOF
		22	_LT_EOF
		23	elif $LD --help 2>&1 \| $GREP ': supported targets:.* elf' > /dev/null; then
		24	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
		25	- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
		26	+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s\|$\|;\|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
		27	else
		28	ld_shlibs=no
		29	fi
		30	@@ -18366,7 +18366,7 @@ _LT_EOF
		31	if $LD --help 2>&1 \| $GREP ': supported targets:.* elf' > /dev/null; then
		32	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
		33	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
		34	- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
		35	+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s\|$\|;\|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
		36	else
		37	ld_shlibs=no
		38	fi
		39	@@ -18384,7 +18384,7 @@ _LT_EOF
		40	*)
		41	if $LD --help 2>&1 \| $GREP ': supported targets:.* elf' > /dev/null; then
		42	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
		43	- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
		44	+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s\|$\|;\|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
		45	else
		46	ld_shlibs=no
		47	fi
		48	@@ -19032,7 +19032,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
		49	hardcode_direct_absolute=yes
		50	if test -z "`echo __ELF__ \| $CC -E - \| $GREP __ELF__`"; then
		51	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
		52	- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
		53	+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s\|$\|;\|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-version-script,$lib-ver'
		54	hardcode_libdir_flag_spec='$wl-rpath,$libdir'
		55	export_dynamic_flag_spec='$wl-E'
		56	else
		57	@@ -19881,7 +19881,7 @@ freebsd* \| dragonfly*)
		58	version_type=freebsd-$objformat
		59	case $version_type in
		60	freebsd-elf*)
		61	- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
		62	+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major'
		63	soname_spec='$libname$release$shared_ext$major'
		64	need_version=no
		65	need_lib_prefix=no
		66	@@ -21016,7 +21016,7 @@ striplib=
		67	old_striplib=
68	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
69	$as_echo_n "checking whether stripping libraries is possible... " >&6; }
70	-if test -n "$STRIP" && $STRIP -V 2>&1 \| $GREP "GNU strip" >/dev/null; then
71	+if test -n "$STRIP" && $STRIP -V 2>&1 \| $GREP "strip" >/dev/null; then
72	test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
73	test -z "$striplib" && striplib="$STRIP --strip-unneeded"
74	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
75	@@ -21738,7 +21738,7 @@ if test `${RAWCPP} < conftest.$ac_ext \|
76	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
77	$as_echo "no" >&6; }
78	else
79	- if test `${RAWCPP} -traditional < conftest.$ac_ext \| grep -c 'preserve \"'` -eq 1 ; then
80	+ if true; then
81	TRADITIONALCPPFLAGS="-traditional"
82	RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
83	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
84	@@ -23168,9 +23168,14 @@ $as_echo "#define USE_ALPHA_PIO 1" >>con
4	esac	85	esac
5	GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"	86	GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
6	;;	87	;;
Lines 16-27 Link Here
16	;;	97	;;
17	i*86)	98	i*86)
18	I386_VIDEO=yes	99	I386_VIDEO=yes
19	@@ -25559,7 +25564,7 @@
20	case "x$XTRANS_SEND_FDS" in
21	xauto)
22	case "$host_os" in
23	- linux\|solaris)
24	+ linux\|solaris\|freebsd\|dragonfly)
25	XTRANS_SEND_FDS=yes
26	;;
27	*)

Lines 22-27 Link Here

(-)x11-servers/xorg-server/pkg-plist (-4 / +3 lines)
22	include/xorg/damagestr.h	22	include/xorg/damagestr.h
23	include/xorg/dbestruct.h	23	include/xorg/dbestruct.h
24	include/xorg/dgaproc.h	24	include/xorg/dgaproc.h
		25	include/xorg/displaymode.h
25	include/xorg/dix.h	26	include/xorg/dix.h
26	include/xorg/dixaccess.h	27	include/xorg/dixaccess.h
27	include/xorg/dixevents.h	28	include/xorg/dixevents.h
Lines 75-80 Link Here
75	include/xorg/misyncshm.h	76	include/xorg/misyncshm.h
76	include/xorg/misyncstr.h	77	include/xorg/misyncstr.h
77	include/xorg/mizerarc.h	78	include/xorg/mizerarc.h
		79	include/xorg/nonsdk_extinit.h
78	include/xorg/opaque.h	80	include/xorg/opaque.h
79	include/xorg/optionstr.h	81	include/xorg/optionstr.h
80	include/xorg/os.h	82	include/xorg/os.h
Lines 106-119 Link Here
106	include/xorg/shadowfb.h	108	include/xorg/shadowfb.h
107	include/xorg/shmint.h	109	include/xorg/shmint.h
108	include/xorg/site.h	110	include/xorg/site.h
109	include/xorg/swaprep.h
110	include/xorg/swapreq.h
111	include/xorg/syncsdk.h	111	include/xorg/syncsdk.h
112	include/xorg/validate.h	112	include/xorg/validate.h
113	include/xorg/vbe.h	113	include/xorg/vbe.h
114	include/xorg/vbeModes.h	114	include/xorg/vbeModes.h
115	include/xorg/vgaHW.h	115	include/xorg/vgaHW.h
116	include/xorg/vidmodeproc.h
117	include/xorg/wfbrename.h	116	include/xorg/wfbrename.h
118	include/xorg/window.h	117	include/xorg/window.h
119	include/xorg/windowstr.h	118	include/xorg/windowstr.h
Lines 151-157 Link Here
151	include/xorg/xf86xv.h	150	include/xorg/xf86xv.h
152	include/xorg/xf86xvmc.h	151	include/xorg/xf86xvmc.h
153	include/xorg/xf86xvpriv.h	152	include/xorg/xf86xvpriv.h
154	include/xorg/xfixes.h
155	include/xorg/xisb.h	153	include/xorg/xisb.h
156	include/xorg/xkbfile.h	154	include/xorg/xkbfile.h
157	include/xorg/xkbrules.h	155	include/xorg/xkbrules.h
Lines 160-165 Link Here
160	include/xorg/xorg-server.h	158	include/xorg/xorg-server.h
161	include/xorg/xorgVersion.h	159	include/xorg/xorgVersion.h
162	include/xorg/xserver-properties.h	160	include/xorg/xserver-properties.h
		161	@comment include/xorg/xserver_poll.h
163	include/xorg/xvdix.h	162	include/xorg/xvdix.h
164	include/xorg/xvmcext.h	163	include/xorg/xvmcext.h
165	lib/xorg/modules/drivers/modesetting_drv.so	164	lib/xorg/modules/drivers/modesetting_drv.so

Lines 4-57 Link Here

(-)x11-servers/xorg-vfbserver/Makefile (-42 / +13 lines)
4	PORTNAME= xorg-vfbserver	4	PORTNAME= xorg-vfbserver
5	PORTVERSION= 1.19.1	5	PORTVERSION= 1.19.1
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= x11-servers
8	MASTER_SITES= XORG/individual/xserver
9	DISTNAME= xorg-server-${PORTVERSION}
10	DIST_SUBDIR= xorg/xserver
11		7
12	MAINTAINER= x11@FreeBSD.org
13	COMMENT= X virtual framebuffer server from X.Org	8	COMMENT= X virtual framebuffer server from X.Org
14		9
15	LICENSE= MIT	10	LICENSE= MIT
16		11
17	RUN_DEPENDS= xkeyboard-config>=2.5:x11/xkeyboard-config	12	MASTERDIR= ${.CURDIR}/../xorg-server
		13	DESCR= ${.CURDIR}/pkg-descr
		14	DISTINFO_FILE= ${.CURDIR}/distinfo
18		15
19	USES= tar:bzip2 pkgconfig ssl	16	SLAVE_PORT= yes
20	INSTALL_WRKSRC= ${WRKSRC}/hw/vfb	17	OPTIONS_EXCLUDE=DEVD HAL SUID
21	GNU_CONFIGURE= yes
22	CONFIGURE_ARGS= --disable-dmx \
23	--disable-xephyr \
24	--disable-xnest \
25	--disable-kdrive \
26	--disable-xfbdev \
27	--disable-xfake \
28	--disable-screensaver \
29	--disable-xwin \
30	--disable-xwayland \
31	--disable-xorg \
32	--without-xmlto \
33	--disable-docs \
34	--disable-devel-docs \
35	--localstatedir=/var \
36	--without-dtrace \
37	--without-doxygen \
38	--disable-glx \
39	--disable-dri \
40	--disable-config-hal \
41	--disable-libdrm \
42	--disable-glx-tls \
43	--disable-vbe \
44	--disable-vgahw \
45	--enable-xvfb \
46	--with-fontrootdir=${PREFIX}/share/fonts
47		18
48	USE_XORG= pixman x11 fixesproto damageproto xcmiscproto xtrans \	19	USE_XORG= xfont2
49	bigreqsproto randrproto renderproto xextproto inputproto \
50	videoproto compositeproto recordproto \
51	fontsproto resourceproto xf86driproto glproto \
52	presentproto xineramaproto xkbfile xfont2
53		20
54	PLIST_FILES= bin/Xvfb \	21	CONFIGURE_ARGS+=--enable-xvfb --disable-dmx --disable-xephyr --disable-xnest
55	man/man1/Xvfb.1.gz
56		22
57	.include <bsd.port.mk>	23	PLIST_FILES= bin/Xvfb man/man1/Xvfb.1.gz
		24
		25	do-install:
		26	cd ${WRKSRC}/hw/vfb; DESTDIR=${STAGEDIR} ${MAKE} install
		27
		28	.include "${MASTERDIR}/Makefile"