(pkgsrc)

  - to make pkglint clean, change directory organization, using BUILD_DIR= src etc.
  - Add LICENSE= gnu-gpl-v2
  - Use SUBST instead of ${SED} at do-install: target
  - Newly installs example files
  - (invocation without argument gives error as
     Pass 1: Error: Cannot open file: 'test.m65'
     but it is the same as prev. version and user should give input)
(upstream) Update 1.04 to 1.06
------------------------------
October 10, 2003
  version 1.05 - added new directives .BANK, .SET 6, and .OPT LIST/NO LIST;
                 Preliminary support for .ATR disk images and the Atari++
                 emulator memory snapshots;

March 17, 2009
  version 1.06 - allow negative offsets with .SET 6 directives; allow arithmentic
                 expressions in REPEAT blocks;  Better detection of resized labels;
                 Fixed a buffer overflow problem; Added -l option to allow label output;
                 Compiling Windows executable with mingw

5 files changed, 55 insertions, 35 deletions

diff --git a/cross/atasm/Makefile b/cross/atasm/Makefile
index 565a4bb3ece..f1ba0020e96 100644
--- a/cross/atasm/Makefile
+++ b/cross/atasm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2014/10/09 14:06:04 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2014/12/09 15:10:47 mef Exp $
 #
 
-DISTNAME=	atasm104
-PKGNAME=	atasm-1.04
-PKGREVISION=	2
+DISTNAME=	atasm106
+PKGNAME=	atasm-1.06
 CATEGORIES=	devel cross emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=atasm/}
 EXTRACT_SUFX=	.zip
@@ -11,19 +10,32 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/atasm/
 COMMENT=	Cross-assembler for 6502 optimized to code for Atari 8 bit computers
+LICENSE=	gnu-gpl-v2
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
+WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_CONFIGURE=	YES
+BUILD_DIRS=	src
 
 DOCDIR=		${PREFIX}/share/doc/atasm
+EXAMPLE_DIR=	${PREFIX}/share/examples/atasm
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${DOCDIR}
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${DOCDIR} ${EXAMPLE_DIR}
+
+SUBST_CLASSES+=		docdir
+SUBST_FILES.docdir=	atasm.1.in
+SUBST_STAGE.docdir=	pre-install
+SUBST_SED.docdir=	-e 's,%%DOCDIR%%,${DOCDIR},g'
+SUBST_MESSAGE.docdir=	Edit DOCDIR variable
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/atasm ${DESTDIR}${PREFIX}/bin/atasm
-	${SED} -e 's,%%DOCDIR%%,${DOCDIR},g' < ${WRKSRC}/atasm.1.in > ${WRKSRC}/atasm.1
-	${INSTALL_DATA} ${WRKSRC}/atasm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/atasm.txt ${DESTDIR}${DOCDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/atasm        ${DESTDIR}${PREFIX}/bin/atasm
+	${MV}              ${WRKSRC}/src/atasm.1.in ${WRKSRC}/src/atasm.1
+	${INSTALL_DATA}    ${WRKSRC}/src/atasm.1      ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA}    ${WRKSRC}/docs/atasm.pdf   ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA}    ${WRKSRC}/docs/atasm.blurb ${DESTDIR}${DOCDIR}
+.for i in iomac.lib sample.m65 sysequ.m65 test.m65
+	${INSTALL_DATA}    ${WRKSRC}/examples/${i}    ${DESTDIR}${EXAMPLE_DIR}/
+.endfor
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cross/atasm/PLIST b/cross/atasm/PLIST
index 953593b3661..53783acabdb 100644
--- a/cross/atasm/PLIST
+++ b/cross/atasm/PLIST
@@ -1,4 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:39:52 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/12/09 15:10:47 mef Exp $
 bin/atasm
 man/man1/atasm.1
-share/doc/atasm/atasm.txt
+share/doc/atasm/atasm.blurb
+share/doc/atasm/atasm.pdf
+share/examples/atasm/iomac.lib
+share/examples/atasm/sample.m65
+share/examples/atasm/sysequ.m65
+share/examples/atasm/test.m65
diff --git a/cross/atasm/distinfo b/cross/atasm/distinfo
index f9f7fe1e6b8..9fbe935364c 100644
--- a/cross/atasm/distinfo
+++ b/cross/atasm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2011/11/29 06:11:53 sbd Exp $
+$NetBSD: distinfo,v 1.5 2014/12/09 15:10:47 mef Exp $
 
