Thu Dec 19 22:13:49 2019 UTC ()
Add missing dependency on generated files. Build as C++03.


(joerg)
diff -r1.21 -r1.22 pkgsrc/devel/tavrasm/Makefile
diff -r1.11 -r1.12 pkgsrc/devel/tavrasm/distinfo
diff -r1.4 -r1.5 pkgsrc/devel/tavrasm/patches/patch-aa
cvs diff -r1.21 -r1.22 pkgsrc/devel/tavrasm/Makefile (expand / switch to context diff)
--- pkgsrc/devel/tavrasm/Makefile 2015/04/26 13:26:32 1.21
+++ pkgsrc/devel/tavrasm/Makefile 2019/12/19 22:13:48 1.22
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2015/04/26 13:26:32 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2019/12/19 22:13:48 joerg Exp $
 #
 
 DISTNAME=	tavrasm
@@ -10,7 +10,7 @@
 HOMEPAGE=	http://www.tavrasm.org/
 COMMENT=	Assembler for the Atmel AVR series of microcontrollers
 
-MAKE_JOBS_SAFE=		no
+USE_LANGUAGES=	c++03
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:S/.//:S/-/./}
 BUILD_DIRS=	src
cvs diff -r1.11 -r1.12 pkgsrc/devel/tavrasm/distinfo (expand / switch to context diff)
--- pkgsrc/devel/tavrasm/distinfo 2015/11/03 03:29:34 1.11
+++ pkgsrc/devel/tavrasm/distinfo 2019/12/19 22:13:48 1.12
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2015/11/03 03:29:34 agc Exp $
+$NetBSD: distinfo,v 1.12 2019/12/19 22:13:48 joerg Exp $
 
 SHA1 (tavrasm-1.22/tavrasm.tar.gz) = 9d19035b9fcc460a33a85338010541824633c417
 RMD160 (tavrasm-1.22/tavrasm.tar.gz) = 1e0f4553be660ebcfa44b2a9d81b3936997492e2
 SHA512 (tavrasm-1.22/tavrasm.tar.gz) = 0f33607e2ffbe8c56268b15dc62fe6c2b565bf898c68e198846f11fb30da4da3f398d07ef7ac16050dbc92ffcb04612459027a2c27cf48fc7d74392c5f6a38dc
 Size (tavrasm-1.22/tavrasm.tar.gz) = 65685 bytes
-SHA1 (patch-aa) = 45442e39cee3daaf08361811ec8607b59c223a2c
+SHA1 (patch-aa) = d2e8d79bd5a92beb19fff3235efd948d841905e7
 SHA1 (patch-ab) = 209bbf9f2ce809d0d7460355258ab5b6d955d9a6
cvs diff -r1.4 -r1.5 pkgsrc/devel/tavrasm/patches/patch-aa (expand / switch to context diff)
--- pkgsrc/devel/tavrasm/patches/patch-aa 2006/10/01 21:03:36 1.4
+++ pkgsrc/devel/tavrasm/patches/patch-aa 2019/12/19 22:13:48 1.5
@@ -1,15 +1,14 @@
-$NetBSD: patch-aa,v 1.4 2006/10/01 21:03:36 dillo Exp $
+$NetBSD: patch-aa,v 1.5 2019/12/19 22:13:48 joerg Exp $
 
---- src/makefile.orig	2003-03-12 01:56:02.000000000 +0100
+--- src/makefile.orig	2004-12-11 23:51:29.000000000 +0000
 +++ src/makefile
-@@ -24,12 +24,14 @@ VERSION		= 117
+@@ -24,27 +24,30 @@ VERSION		= 122
  
  ### Compiler options #########################################################
  
 -CC		= gcc
 -CFLAGS          = -O2 -Wall -DAVRLANG=LANGUAGE_$(LANGUAGE)
 -CPPFLAGS	=
-+CC		?= gcc
 +CFLAGS          += -DAVRLANG=LANGUAGE_$(LANGUAGE)
 +CPPFLAGS	?=
  CCFLAGS         = $(CFLAGS) $(CPPFLAGS)
@@ -21,14 +20,17 @@
  
  ### Defaul CC files #########################################################
  
-@@ -38,13 +40,15 @@ OBJS		= avrparse.o avrlex.o avrasm.o sym
+ .cc.o:
+-		$(CC) -c $(CCFLAGS) $<
++		$(CXX) -c $(CCFLAGS) $<
  
  ### Executable ##############################################################
  
 +all:	$(EXENAME)
 +
  $(EXENAME):	$(OBJS)
- 		$(CC) $(CCFLAGS) $(OBJS) $(LINK) -o $@
+-		$(CC) $(CCFLAGS) $(OBJS) $(LINK) -o $@
++		$(CXX) $(CCFLAGS) $(OBJS) $(LINK) -o $@
  
  ### Parser file #############################################################
  
@@ -38,7 +40,7 @@
  		mv avrparse avrparse.cc
  		mv avrparse.h avrparse.hh
  
-@@ -52,12 +56,12 @@ avrparse.cc:	avrparse.y avrasm.hh symbol
+@@ -52,12 +55,13 @@ 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
@@ -49,6 +51,7 @@
  
 -avrlex.o:	avrlex.l
 -avrparse.o:	avrparse.y
++avrparse.hh:	avrparse.cc
 +avrlex.o:	avrlex.cc
 +avrparse.o:	avrparse.cc
  avrasm.o:	avrasm.cc avrasm.hh symbol.hh devices.hh messages.hh