>Number:         30376
>Category:       pkg
>Synopsis:       x11/xworld does not work with USE_X11=xorg
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon May 30 13:29:00 +0000 2005
>Originator:     Antoine Reilles
>Release:        NetBSD 3.99.5
>Organization:
	
>Environment:
	
	
System: NetBSD arcelot.loria.fr 3.99.5 NetBSD 3.99.5 (XEN0) #0: Sat May 28 12:24:13 CEST 2005 tonio@arcelot.loria.fr:/usr/obj/sys/arch/i386/compile/XEN0 i386
Architecture: i386
Machine: i386
>Description:
x11/xworld compiles fine when using xorg, but won't run, since it is compiled
against -L/usr/X11R6/lib, and not the actual X11BASE.
I modified a little patches/patch-ac and added a substitution to fix it under
netbsd (patch attached).
>How-To-Repeat:
installs xworld on a machine using xorg.
try to run it, you will get:
Shared object "libX11.so.6" not found
also
$ ldd =xworld
/usr/pkg/bin/xworld:
         -lm.0 => /usr/lib/libm387.so.0
         -lm.0 => /usr/lib/libm.so.0
         -lX11.6 => not found
         -lc.12 => /usr/lib/libc.so.12

Also, the configuration system seems very archaic, and will probably give
problems on other pkgsrc supported architectures, while using X11BASE could fix
some of them. It could be interesting to force the configure script to use
defaults/NetBSD/set.sh, even on other arches, since some correct values are
provided, even on non netbsd system, thanks to the subst thing.

We could add a patch like the following to force that:
--- configure.orig      2005-05-30 15:19:53.000000000 +0200
+++ configure   2005-05-30 15:21:11.000000000 +0200
@@ -6,8 +6,7 @@
 set OSVERS=`uname -r`
 echo Configuring for $OS $OSVERS $ARCH
 set setcsh0="defaults/set.csh"
-set setcsh1="defaults/$OS/set.csh"
-set setcsh2="defaults/$OS/$OSVERS/set.csh"
+set setcsh1="defaults/NetBSD/set.csh"
 set setcsh3="defaults/customize.csh"
 if (-e $setcsh0) then
         echo "Reading defaults from $setcsh0"
@@ -17,10 +16,6 @@
         echo "Reading defaults from $setcsh1"
         source $setcsh1
 endif
-if (-e $setcsh2) then
-        echo "Reading defaults from $setcsh2"
-        source $setcsh2
-endif
 if (-e $setcsh3) then
         echo "Reading customizations from $setcsh3"
         source $setcsh3

>Fix:
a possible patch for the x11 issue (it does not containt the "force NetBSD
thing, since i'm not sure it is a good thing"):

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xworld/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile	11 Apr 2005 21:48:17 -0000	1.10
+++ Makefile	30 May 2005 13:12:13 -0000
@@ -17,6 +17,12 @@
 CONFIGURE_ENV+=		LDLIBS="-lm ${LDFLAGS} -lX11"
 CONFIGURE_ENV+=		CAT="${CAT}" STRIP=strip INCLUDES="" MORELIBS=""
 
+SUBST_CLASSES+= x11
+SUBST_MESSAGE.x11= "Fixing x11 options."
+SUBST_STAGE.x11=   post-patch
+SUBST_FILES.x11=   defaults/NetBSD/set.csh
+SUBST_SED.x11=     -e 's,@X11BASE@,${X11BASE},g'
+
 SUBST_CLASSES+=		install
 SUBST_MESSAGE.install=	"Fixing install options."
 SUBST_STAGE.install=	post-patch
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xworld/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo	23 Feb 2005 17:36:26 -0000	1.5
+++ distinfo	30 May 2005 13:12:13 -0000
@@ -5,7 +5,7 @@
 Size (xworld-2.0.tar.gz) = 113385 bytes
 SHA1 (patch-aa) = 197faebefac19a2457c0201ca35eb3a2f333c51a
 SHA1 (patch-ab) = 60d1591c3c155e9fbf6bac094b20cd6a6df73df0
-SHA1 (patch-ac) = f008b4140f3f27be2c6a05a3ece2c74f0a3e2899
+SHA1 (patch-ac) = 8c76f13d16afc0df0a3a8558f930fb12bcb399b0
 SHA1 (patch-ad) = d243d16ef9d79e82c817ae116b3a9b9cba71a1eb
 SHA1 (patch-ae) = 5abdb1a4a6133fee1f5d3a83625a41c27e07c912
 SHA1 (patch-af) = cf41e600032bea1c3b2cbd5436160b412fad7010
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xworld/patches/patch-ac,v
retrieving revision 1.1
diff -u -r1.1 patch-ac
--- patches/patch-ac	17 Aug 2000 15:26:32 -0000	1.1
+++ patches/patch-ac	30 May 2005 13:12:13 -0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.1 2000/08/17 15:26:32 fredb Exp $
-
---- defaults/NetBSD/set.csh.orig	Wed Jul 28 10:13:06 1999
-+++ defaults/NetBSD/set.csh	Thu Aug 17 10:17:24 2000
-@@ -4,5 +4,5 @@
+--- defaults/NetBSD/set.csh.orig	1999-07-28 17:13:06.000000000 +0200
++++ defaults/NetBSD/set.csh	2005-05-30 15:00:52.000000000 +0200
+@@ -3,6 +3,6 @@
+ set CFLAGS = "-O2 -Wall -Wstrict-prototypes -Wmissing-prototypes -Wformat"
  set INSTALL = "/usr/bin/install -c"
  set STRIP = "/usr/bin/strip"
- set INCLUDES = "-I/usr/X11R6/include"
+-set INCLUDES = "-I/usr/X11R6/include"
 -set LDLIBS = "-lm -L/usr/X11R6/lib -lX11"
-+set LDLIBS = "-lm -L/usr/X11R6/lib -Wl,-R/usr/X11R6/lib -lX11"
++set INCLUDES = "-I@X11BASE@/include"
++set LDLIBS = "-lm -L@X11BASE@/lib -Wl,-R@X11BASE@/lib -lX11"
  set MORELIBS = " "

>Unformatted: