- Welcome X.org 7.2 \o/.

- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.

3 files changed, 27 insertions, 12 deletions

diff --git a/x11-servers/synaptics/Makefile b/x11-servers/synaptics/Makefile
index f5fab0f2353f..7a39ce27f533 100644
--- a/x11-servers/synaptics/Makefile
+++ b/x11-servers/synaptics/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	synaptics
 PORTVERSION=	0.14.6
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://web.telia.com/~u89404340/touchpad/files/:synaptics
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:synaptics \
@@ -31,10 +31,15 @@ X11VERSION!=	${MAKE} -C `${MAKE} -f bsd.port.mk -VX_SERVER_PORT` \
 
 .if	${X_WINDOW_SYSTEM:L} == xorg
 
-MASTER_SITES+=	${MASTER_SITE_XORG:C/$/:x11/}
-MASTER_SITE_SUBDIR=	X11R${X11VERSION}/src/:x11
-DIST_SUBDIR=	xorg
-X_DISTFILES=	X11R${X11VERSION}-src3.tar.gz
+MASTER_SITES+=	ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/:x11 \
+                http://xorg.freedesktop.org/releases/individual/xserver/:x11
+DIST_SUBDIR=	xorg/xserver
+X_DISTFILES=	xorg-server-${X11VERSION}.tar.bz2
+PLIST_SUB+=	XORG="" XFREE86="@comment "
+
+post-patch:
+	@${REINPLACE_CMD} 's|\(ALLINCLUDES = -I.\)|\1 -I${X11BASE}/include|' \
+		${WRKSRC}/Makefile
 
 .elif	${X_WINDOW_SYSTEM:L} == xfree86-4
 
@@ -42,6 +47,7 @@ MASTER_SITES+=	${MASTER_SITE_XFREE:C/$/:x11/}
 MASTER_SITE_SUBDIR=	${X11VERSION}/:x11
 DIST_SUBDIR=	xc
 X_DISTFILES=	XFree86-${X11VERSION}-src-3.tgz
+PLIST_SUB+=	XORG="@comment " XFREE86=""
 
 .else
 
@@ -62,6 +68,11 @@ post-extract:
 		${GZIP_CMD} -dc ${_DISTDIR}/${FILE} | ${TAR} -xf -
 .endfor
 
+.if	${X_WINDOW_SYSTEM:L} == xorg
+pre-install:
+	${MKDIR} ${X11BASE}/lib/xorg/modules/input/
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/x11-servers/synaptics/distinfo b/x11-servers/synaptics/distinfo
index c2b2b6e25022..a4b8415f3a1e 100644
--- a/x11-servers/synaptics/distinfo
+++ b/x11-servers/synaptics/distinfo
@@ -1,9 +1,9 @@
-MD5 (xorg/synaptics-0.14.6.tar.bz2) = 1102cd575045640a064ab6f9b1e391af
-SHA256 (xorg/synaptics-0.14.6.tar.bz2) = f88b967258a0484b0aa02f26acfb31a70cc8afd4872608b7f81c44dc29ae8429
-SIZE (xorg/synaptics-0.14.6.tar.bz2) = 126833
-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/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 (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/pkg-plist b/x11-servers/synaptics/pkg-plist
index 9eb476975db3..46e202c29d17 100644
--- a/x11-servers/synaptics/pkg-plist
+++ b/x11-servers/synaptics/pkg-plist
@@ -1,3 +1,7 @@
 bin/synclient
 @comment bin/syndaemon
-lib/modules/input/synaptics_drv.o
+%%XORG%%lib/xorg/modules/input/synaptics_drv.so
+%%XORG%%@dirrmtry lib/xorg/modules/input
+%%XORG%%@dirrmtry lib/xorg/modules
+%%XORG%%@dirrmtry lib/xorg
+%%XFREE86%%lib/modules/input/synaptics_drv.o