Apply mods from Hiramatsu Yoshifumi (hiramatu@boreas.dti.ne.jp) in PR 13380

to make XF86Setup work properly if xpkgwedge is installed.

4 files changed, 38 insertions, 9 deletions

diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile
index 82bf13eca3f..a02d422ab6d 100644
--- a/x11/XF86Setup/Makefile
+++ b/x11/XF86Setup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/05/05 19:52:30 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/07/22 21:26:40 agc Exp $
 
 DISTNAME=		XF86Setup-3.3.6
 CATEGORIES=		x11
@@ -32,6 +32,8 @@ IGNORE=		"This package doesn't work with your X11 distribution."
 
 pre-configure:
 	@${TOUCH} ${WRKSRC}/res_cpp_symbol
+	${CP} ${WRKSRC}/main.c ${WRKSRC}/main.c.orig
+	${SED} -e 's:PKG_PREFIX:${PREFIX}:g' ${WRKSRC}/main.c.orig > ${WRKSRC}/main.c
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/x11/XF86Setup/distinfo b/x11/XF86Setup/distinfo
index be1e4883f13..aab36bc70cd 100644
--- a/x11/XF86Setup/distinfo
+++ b/x11/XF86Setup/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:34 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/07/22 21:26:41 agc Exp $
 
 SHA1 (XF86Setup-3.3.6.tar.bz2) = 591bc872dfcd675a4ab07b857b4ed70f0d9141d9
 Size (XF86Setup-3.3.6.tar.bz2) = 395303 bytes
-SHA1 (patch-aa) = 51d7d0dfc2f94c1efdee0d9ffcabae9ccec2103d
+SHA1 (patch-aa) = 050e3d59220bbcfa1e64e202d219bf7018acda7b
 SHA1 (patch-ab) = ee820199301bbdfbe6cfd9f1a4cf08ff32041750
 SHA1 (patch-ac) = dd92b1bbd264ec520a16ad1e1968634c011c5857
+SHA1 (patch-ad) = 7231396c7686fa1d93fc70f9bfef22cf5be3fc6c
diff --git a/x11/XF86Setup/patches/patch-aa b/x11/XF86Setup/patches/patch-aa
index 692c530ae3f..4f110cc316a 100644
--- a/x11/XF86Setup/patches/patch-aa
+++ b/x11/XF86Setup/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2000/08/30 23:56:04 jwise Exp $
+$NetBSD: patch-aa,v 1.7 2001/07/22 21:26:41 agc Exp $
 
---- Imakefile.orig	Thu Mar  5 04:19:56 1998
-+++ Imakefile	Sun Jun 28 18:56:38 1998
-@@ -60,6 +60,20 @@
+--- Imakefile.orig	Tue Jul 20 19:23:50 1999
++++ Imakefile	Sun Jul 22 23:13:29 2001
+@@ -63,6 +63,20 @@
      EXTRASYSLIBS = -ldl
  #endif
  
@@ -23,7 +23,16 @@ $NetBSD: patch-aa,v 1.6 2000/08/30 23:56:04 jwise Exp $
  #if XF86SetupUsesStaticTk
         TKLIBRARY = StaticLibrary($(TKLIBDIR),$(TKLIBNAME))
  #endif
-@@ -82,7 +96,7 @@
+@@ -75,7 +89,7 @@
+ 		   $(TCLTK_LIBRARIES) $(XXF86VMLIB) $(XXF86MISCLIB) \
+ 		   $(USEINSTALLEDLIB) XawClientLibs MathLibrary
+          DEPLIBS = XawClientDepLibs $(DEPXXF86VMLIB)
+-      CARDDBFILE = $(LIBDIR)/Cards
++      CARDDBFILE = $(X11BASE)/lib/X11/Cards
+       XCONFIGSRC = xf86Config
+      XCONFIGFILE = XF86Config
+ 
+@@ -85,7 +99,7 @@
  
   XF86SETUPLIBDIR = $(LIBDIR)/XF86Setup
           DEFINES = -DCARD_DATABASE_FILE='"$(CARDDBFILE)"' \
@@ -32,7 +41,7 @@ $NetBSD: patch-aa,v 1.6 2000/08/30 23:56:04 jwise Exp $
          INCLUDES = -I../os-support -I../common \
  		   -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(INCLUDESRC) \
  		   -I$(EXTINCSRC) $(USEINSTALLEDINC) \
-@@ -119,3 +133,5 @@
+@@ -122,3 +136,5 @@
  
  #endif
  
diff --git a/x11/XF86Setup/patches/patch-ad b/x11/XF86Setup/patches/patch-ad
new file mode 100644
index 00000000000..d7c91c0376e
--- /dev/null
+++ b/x11/XF86Setup/patches/patch-ad
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.1 2001/07/22 21:26:41 agc Exp $
+
+--- main.c	2001/07/22 22:11:04	1.1
++++ main.c	2001/07/22 22:12:07
+@@ -100,11 +100,7 @@
+ 	"    }\n"
+ 	"    unset xdirs dir\n"
+ 	"}\n"
+-	"if [info exists env(XF86SETUPLIB)] {\n"
+-	"    set XF86Setup_library $env(XF86SETUPLIB)\n"
+-	"} else {\n"
+-	"    set XF86Setup_library $Xwinhome/lib/X11/XF86Setup\n"
+-	"}\n"
++	"set XF86Setup_library PKG_PREFIX/lib/X11/XF86Setup\n"
+ 	"set tk_library [set tcl_library $XF86Setup_library/tcllib]\n"
+ 	"set XF86Setup_startup $XF86Setup_library/" PHASE1 "\n"
+ 	"if ![file exists $XF86Setup_startup] {\n"