Update to 2.20.11

* Update MASTER_SITES.
* Add LICENSE.
* Build with distfile's Makefile.
* Install our own do-install target (install target is not provided).

Changelog:

2.20.11 -- 07 April 2008

    * Peter H. Froehlich <phf at acm dot org> took over as maintainer
      from Andrew Davie, but both Andrew and Thomas Mathys still help.

    * DASM moved to sourceforge.net, the new website for DASM is now
      available at <http://dasm-dillon.sourceforge.net/>.

    * Fixed (the obvious version of) the long-standing "-1 bug" that
      made DASM reject sources with negative integer literals; there
      may still be signed/unsigned problems in other areas; there is
      certainly still a range checking error.

    * Fixed the usage message to reflect that symbol table sorting is
      controlled by -T and not by -t as the message claimed; also the
      format of the usage message is now more GNU-like.

    * The range of values for -T is now checked, you have to stick to
      0 or 1, arbitrary numbers will not work anymore.

    * Removed spurious output when running DASM. In general command
      line tools should only make output when there's something to
      report (a central Unix tenent). Sorry if you miss the messages,
      just look at the usage information instead. :-)

    * Added new -E# option to select format of error messages; -E0 is
      the default MS style, -E1 is "classic" style from Matthew Dillon,
      -E2 is GNU style from their coding standards.

2.20.10 -- 31 October 2004

    * Thomas Mathys added support for the Fairchild F8 processor to
      DASM. Thank you, Thomas!

    * Support files for the Channel-F Video Entertainment System (VES)
      added.

2.20.08 -- unreleased

    * Documentation changed from Word documents back to text files.

2.20.07 -- 17 July 2003

    * No user-visible changes.

2.20.05 -- unreleased

    * Symbol table dump is now performed even if an error occurred.

    * Symbol table dump now displays string symbols in string form.

2.20.04 -- 24 April 2003

    * Command line options now allow "/" as prefix in addition to "-"
      as before.

    * Division by zero is now treated as an unrecoverable error.

    * Error messages now contain more information about the error,
      including the actual source code where possible.

    * Output reworked. Typically, the -v option is now unnecessary as
      more appropriate messages allow you to find errors better.
      Compatibility with the -v option has been maintained, although
      there may be a few minor changes.

    * Branch out of range errors now list the distance to the branch.

    * Undefined symbols are now always listed in a separate table. If
      an unresolved symbol causes an error, the table is displayed
      automatically at the end of assembly. (Note: It can be alright
      to have a referenced but undefined symbol, for example when
      IFCONST is used. In this case, the undefined table will only
      be displayed if there is another undefined label, but it will
      contain *all* unresolved symbols.)

    * New command line option -T# where # is 0 or 1; 0 sorts symbol
      table alphabetically (default), 1 sorts symbol table by address.
      If available memory precludes sorting, the table is unsorted.

2.20.02 -- 24 April 2003

    * John Saeger contributed support for all illegal 6502 opcodes.
      Thank you, John! This fixes the LAX opcode as well.

2.20.01 -- 22 March 2003

    * Andrew Davie <atari2600 at taswegian dot com> took up the DASM
      project, starting from Olaf "Rhialto" Seibert's 2.12.04 version
      with both Olaf's and Matthew Dillon's blessing.

    * REPEAT now detects negative loop count (used to lock up).

    * Errors are now in the format "file (line): Error: string" to
      be compatible with MS VisualStudio.

    * Support files for the Atari 2600 Video Computer System (VCS)
      added.

    * Support for illegal 6502/6507 opcodes NOP zp and LAZ (zp),y
      added.

2.12.14 -- 19 August 1995

    * Olaf "Rhialto" Seibert's release of DASM with many changes to
      Matthew Dillon's 2.12 release.

Note that everything before 2.20.11 was *reconstructed* by Peter
Froehlich for the 2.20.11 release. Peter had no first-hand knowledge
of the early years but tried to be as accurate as possible, working
from multiple sources. Please feel free to submit any corrections you
may have regarding dates, features, and people.

6 files changed, 19 insertions, 69 deletions

diff --git a/cross/dasm/Makefile b/cross/dasm/Makefile
index 60afd44dcf8..20dc41286e4 100644
--- a/cross/dasm/Makefile
+++ b/cross/dasm/Makefile
@@ -1,25 +1,26 @@
-# $NetBSD: Makefile,v 1.9 2013/04/14 01:21:17 dholland Exp $
+# $NetBSD: Makefile,v 1.10 2013/06/16 09:40:58 ryoon Exp $
 #
 
-DISTNAME=	dasm212
-PKGNAME=	dasm-2.12
-PKGREVISION=	2
+DISTNAME=	dasm-2.20.11
 CATEGORIES=	cross
-MASTER_SITES=	http://members.cox.net/rcolbert/zip/
-EXTRACT_SUFX=	.zip
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dasm-dillon/}
 
 MAINTAINER=	xmor61@users.sourceforge.net
 HOMEPAGE=	http://dasm-dillon.sourceforge.net/
 COMMENT=	Multi-CPU cross-assembler for 6502, 6803 and 68HC11
+LICENSE=	gnu-gpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	YES
+USE_TOOLS+=	gmake
 
-MAKE_FILE=	${FILESDIR}/Makefile
-MAKE_ENV+=	BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} BINMODE=${BINMODE:Q}
+INSTALLATION_DIRS=	bin share/dasm
 
-INSTALLATION_DIRS=	bin
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/dasm ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/ftohex ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/doc/dasm.txt ${DESTDIR}${PREFIX}/share/dasm
+	${INSTALL_DATA} ${WRKSRC}/doc/ftohex.txt ${DESTDIR}${PREFIX}/share/dasm
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cross/dasm/PLIST b/cross/dasm/PLIST
index a124f0e0f2d..2f66460d79e 100644
--- a/cross/dasm/PLIST
+++ b/cross/dasm/PLIST
@@ -1,2 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/11/20 16:24:43 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/06/16 09:40:58 ryoon Exp $
 bin/dasm
+bin/ftohex
+share/dasm/dasm.txt
+share/dasm/ftohex.txt
diff --git a/cross/dasm/distinfo b/cross/dasm/distinfo
index e90e5496a97..d2d3c4edda0 100644
--- a/cross/dasm/distinfo
+++ b/cross/dasm/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.7 2013/04/14 01:21:17 dholland Exp $
+$NetBSD: distinfo,v 1.8 2013/06/16 09:40:58 ryoon Exp $
 
-SHA1 (dasm212.zip) = cf14367131bc3490ab75a349d07ee276e114967d
-RMD160 (dasm212.zip) = dc1af353dae599acf5fedda46f586369e7030c51
-Size (dasm212.zip) = 63734 bytes
-SHA1 (patch-aa) = f5d4838e914e4cb92401a65ec082cceefd1459fc
-SHA1 (patch-ab) = 50b87f7aa07e9243da566b778d7b191a56ee229f
+SHA1 (dasm-2.20.11.tar.gz) = 6c1f0091e88fff8f814a92304286c1875fd64693
+RMD160 (dasm-2.20.11.tar.gz) = 4a22a60d35e9f6ab93f1b135b2fbeca4edcd6b5d
+Size (dasm-2.20.11.tar.gz) = 112184 bytes
diff --git a/cross/dasm/files/Makefile b/cross/dasm/files/Makefile
deleted file mode 100644
index 6edef2e9806..00000000000
--- a/cross/dasm/files/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/11/20 16:24:43 minskim Exp $
-
-PROG=	dasm
-SRCS=	exp.c globals.c main.c mne6303.c mne6502.c mne6811.c mne68705.c	\
-	ops.c symbols.c
-
-NOMAN=	yes
-BINDIR=	${PREFIX}/bin
-
-.include <bsd.prog.mk>
diff --git a/cross/dasm/patches/patch-aa b/cross/dasm/patches/patch-aa
deleted file mode 100644
index 802efc70d4a..00000000000
--- a/cross/dasm/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2013/04/14 01:21:17 dholland Exp $
-
-"ulong" already exists on some platforms.
-
---- asm.h.orig	1998-02-26 19:54:52.000000000 -0600
-+++ asm.h
-@@ -40,7 +40,9 @@
- 
- typedef unsigned char ubyte;
- typedef unsigned uword;
-+#if defined(__sun)
- typedef long ulong;
-+#endif
- 
- #define MNE	    struct _MNE
- #define MACRO	    struct _MACRO
diff --git a/cross/dasm/patches/patch-ab b/cross/dasm/patches/patch-ab
deleted file mode 100644
index 48e393cb5ac..00000000000
--- a/cross/dasm/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2013/04/14 01:21:17 dholland Exp $
-
-- remove nonportable use of _fmode, whatever that was
-- fix printf format for LP64 platforms
-
---- main.c.orig	1998-03-02 11:28:34.000000000 +0000
-+++ main.c
-@@ -199,9 +199,7 @@ nextpass:
- #if OlafDol
-     Localdollarindex = Lastlocaldollarindex = 0;
- #endif
--    _fmode = 0x8000;
-     FI_temp = fopen(F_outfile, "w");
--    _fmode = 0;
-     Fisclear = 1;
-     CheckSum = 0;
-     if (FI_temp == NULL) {
-@@ -568,7 +566,7 @@ cleanup(char *buf)
- 	    if (strlist) {
- 		add += strlen(strlist->buf);
- 		if (Xdebug)
--		    printf("strlist: '%s' %d\n", strlist->buf, strlen(strlist->buf));
-+		    printf("strlist: '%s' %zu\n", strlist->buf, strlen(strlist->buf));
- 		if (str + add + strlen(str) + 1 > buf + MAXLINE) {
- 		    if (Xdebug)
- 			printf("str %8ld buf %8ld (add/strlen(str)): %d %ld\n", (unsigned long)str, (unsigned long)buf, add, (long)strlen(str));