Module Name:	pkgsrc
Committed By:	agc
Date:		Sun Dec 30 21:44:26 UTC 2001

Modified Files:
	pkgsrc/emulators/xm7: Makefile distinfo
	pkgsrc/emulators/xm7/patches: patch-aa patch-ab

Log Message:
Correct the name of the "makefile.x11" file in a patch and the package
Makefile.

Ensure that a patch to convert.sh applies cleanly by diff'ing against a
clean copy of the original file.

Also, strip the DOS-style \r\n line-terminators on cpu.c before building,
so that ordinary cpp line continuations work properly.

Fixes a problem shown up on latest 1.5.2 bulk build.


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 pkgsrc/emulators/xm7/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/emulators/xm7/distinfo
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/emulators/xm7/patches/patch-aa \
    pkgsrc/emulators/xm7/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.