From 9f34302b1c99c54d26c9a089fa531ba72283e809 Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Tue, 27 Apr 1999 20:33:57 +0000
Subject: Update "XF86Setup" package to version 3.3.3.1a which includes
 "wsmouse" support required for the NetBSD 1.4 release.

---
 x11/XF86Setup/Makefile         | 7 ++++---
 x11/XF86Setup/files/md5        | 4 ++--
 x11/XF86Setup/patches/patch-aa | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'x11/XF86Setup')

diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile
index 1a7810b379a..8ba159f860b 100644
--- a/x11/XF86Setup/Makefile
+++ b/x11/XF86Setup/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 1999/02/20 22:48:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1999/04/27 20:33:57 tron Exp $
 
-DISTNAME=	XF86Setup-3.3.3.1
+DISTNAME=	XF86Setup-3.3.3.1a
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
+EXTRACT_SUFX=	.tar.bz2
 ONLY_FOR_ARCHS=	i386
 
 MAINTAINER=	tron@netbsd.org
@@ -15,7 +16,7 @@ TCLLIB=		${LOCALBASE}/lib/libtcl80.a
 TKLIB=		${LOCALBASE}/lib/libtk80.a
 
 MIRROR_DISTFILE= no
-WRKSRC=		${WRKDIR}/XF86Setup
+WRKSRC=		${WRKDIR}/hw/xfree86/XF86Setup
 USE_IMAKE=	yes
 
 pre-configure:
diff --git a/x11/XF86Setup/files/md5 b/x11/XF86Setup/files/md5
index ed10b0f0c2b..b131e2af80b 100644
--- a/x11/XF86Setup/files/md5
+++ b/x11/XF86Setup/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/01/22 21:10:02 tron Exp $
+$NetBSD: md5,v 1.4 1999/04/27 20:33:58 tron Exp $
 
-MD5 (XF86Setup-3.3.3.1.tar.gz) = cd5dc93d817c390c0b72afb671c42ec6
+MD5 (XF86Setup-3.3.3.1a.tar.bz2) = 76761c5a6fa38aa960af1e90687958e4
diff --git a/x11/XF86Setup/patches/patch-aa b/x11/XF86Setup/patches/patch-aa
index 27d298318d1..4c3c8ea8b09 100644
--- a/x11/XF86Setup/patches/patch-aa
+++ b/x11/XF86Setup/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 1999/01/04 02:40:16 abs Exp $
+$NetBSD: patch-aa,v 1.5 1999/04/27 20:33:58 tron Exp $
 
 --- Imakefile.orig	Thu Mar  5 04:19:56 1998
 +++ Imakefile	Sun Jun 28 18:56:38 1998
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.4 1999/01/04 02:40:16 abs Exp $
  #endif
  
 +EXTINCSRC=	$(X11BASE)/include/X11/extensions
-+SERVERSRC=	..
++SERVERSRC=	../../..
 +XINCLUDESRC=	$(X11BASE)/include/X11
 +
 +TCLLIBDIR=	$(LOCALBASE)/lib
@@ -28,7 +28,7 @@ $NetBSD: patch-aa,v 1.4 1999/01/04 02:40:16 abs Exp $
   XF86SETUPLIBDIR = $(LIBDIR)/XF86Setup
           DEFINES = -DCARD_DATABASE_FILE='"$(CARDDBFILE)"' \
 -		   $(XCONFIG_DEFINES)
-+		   $(XCONFIG_DEFINES) `cat ./res_cpp_symbol`
++		   $(XCONFIG_DEFINES) `cat res_cpp_symbol`
          INCLUDES = -I../os-support -I../common \
  		   -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(INCLUDESRC) \
  		   -I$(EXTINCSRC) $(USEINSTALLEDINC) \
-- 
cgit v1.2.3