Subject: pkg/15217: net/pload use /usr/X11R6 in xpkgwedge environment.
To: None <gnats-bugs@gnats.netbsd.org>
From: None <hiramatu@boreas.dti.ne.jp>
List: netbsd-bugs
Date: 01/12/2002 21:34:59
>Number:         15217
>Category:       pkg
>Synopsis:       net/pload use /usr/X11R6 in xpkgwedge environment.
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Jan 12 04:36:02 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Hiramatsu Yoshifumi
>Release:        -current 1.5Z
>Organization:
	
>Environment:
	<machine, os, target, libraries (multiple lines)>
System: NetBSD river.my.domain 1.5Z NetBSD 1.5Z (River) #0: Wed Dec 19 18:52:25 JST 2001     root@river.my.domain:/usr/src/sys/arch/i386/compile/River i386
Architecture: i386
Machine: i386
>Description:
net/pload configure stript invoke xmkmf directly, so it installs files
into /usr/X11R6.

>How-To-Repeat:
	
>Fix:
This patch is tested on two i386 1.5Z machines. One is xpkgwedge installed,
and other is not installed.

diff -Nru pload.orig/distinfo pload/distinfo
--- pload.orig/distinfo	Sat Jan 12 19:32:53 2002
+++ pload/distinfo	Sat Jan 12 11:26:43 2002
@@ -4,3 +4,4 @@
 Size (pload-0.9.4.tar.gz) = 21244 bytes
 SHA1 (patch-aa) = a5d96eed12a58c9ea6822c7953737b21a4800310
 SHA1 (patch-ab) = 53a211ff7d0990d649472e69451a144d31603a61
+SHA1 (patch-ac) = c0813abfbac06dc64dd3f9012ff1eead50d9bf61
diff -Nru pload.orig/patches/patch-ac pload/patches/patch-ac
--- pload.orig/patches/patch-ac	Thu Jan  1 09:00:00 1970
+++ pload/patches/patch-ac	Sat Jan 12 11:26:43 2002
@@ -0,0 +1,12 @@
+$NetBSD$
+--- configure.orig	Sat Jan 12 00:00:23 2002
++++ configure	Sat Jan 12 00:01:03 2002
+@@ -60,7 +60,7 @@
+ 	# is this proper sed syntax?
+ 	echo "OBJS=`echo $common_src $sys_src | sed s/'\.c'/'\.o'/g`" >> osdefs.mk
+ 	
+-	xmkmf && make depend && \
++	(pkgxmkmf || xmkmf) && make depend && \
+ 	echo "configured for $os" && \
+ 	echo "type \"make\" to build" && \
+ 	echo "type \"make install ; make install.man\" to install"

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