Subject: pkg/21310: Proper fix for pkg/20118
To: None <gnats-bugs@gnats.netbsd.org>
From: None <sketch@rd.bbc.co.uk>
List: netbsd-bugs
Date: 04/24/2003 20:57:48
>Number:         21310
>Category:       pkg
>Synopsis:       Proper fix for pkg/20118
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Apr 24 20:58:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Perkin
>Release:        1.6.1
>Organization:
British Broadcasting Corporation
>Environment:
NetBSD batfink.intra.nut 1.6.1 NetBSD 1.6.1 (GENERIC) #0: Thu Apr 24 17:48:54 BST 2003     sketch@batfink.intra.nut:/usr/src/sys/arch/i386/compile/GENERIC i386
>Description:
Sorry, should have tested the suggested fix to pkg/20118 a bit more, as
it doesn't actually work (so wm/evilwm is broken for xpkgwedge).

The following patch works fine.
>How-To-Repeat:

>Fix:
cvs server: Diffing .
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/evilwm/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo    2003/01/30 14:27:47     1.6
+++ distinfo    2003/04/24 20:56:34
@@ -2,4 +2,4 @@
 
 SHA1 (evilwm_0.99.14.orig.tar.gz) = 79f1fedab90615e3ae39dba321c87512cfc35ec6
 Size (evilwm_0.99.14.orig.tar.gz) = 22887 bytes
-SHA1 (patch-aa) = 312385f8b499873bfe2b260162d1dbb58e2b8eaa
+SHA1 (patch-aa) = c30ba1f0a4e0a83ddece5cdb6053828d4d9abf75
cvs server: Diffing patches
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/wm/evilwm/patches/patch-aa,v
retrieving revision 1.6
diff -u -r1.6 patch-aa
--- patches/patch-aa    2003/01/30 14:27:47     1.6
+++ patches/patch-aa    2003/04/24 20:56:34
@@ -13,7 +13,7 @@
 +prefix = ${PREFIX}
  
 -XROOT    = /usr/X11R6
-+XROOT    = ${X11PREFIX}
++XROOT    = ${X11BASE}
  INCLUDES = -I$(XROOT)/include
  LDPATH   = -L$(XROOT)/lib
  LIBS     = -lX11
>Release-Note:
>Audit-Trail:
>Unformatted: