[Midnightbsd-cvs] mports: x11-drivers/synaptics: fix this damn port

[laffer1 at midnightbsd.org]

Log Message:
-----------
fix this damn port

Modified Files:
--------------
    mports/x11-drivers/synaptics:
        Makefile (r1.2 -> r1.3)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/x11-drivers/synaptics/files:
        patch-Makefile (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11-drivers/synaptics/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-drivers/synaptics/pkg-plist -L x11-drivers/synaptics/pkg-plist -u -r1.1 -r1.2
--- x11-drivers/synaptics/pkg-plist
+++ x11-drivers/synaptics/pkg-plist
@@ -1,7 +1,6 @@
 bin/synclient
 @comment bin/syndaemon
-%%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
+lib/xorg/modules/input/synaptics_drv.so
+ at dirrmtry lib/xorg/modules/input
+ at dirrmtry lib/xorg/modules
+ at dirrmtry lib/xorg
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-drivers/synaptics/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L x11-drivers/synaptics/Makefile -L x11-drivers/synaptics/Makefile -u -r1.2 -r1.3
--- x11-drivers/synaptics/Makefile
+++ x11-drivers/synaptics/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	synaptics
 PORTVERSION=	0.14.6
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 MASTER_SITES=	http://web.telia.com/~u89404340/touchpad/files/:synaptics
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:synaptics \
@@ -23,6 +24,7 @@
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_XORG=	xorg-server xi xproto
 
 FAKE_OPTS=	trueprefix
 
@@ -34,7 +36,7 @@
 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
+X_DISTFILES=	xorg-server-1.4.2.tar.bz2
 PLIST_SUB+=	XORG="" XFREE86="@comment "
 EXTRA_PATCHES=	${FILESDIR}/extra-xorg-server-1.4
 
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11-drivers/synaptics/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-drivers/synaptics/distinfo -L x11-drivers/synaptics/distinfo -u -r1.1 -r1.2
--- x11-drivers/synaptics/distinfo
+++ x11-drivers/synaptics/distinfo
@@ -1,12 +1,6 @@
 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.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
-MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb
-SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df
-SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763
+MD5 (xorg/xserver/xorg-server-1.4.2.tar.bz2) = fa2915ae377f61c340a18ebef484b64b
+SHA256 (xorg/xserver/xorg-server-1.4.2.tar.bz2) = 829c66ec4c295822700067c87afae796b8e67530cc65a7b83060ea29a4ff316d
+SIZE (xorg/xserver/xorg-server-1.4.2.tar.bz2) = 6216638
Index: patch-Makefile
===================================================================
RCS file: /home/cvs/mports/x11-drivers/synaptics/files/patch-Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-drivers/synaptics/files/patch-Makefile -L x11-drivers/synaptics/files/patch-Makefile -u -r1.1 -r1.2
--- x11-drivers/synaptics/files/patch-Makefile
+++ x11-drivers/synaptics/files/patch-Makefile
@@ -8,7 +8,8 @@
 +  ARCH = $(shell uname -m)
  endif
  ifeq ($(ARCH),amd64)
-   ARCH = x86_64
+-  ARCH = x86_64
++  override ARCH = x86_64
  endif
  ifeq ($(ARCH),x86_64)
    ARCH_DEFINES = -D__x86_64__ -D_XSERVER64
@@ -22,7 +23,7 @@
  		-I$(SDKDIR)
  else
 -  INSTALLED_X = /usr/X11R6
-+  INSTALLED_X = ${X11BASE}
++  INSTALLED_X = ${LOCALBASE}
    INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input
    SYNAPTICS_DRV = synaptics_drv.o
    LDCOMBINEFLAGS = -r
@@ -30,8 +31,8 @@
    else
      SERVERSRC = $(TOP)/programs/Xserver
      ALLINCLUDES = -I. \
-+	-I${X11BASE}/include \
-+	-I${X11BASE}/include/X11 \
++	-I${LOCALBASE}/include \
++	-I${LOCALBASE}/include/X11 \
 +	-I$(SERVERSRC)/hw/xfree86 \
  	-I$(SERVERSRC)/hw/xfree86/common \
  	-I$(SERVERSRC)/hw/xfree86/os-support \
@@ -40,7 +41,7 @@
  	-I$(SERVERSRC)/include \
  	-I$(TOP)/include
 -    X_INCLUDES_ROOT = $(TOP)
-+    X_INCLUDES_ROOT = $(X11BASE)
++    X_INCLUDES_ROOT = $(LOCALBASE)
    endif
  endif