-SHA1 (atasm104.zip) = 7cee73afe97d92c8a299b6203fc9245241764810
-RMD160 (atasm104.zip) = d23221d37e3040e303fa0f7a8cfa336e58a19618
-Size (atasm104.zip) = 186653 bytes
-SHA1 (patch-aa) = 951bda526513c2176a6288d9835d3a3733c94cbb
-SHA1 (patch-ab) = 70d07b66572bafbc57f53e16f95f1567af1304a0
+SHA1 (atasm106.zip) = c016c2f6ee611e001dbd026923c29ce509979f1c
+RMD160 (atasm106.zip) = e9935d0e202bc668114af9d11fdbf396399cb6d3
+Size (atasm106.zip) = 368360 bytes
+SHA1 (patch-aa) = d87376db3b9babe3578b8cc614a418066c3488f3
+SHA1 (patch-ab) = 18c516a98ae5cbae3f8df7f38ca87bd1f47b9664
diff --git a/cross/atasm/patches/patch-aa b/cross/atasm/patches/patch-aa
index 999930d6008..b30770a6829 100644
--- a/cross/atasm/patches/patch-aa
+++ b/cross/atasm/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.2 2011/11/29 06:11:53 sbd Exp $
+$NetBSD: patch-aa,v 1.3 2014/12/09 15:10:47 mef Exp $
 
 Honor CC, CFLAGS and LDFLAGS from pkgsrc.
 
---- Makefile.orig	2003-08-23 00:53:29.000000000 +0000
-+++ Makefile
-@@ -16,10 +16,10 @@ ZLIB    = -lz
- UNIX    = -DUNIX
+--- Makefile.orig	2009-03-18 05:39:26.000000000 +0900
++++ src/Makefile	2014-12-09 23:26:41.000000000 +0900
+@@ -17,10 +17,10 @@ UNIX    = -DUNIX
  
  # Compiler flags, if you are using egcs, pgcs, or gcc >2.8.1 use:
+ #CFLAGS  = -g -Wall $(USEZ) $(DOS) $(UNIX) 
 -CFLAGS  = -Wall $(USEZ) $(DOS) $(UNIX) -O3 -fomit-frame-pointer -march=pentiumpro 
-+CFLAGS  += $(USEZ) $(DOS) $(UNIX)
++CFLAGS+  = $(USEZ) $(DOS) $(UNIX)
  
  L       =  $(ZLIB) 
 -CC      = gcc
@@ -17,12 +17,13 @@ Honor CC, CFLAGS and LDFLAGS from pkgsrc.
  DESTDIR	= /usr/local/bin
  MANDIR	= /usr/local/man/man1
  DOCDIR	= /usr/local/doc/atasm
-@@ -37,7 +37,7 @@ setparse.o: symbol.h
- inc_path.o: inc_path.h inc_path.c
+@@ -42,7 +42,8 @@ symbol.o: symbol.h inc_path.h atasm_err.
  
  prog : $(OBJS)
--	$(CC) -o atasm $(OBJS) $(L)
+ 	$(CC) -o atasm $(OBJS) $(L)
+-  
 +	$(CC) $(LDFLAGS) -o atasm $(OBJS) $(L)
-   
++
  clean:  
  	rm -f *.rej *.o *~ atasm atasm.1 atasm.exe
+ 	cd ../tests && make clean
diff --git a/cross/atasm/patches/patch-ab b/cross/atasm/patches/patch-ab
index ee1b0ab3e65..89ae00f7b4f 100644
--- a/cross/atasm/patches/patch-ab
+++ b/cross/atasm/patches/patch-ab
@@ -1,20 +1,22 @@
-$NetBSD: patch-ab,v 1.1 2004/02/22 04:01:15 kristerw Exp $
+$NetBSD: patch-ab,v 1.2 2014/12/09 15:10:47 mef Exp $
 
---- symbol.c.orig	Sun Feb 22 04:56:22 2004
-+++ symbol.c	Sun Feb 22 04:56:45 2004
-@@ -136,6 +136,7 @@
+Make this package build when using gcc 2.95.
+
+--- symbol.c.orig	2009-03-18 05:39:26.000000000 +0900
++++ src/symbol.c	2014-12-09 23:31:26.000000000 +0900
+@@ -150,6 +150,7 @@ void addUnk(char *unk) {
        snprintf(buf,256,"=%.4x_%s=%s",invoked->orig->times,invoked->orig->name,unk);
        unk=buf;
      }
 +    {
-     unkLabel *look=isUnk(unk);
+     look=isUnk(unk);
      if (!look) {
        unkLabel *u=(unkLabel *)malloc(sizeof(unkLabel));
-@@ -144,6 +145,7 @@
+@@ -158,6 +159,7 @@ void addUnk(char *unk) {
        unkLabels=u;
        u->label=(char *)malloc(strlen(unk)+1);
        strcpy(u->label,unk);
 +      }
-     } 
+     }
    }
  }