aboutsummaryrefslogtreecommitdiff
path: root/x11-servers/xorg-nestserver
diff options
context:
space:
mode:
authorRobert Noland <rnoland@FreeBSD.org>2009-04-04 04:04:01 +0000
committerRobert Noland <rnoland@FreeBSD.org>2009-04-04 04:04:01 +0000
commitfd559155d1fa03952cd6eb47282f20fe983307bf (patch)
tree970ec9efd8d83b0c6521bd73b54f03348a1ae54f /x11-servers/xorg-nestserver
parent451667460263c1a95078110e9af2b787c7e16c80 (diff)
downloadports-fd559155d1fa03952cd6eb47282f20fe983307bf.tar.gz
ports-fd559155d1fa03952cd6eb47282f20fe983307bf.zip
Update Xorg server to 1.6.0
o Update randrproto, libXrandr and xrandr to 1.3.0 o Update xf86-video-intel to 2.6.3 o Update other less common drivers as needed o Mark a bunch of un-maintained input drivers ignored o Update the various slave X server ports as well
Notes
Notes: svn path=/head/; revision=231570
Diffstat (limited to 'x11-servers/xorg-nestserver')
-rw-r--r--x11-servers/xorg-nestserver/Makefile20
-rw-r--r--x11-servers/xorg-nestserver/distinfo6
2 files changed, 18 insertions, 8 deletions
diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile
index 14b2118ad4c2..f7a4d17bafab 100644
--- a/x11-servers/xorg-nestserver/Makefile
+++ b/x11-servers/xorg-nestserver/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= xorg-nestserver
-PORTVERSION= 1.5.3
+PORTVERSION= 1.6.0
PORTEPOCH= 1
-PORTREVISION= 1
+#PORTREVISION= 1
CATEGORIES= x11-servers
MAINTAINER= x11@FreeBSD.org
@@ -26,10 +26,11 @@ USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \
xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
dri2proto resourceproto fontsproto xf86dgaproto videoproto \
compositeproto trapproto recordproto resourceproto \
- xineramaproto evieproto xkbfile xfont fontenc xkbui \
+ xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
-CONFIGURE_ARGS= --disable-dmx --disable-xvfb --disable-xorg --disable-xprint \
+USE_OPENSSL= yes
+CONFIGURE_ARGS= --disable-dmx --disable-xvfb --disable-xorg \
--localstatedir=/var --without-dtrace
PLIST_FILES= bin/Xnest
@@ -39,4 +40,13 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${PREFIX}/bin/
${INSTALL_MAN} ${WRKSRC}/hw/xnest/Xnest.1 ${PREFIX}/man/man1/
-.include <bsd.port.mk>
+.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
+
+.include <bsd.port.post.mk>
diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo
index 0a7c42acf73d..0455188e73b0 100644
--- a/x11-servers/xorg-nestserver/distinfo
+++ b/x11-servers/xorg-nestserver/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 308971036e25250e7fe3cccfd5a120f8
-SHA256 (xorg/xserver/xorg-server-1.5.3.tar.bz2) = a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
-SIZE (xorg/xserver/xorg-server-1.5.3.tar.bz2) = 5622625
+MD5 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = aafe73f5807ce8bb534727ecb72467c7
+SHA256 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 81a9a02b621e8a3e0bae1ad1b5dd6706a3fdcdbe766d75e1670ab5b3f0d32812
+SIZE (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 4655422