aboutsummaryrefslogtreecommitdiff
path: root/x11-servers/xorg-dmx
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2012-04-21 17:03:32 +0000
committerMartin Wilke <miwi@FreeBSD.org>2012-04-21 17:03:32 +0000
commit29e347e19709b94e2a25b8f749afaa22b4613213 (patch)
tree7fb1ab5c9603709eeba2da5c25166d99dc1147d6 /x11-servers/xorg-dmx
parent551496002207129285b709a89863af8a414819a9 (diff)
downloadports-29e347e19709b94e2a25b8f749afaa22b4613213.tar.gz
ports-29e347e19709b94e2a25b8f749afaa22b4613213.zip
Notes
Diffstat (limited to 'x11-servers/xorg-dmx')
-rw-r--r--x11-servers/xorg-dmx/Makefile36
-rw-r--r--x11-servers/xorg-dmx/distinfo4
-rw-r--r--x11-servers/xorg-dmx/pkg-plist5
3 files changed, 13 insertions, 32 deletions
diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile
index 344cdffd2c9e..aa3ebc94315f 100644
--- a/x11-servers/xorg-dmx/Makefile
+++ b/x11-servers/xorg-dmx/Makefile
@@ -6,18 +6,12 @@
#
PORTNAME= xorg-dmx
-PORTVERSION= 1.7.7
-PORTEPOCH= 1
-CATEGORIES= x11-servers
+PORTREVISION= 0
-MAINTAINER= x11@FreeBSD.org
COMMENT= Distributed Multihead X from X.Org
-XORG_CAT= xserver
-
-LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm
-
-USE_GL= gl
+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 \
@@ -27,31 +21,15 @@ USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \
xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
xau dmx xtst xres pixman xtrans
-USE_OPENSSL= yes
CONFIGURE_ARGS= --disable-xvfb --disable-xorg --disable-xnest \
+ --without-xmlto --disable-docs --disable-devel-docs \
--enable-dmx --localstatedir=/var --without-dtrace
MAN1= Xdmx.1 dmxtodmx.1 vdltodmx.1 xdmxconfig.1
+SLAVE_PORT= yes
+
do-install:
cd ${WRKSRC}/hw/dmx; ${MAKE} install
-OPTIONS= HAL "Compile with HAL config support" on
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_OPENSSL_BASE)
-# The reason why I use this is cause openssl from base doesn't install a .pc file
-# and configure will fail trying to find it. Setting both of those variables to
-# a *non-empty* value by-passes the pkg-config check.
-CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
-.endif
-
-.if !defined(WITHOUT_HAL)
-LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
-CONFIGURE_ARGS+= --enable-config-hal=yes
-.else
-CONFIGURE_ARGS+= --enable-config-hal=no
-.endif
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-servers/xorg-dmx/distinfo b/x11-servers/xorg-dmx/distinfo
index 86aaea93dc0b..bc91bed4cb04 100644
--- a/x11-servers/xorg-dmx/distinfo
+++ b/x11-servers/xorg-dmx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
-SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
+SHA256 (xorg/xserver/xorg-server-1.10.4.tar.bz2) = fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
+SIZE (xorg/xserver/xorg-server-1.10.4.tar.bz2) = 5386174
diff --git a/x11-servers/xorg-dmx/pkg-plist b/x11-servers/xorg-dmx/pkg-plist
index 93ae1cd4ba07..657dfd5608de 100644
--- a/x11-servers/xorg-dmx/pkg-plist
+++ b/x11-servers/xorg-dmx/pkg-plist
@@ -1,6 +1,8 @@
bin/Xdmx
+%%OLD%%bin/xdmx
bin/dmxaddinput
bin/dmxaddscreen
+%%NEW%%bin/dmxinfo
bin/dmxreconfig
bin/dmxresize
bin/dmxrminput
@@ -8,5 +10,6 @@ bin/dmxrmscreen
bin/dmxtodmx
bin/dmxwininfo
bin/vdltodmx
-bin/xdmx
bin/xdmxconfig
+%%NEW%%@dirrmtry share/X11/xorg.conf.d
+%%NEW%%@dirrmtry share/X11