>Number:         17262
>Category:       pkg
>Synopsis:       emulators/xm7 doesn't build
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Jun 15 00:10:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Chris Pinnock
>Release:        NetBSD 1.6A
>Organization:
None
>Environment:
System: NetBSD tubbs.local 1.6A NetBSD 1.6A (TUBBS) #23: Wed May 22 12:06:19 BST 2002 cjep@tubbs.local:/usr/src/sys/arch/i386/compile/TUBBS i386
Architecture: i386
Machine: i386
>Description:
	The emulators/xm7 package in the NetBSD packages collection does
	not build for me. patch-aa does not apply (it seems due to use
	of a wrong filename) and the wrong filename for the software's
	makefile appears to be used in the package Makefile.

	On the shark bulk build (which got further, possibly due to slightly
	older version of xm7 in the pkgsrc on it), the linking step 
	fails because the -R flag is given to cc rather than -Wl,-R

>How-To-Repeat:
	cd emulators/xm7 && make
>Fix:
	I think this fixes both problems.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/xm7/Makefile,v
retrieving revision 1.7
diff -r1.7 Makefile
26c26
< MAKEFILE=		makefile.x11
---
> MAKEFILE=		Makefile.X11
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/xm7/distinfo,v
retrieving revision 1.5
diff -r1.5 distinfo
5c5
< SHA1 (patch-aa) = 599288e3e3d1598b1f3371f1bfc3705a61a39e39
---
> SHA1 (patch-aa) = 96b342259bbf903eb3c15f8ccfdead05dd414c1c
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/xm7/patches/patch-aa,v
retrieving revision 1.4
diff -r1.4 patch-aa
3,4c3,4
< --- makefile.x11.orig	Thu Mar 23 01:01:00 2000
< +++ makefile.x11	Sat Aug 12 12:54:54 2000
---
> --- Makefile.X11.orig	Thu Mar 23 01:01:00 2000
> +++ Makefile.X11	Sat Aug 12 12:54:54 2000
42c42
< +LIBS = -L/usr/X11R6/lib -R/usr/X11R6/lib -lX11 -lXt -lXext -lm -lc -lstdc++ \
---
> +LIBS = -L/usr/X11R6/lib -Wl,-R/usr/X11R6/lib -lX11 -lXt -lXext -lm -lc -lstdc++ \
>Release-Note:
>Audit-Trail:
>Unformatted:
 		Recent pkgsrc.