>Number:         22711
>Category:       pkg
>Synopsis:       tavrasm has been updated to version 1.19
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Sep 07 07:44:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Lloyd Parkes
>Release:        NetBSD 1.6.1_STABLE
>Organization:
Must Have Coffee
>Environment:
System: NetBSD ophidian.must-have-coffee.gen.nz 1.6.1_STABLE NetBSD 1.6.1_STABLE (Workstation) #1: Mon Jun 2 15:43:10 NZST 2003 lloyd@ophidian.must-have-coffee.gen.nz:/data/src/sys/arch/i386/compile/Workstation i386
Architecture: i386
Machine: i386
>Description:

A new version of Tavrasm has been released by the author,
unfortunately the distrubition file is not version numbered, so the
NetBSD package system is unable to fetch the version of the source
code that matches the NetBSD package makefile.

>How-To-Repeat:
Type make install
>Fix:
Update the Makefile and patch-aa as follows.
# $NetBSD: Makefile,v 1.6 2002/08/20 08:30:45 dillo Exp $
#

DISTNAME=	tavrasm
PKGNAME=	${DISTNAME}-1.19
CATEGORIES=	devel
MASTER_SITES=	http://www.tavrasm.org/

MAINTAINER=	dillo@giga.or.at
HOMEPAGE=	http://www.tavrasm.org/
COMMENT=	Assembler for the Atmel AVR series of microcontrollers

BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison

WRKSRCTOP=	${WRKDIR}/tavrasm.119
WRKSRC=		${WRKSRCTOP}/src
MAKEFILE=	makefile

DIST_SUBDIR=	${PKGNAME}

do-install:
	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tavrasm
	${INSTALL_DATA} ${WRKSRCTOP}/README ${PREFIX}/share/doc/tavrasm/README
	${INSTALL_PROGRAM} ${WRKSRC}/tavrasm ${PREFIX}/bin

.include "../../mk/bsd.pkg.mk"

$NetBSD$

--- makefile.orig	Tue Apr  3 10:27:39 2001
+++ makefile
@@ -30,6 +30,8 @@ CPPFLAGS	=
 CCFLAGS         = $(CFLAGS) $(CPPFLAGS)
 LINK            = -lm -lstdc++
 OBJS		= avrparse.o avrlex.o avrasm.o symbol.o semantic.o utils.o
+LEX		= lex
+YACC		= bison
 
 ### Defaul CC files #########################################################
 
@@ -38,13 +40,15 @@ OBJS		= avrparse.o avrlex.o avrasm.o sym
 
 ### Executable ##############################################################
 
+all:	$(EXENAME)
+
 $(EXENAME):	$(OBJS)
 		$(CC) $(CCFLAGS) $(OBJS) $(LINK) -o $@
 
 ### Parser file #############################################################
 
 avrparse.cc:	avrparse.y avrasm.hh symbol.hh semantic.hh opcodes.hh
-		bison -d -o avrparse avrparse.y
+		${YACC} -d -o avrparse avrparse.y
 		mv avrparse avrparse.cc
 		mv avrparse.h avrparse.hh
 
@@ -52,12 +56,12 @@ avrparse.cc:	avrparse.y avrasm.hh symbol
 
 avrlex.cc:	avrparse.cc avrlex.l symbol.hh semantic.hh avrparse.hh \
 		opcodes.hh avrasm.hh messages.hh
-		flex -o$@ avrlex.l
+		${LEX} -o$@ avrlex.l
 
 ### Dependencies ############################################################
 
-avrlex.o:	avrlex.l
-avrparse.o:	avrparse.y
+avrlex.o:	avrlex.cc
+avrparse.o:	avrparse.cc
 avrasm.o:	avrasm.cc avrasm.hh symbol.hh devices.hh messages.hh
 symbol.o:	symbol.cc symbol.hh avrasm.hh
 utils.o:	utils.cc utils.hh avrasm.hh messages.hh msg_us.hh msg_de.hh msg_sp.hh
>Release-Note:
>Audit-Trail:
>Unformatted: