diff options
Diffstat (limited to 'x11-servers/xorg-dmx')
-rw-r--r-- | x11-servers/xorg-dmx/Makefile | 40 | ||||
-rw-r--r-- | x11-servers/xorg-dmx/distinfo | 9 | ||||
-rw-r--r-- | x11-servers/xorg-dmx/files/patch-dmx.c | 15 | ||||
-rw-r--r-- | x11-servers/xorg-dmx/files/patch-dmxextension.c | 11 | ||||
-rw-r--r-- | x11-servers/xorg-dmx/pkg-plist | 12 | ||||
-rw-r--r-- | x11-servers/xorg-dmx/scripts/configure | 24 |
6 files changed, 34 insertions, 77 deletions
diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile index 050c4221077a..fb4a3751d88f 100644 --- a/x11-servers/xorg-dmx/Makefile +++ b/x11-servers/xorg-dmx/Makefile @@ -6,35 +6,33 @@ # PORTNAME= xorg-dmx -PORTVERSION= 6.9.0 -PORTREVISION= 2 +PORTVERSION= 1.2.0 +PORTEPOCH= 1 CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src -DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ - X11R${PORTVERSION}-src3.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= Distributed Multihead X from X.Org CONFLICTS= XFree86-dmx-[0-9]* -EXTRA_PATCHES= ${CF_PATCHES} ${SERVER_PATCHES} +XORG_CAT= xserver -USE_XLIB= yes +LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm +USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \ + damageproto xcmiscproto xextproto xf86miscproto \ + xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \ + resourceproto fontsproto xf86dgaproto videoproto \ + compositeproto trapproto recordproto resourceproto \ + xineramaproto evieproto xkbfile xfont fontenc xkbui \ + xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \ + xau dmx xtst xres + +CONFIGURE_ARGS= --disable-xprint --disable-xvfb --disable-xorg --disable-xnest \ + --enable-dmx --localstatedir=/var -XBUILD_DIRS= lib/font programs/Xserver/miext/damage programs/Xserver -XINCLUDE_DIRS= lib/xtrans -XMAN_DIRS= programs/Xserver/hw/dmx +MAN1= Xdmx.1 dmxtodmx.1 vdltodmx.1 xdmxconfig.1 -MAN1= Xdmx.1 -PLIST_FILES= bin/Xdmx +do-install: + cd ${WRKSRC}/hw/dmx; ${MAKE} install -.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include <bsd.port.pre.mk> -.if ${X_WINDOW_SYSTEM:L} != xorg -IGNORE= is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\ - distribution. See The X Window System and Virtual Consoles chapter\ - of FAQ for more information -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-servers/xorg-dmx/distinfo b/x11-servers/xorg-dmx/distinfo index 177370c87899..b208692af414 100644 --- a/x11-servers/xorg-dmx/distinfo +++ b/x11-servers/xorg-dmx/distinfo @@ -1,6 +1,3 @@ -MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150 -SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c -SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996 -MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33 -SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971 -SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474 +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 diff --git a/x11-servers/xorg-dmx/files/patch-dmx.c b/x11-servers/xorg-dmx/files/patch-dmx.c deleted file mode 100644 index d29155b81c81..000000000000 --- a/x11-servers/xorg-dmx/files/patch-dmx.c +++ /dev/null @@ -1,15 +0,0 @@ ---- programs/Xserver/Xext/dmx.c.orig Mon Jan 16 07:43:55 2006 -+++ programs/Xserver/Xext/dmx.c Mon Jan 16 07:44:29 2006 -@@ -57,10 +57,10 @@ - #include "opaque.h" - - #include "dmxextension.h" --#include <X11/extensions/dmxproto.h> -+#include "dmxproto.h" - - #define _DMX_SERVER_ --#include <X11/extensions/dmxext.h> -+#include "dmxext.h" - - #ifdef PANORAMIX - #include "panoramiX.h" diff --git a/x11-servers/xorg-dmx/files/patch-dmxextension.c b/x11-servers/xorg-dmx/files/patch-dmxextension.c deleted file mode 100644 index 0664e3005004..000000000000 --- a/x11-servers/xorg-dmx/files/patch-dmxextension.c +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/dmx/dmxextension.c.orig Mon Jan 16 07:48:33 2006 -+++ programs/Xserver/hw/dmx/dmxextension.c Mon Jan 16 07:51:33 2006 -@@ -62,7 +62,7 @@ - - #include "windowstr.h" - #include "inputstr.h" /* For DeviceIntRec */ --#include <X11/extensions/dmxproto.h> /* For DMX_BAD_* */ -+#include "dmxproto.h" /* For DMX_BAD_* */ - #include "cursorstr.h" - - /* The default font is declared in dix/globals.c, but is not included in diff --git a/x11-servers/xorg-dmx/pkg-plist b/x11-servers/xorg-dmx/pkg-plist new file mode 100644 index 000000000000..93ae1cd4ba07 --- /dev/null +++ b/x11-servers/xorg-dmx/pkg-plist @@ -0,0 +1,12 @@ +bin/Xdmx +bin/dmxaddinput +bin/dmxaddscreen +bin/dmxreconfig +bin/dmxresize +bin/dmxrminput +bin/dmxrmscreen +bin/dmxtodmx +bin/dmxwininfo +bin/vdltodmx +bin/xdmx +bin/xdmxconfig diff --git a/x11-servers/xorg-dmx/scripts/configure b/x11-servers/xorg-dmx/scripts/configure deleted file mode 100644 index 84870dc79b20..000000000000 --- a/x11-servers/xorg-dmx/scripts/configure +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -LOCALDEF=$WRKDIR/.config - -rm -f $LOCALDEF -echo "#define BuildServer YES" >> $LOCALDEF -echo "#define BuildServersOnly YES" >> $LOCALDEF -echo "#define BuildLibraries NO" >> $LOCALDEF -echo "#define XprtServer NO" >> $LOCALDEF -echo "#define BuildXprint NO" >> $LOCALDEF -echo "#define XnestServer NO" >> $LOCALDEF -echo "#define XdmxServer YES" >> $LOCALDEF -echo "#define XorgServer NO" >> $LOCALDEF -echo "#define XVirtualFramebufferServer NO" >> $LOCALDEF -echo "#define XF86Server NO" >> $LOCALDEF -echo "#define BuildFontServer NO" >> $LOCALDEF -echo "#define BuildLBX NO" >> $LOCALDEF -echo "#define BuildXF86DRI NO" >> $LOCALDEF -echo "#define InstallSecurityConfig NO" >> $LOCALDEF -echo "#define UseInstalledPrograms YES" >> $LOCALDEF -echo "#define UseInstalledLibraries YES" >> $LOCALDEF -echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF - -sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen |