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));