>Number:         13380
>Category:       pkg
>Synopsis:       Cannot exec XF86Setup after installing xpkgwedge
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Jul 04 14:05:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Hiramatsu Yoshifumi
>Release:        -current
>Organization:
>Environment:
NetBSD river.my.domain 1.5W NetBSD 1.5W (HiraKern) #42: Wed Jul  4 00:23:27 JST 2001     hiramatsu@river.my.domain:/usr/src/sys/arch/i386/compile/HiraKern i386

>Description:
Because XF86Setup depends on directory structure of XFree86, installing on
LOCALBASE causes problems.

>How-To-Repeat:
# cd /usr/pkgsrc/pkgtools/xpkgwedge
# make install
# cd /usr/pkgsrc/x11/XF86Setup
# make install
# XF86Setup

(Press enter)

The startup file for this program (/usr/X11R6/lib/X11/XF86Setup/phase1.tcl)
is missing. You need to install it before running this program.

>Fix:
Following patch to x11/XF86Setup fixes part of this problem. Still fails in parsing
Card Database.

diff -Nru XF86Setup.orig/Makefile XF86Setup/Makefile
--- XF86Setup.orig/Makefile     Thu Jul  5 05:14:23 2001
+++ XF86Setup/Makefile  Thu Jul  5 05:14:37 2001
@@ -32,6 +32,8 @@
 
 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 -Nru XF86Setup.orig/distinfo XF86Setup/distinfo
--- XF86Setup.orig/distinfo     Thu Jul  5 05:14:23 2001
+++ XF86Setup/distinfo  Thu Jul  5 05:14:37 2001
@@ -5,3 +5,4 @@
 SHA1 (patch-aa) = 51d7d0dfc2f94c1efdee0d9ffcabae9ccec2103d
 SHA1 (patch-ab) = ee820199301bbdfbe6cfd9f1a4cf08ff32041750
 SHA1 (patch-ac) = dd92b1bbd264ec520a16ad1e1968634c011c5857
+SHA1 (patch-ad) = 74ec6a7ec98e1d21f6d75ed4df6e709c30815bb2
diff -Nru XF86Setup.orig/patches/patch-ad XF86Setup/patches/patch-ad
--- XF86Setup.orig/patches/patch-ad     Thu Jan  1 09:00:00 1970
+++ XF86Setup/patches/patch-ad  Thu Jul  5 05:14:37 2001
@@ -0,0 +1,15 @@
+--- main.c.bak Thu Jul  5 03:48:21 2001
++++ main.c     Thu Jul  5 03:48:56 2001
+@@ -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"

>Release-Note:
>Audit-Trail:
>Unformatted: