- Update X.org ports to 7.3.

- Mark XFree86-4 as DEPRECATED with EXPIRATION_DATE set to 2007-12-25.
I hope that nobody will be bored enough on Christmas to remove them on
that day.

Tested by:	vehemens, Rene Ladan, Beech Rintoul, sarek on x11@

3 files changed, 69 insertions, 5 deletions

diff --git a/x11-servers/synaptics/Makefile b/x11-servers/synaptics/Makefile
index 7a39ce27f533..857b3ed766a6 100644
--- a/x11-servers/synaptics/Makefile
+++ b/x11-servers/synaptics/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	synaptics
 PORTVERSION=	0.14.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://web.telia.com/~u89404340/touchpad/files/:synaptics
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:synaptics \
@@ -36,9 +36,10 @@ MASTER_SITES+=	ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/:x11 \
 DIST_SUBDIR=	xorg/xserver
 X_DISTFILES=	xorg-server-${X11VERSION}.tar.bz2
 PLIST_SUB+=	XORG="" XFREE86="@comment "
+EXTRA_PATCHES=	${FILESDIR}/extra-xorg-server-1.4
 
 post-patch:
-	@${REINPLACE_CMD} 's|\(ALLINCLUDES = -I.\)|\1 -I${X11BASE}/include|' \
+	@${REINPLACE_CMD} 's|\(ALLINCLUDES = -I.\)|\1 -I${LOCALBASE}/include -I${LOCALBASE}/include/pixman-1|' \
 		${WRKSRC}/Makefile
 
 .elif	${X_WINDOW_SYSTEM:L} == xfree86-4
diff --git a/x11-servers/synaptics/distinfo b/x11-servers/synaptics/distinfo
index a4b8415f3a1e..2028c8c16605 100644
--- a/x11-servers/synaptics/distinfo
+++ b/x11-servers/synaptics/distinfo
@@ -1,9 +1,9 @@
 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 (xorg/xserver/xorg-server-1.4.tar.bz2) = a06d9fe4f9f1d459ae02657f9ce64220
+SHA256 (xorg/xserver/xorg-server-1.4.tar.bz2) = 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2
+SIZE (xorg/xserver/xorg-server-1.4.tar.bz2) = 6179392
 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/files/extra-xorg-server-1.4 b/x11-servers/synaptics/files/extra-xorg-server-1.4
new file mode 100644
index 000000000000..d6f2ab11f0a7
--- /dev/null
+++ b/x11-servers/synaptics/files/extra-xorg-server-1.4
@@ -0,0 +1,63 @@
+diff -u Makefile.orig Makefile
+--- Makefile.orig	2006-07-15 17:58:26.000000000 +0200
++++ Makefile	2007-09-07 15:03:17.386179198 +0200
+@@ -34,10 +34,9 @@
+   LDCOMBINEFLAGS = -shared -lc
+   PICFLAG = $(call check_gcc,-fPIC,)
+   X_INCLUDES_ROOT = $(INSTALLED_X)
+-  SDKDIR = $(shell pkg-config xorg-server --variable=sdkdir)
+   ALLINCLUDES = -I. -I$(INSTALLED_X)/include/X11 \
+ 		-I$(INSTALLED_X)/include/X11/extensions \
+-		-I$(SDKDIR)
++		`pkg-config xorg-server --cflags`
+ else
+   INSTALLED_X = /usr/X11R6
+   INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input
+diff -u synaptics.c.orig synaptics.c
+--- synaptics.c.orig	2006-07-15 17:54:29.000000000 +0200
++++ synaptics.c	2007-09-07 15:10:24.910542275 +0200
+@@ -321,7 +321,9 @@
+     local->private_flags           = 0;
+     local->flags                   = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS;
+     local->conf_idev               = dev;
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+     local->motion_history_proc     = xf86GetMotionEvents;
++#endif
+     local->history_size            = 0;
+     local->always_core_feedback    = 0;
+ 
+@@ -613,8 +615,17 @@
+ 
+     InitPointerDeviceStruct((DevicePtr)dev, map,
+ 			    SYN_MAX_BUTTONS,
+-			    miPointerGetMotionEvents, SynapticsCtrl,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
++			    miPointerGetMotionEvents,
++#else
++			    GetMotionHistory,
++#endif
++			    SynapticsCtrl,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+ 			    miPointerGetMotionBufferSize());
++#else
++			    GetMotionHistorySize(), 2);
++#endif
+ 
+     /* X valuator */
+     xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1);
+diff -u synaptics.h.orig synaptics.h
+--- synaptics.h.orig	2006-07-15 17:54:29.000000000 +0200
++++ synaptics.h	2007-09-07 15:10:12.409829887 +0200
+@@ -226,5 +226,11 @@
+ 
+ #endif /* SYNAPTICS_PRIVATE */
+ 
++/* Previously found in xf86Xinput.h */
++#ifdef DBG
++#undef DBG
++#endif
++
++#define DBG(lvl, f) {if ((lvl) <= xf86GetVerbosity()) f;}
+ 
+ #endif /* _SYNAPTICS_H_ */
+