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 unified 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,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: Makefile,v 1.21 2015/04/26 13:26:32 joerg Exp $ 1# $NetBSD: Makefile,v 1.22 2019/12/19 22:13:48 joerg Exp $
2# 2#
3 3
4DISTNAME= tavrasm 4DISTNAME= tavrasm
5PKGNAME= ${DISTNAME}-1.22 5PKGNAME= ${DISTNAME}-1.22
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_FREEBSD} 7MASTER_SITES= ${MASTER_SITE_FREEBSD}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.tavrasm.org/ 10HOMEPAGE= http://www.tavrasm.org/
11COMMENT= Assembler for the Atmel AVR series of microcontrollers 11COMMENT= Assembler for the Atmel AVR series of microcontrollers
12 12
13MAKE_JOBS_SAFE= no 13USE_LANGUAGES= c++03
14 14
15WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/.//:S/-/./} 15WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/.//:S/-/./}
16BUILD_DIRS= src 16BUILD_DIRS= src
17USE_TOOLS+= lex bison 17USE_TOOLS+= lex bison
18MAKE_FILE= makefile 18MAKE_FILE= makefile
19 19
20DIST_SUBDIR= ${PKGNAME_NOREV} 20DIST_SUBDIR= ${PKGNAME_NOREV}
21 21
22INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 22INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
23 23
24do-install: 24do-install:
25 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/tavrasm 25 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/tavrasm
26 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/tavrasm/README 26 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/tavrasm/README
cvs diff -r1.11 -r1.12 pkgsrc/devel/tavrasm/distinfo (expand / switch to unified 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 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.11 2015/11/03 03:29:34 agc Exp $ 1$NetBSD: distinfo,v 1.12 2019/12/19 22:13:48 joerg Exp $
2 2
3SHA1 (tavrasm-1.22/tavrasm.tar.gz) = 9d19035b9fcc460a33a85338010541824633c417 3SHA1 (tavrasm-1.22/tavrasm.tar.gz) = 9d19035b9fcc460a33a85338010541824633c417
4RMD160 (tavrasm-1.22/tavrasm.tar.gz) = 1e0f4553be660ebcfa44b2a9d81b3936997492e2 4RMD160 (tavrasm-1.22/tavrasm.tar.gz) = 1e0f4553be660ebcfa44b2a9d81b3936997492e2
5SHA512 (tavrasm-1.22/tavrasm.tar.gz) = 0f33607e2ffbe8c56268b15dc62fe6c2b565bf898c68e198846f11fb30da4da3f398d07ef7ac16050dbc92ffcb04612459027a2c27cf48fc7d74392c5f6a38dc 5SHA512 (tavrasm-1.22/tavrasm.tar.gz) = 0f33607e2ffbe8c56268b15dc62fe6c2b565bf898c68e198846f11fb30da4da3f398d07ef7ac16050dbc92ffcb04612459027a2c27cf48fc7d74392c5f6a38dc
6Size (tavrasm-1.22/tavrasm.tar.gz) = 65685 bytes 6Size (tavrasm-1.22/tavrasm.tar.gz) = 65685 bytes
7SHA1 (patch-aa) = 45442e39cee3daaf08361811ec8607b59c223a2c 7SHA1 (patch-aa) = d2e8d79bd5a92beb19fff3235efd948d841905e7
8SHA1 (patch-ab) = 209bbf9f2ce809d0d7460355258ab5b6d955d9a6 8SHA1 (patch-ab) = 209bbf9f2ce809d0d7460355258ab5b6d955d9a6
cvs diff -r1.4 -r1.5 pkgsrc/devel/tavrasm/patches/patch-aa (expand / switch to unified 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,56 +1,59 @@ @@ -1,56 +1,59 @@
1$NetBSD: patch-aa,v 1.4 2006/10/01 21:03:36 dillo Exp $ 1$NetBSD: patch-aa,v 1.5 2019/12/19 22:13:48 joerg Exp $
2 2
3--- src/makefile.orig 2003-03-12 01:56:02.000000000 +0100 3--- src/makefile.orig 2004-12-11 23:51:29.000000000 +0000
4+++ src/makefile 4+++ src/makefile
5@@ -24,12 +24,14 @@ VERSION = 117 5@@ -24,27 +24,30 @@ VERSION = 122
6  6
7 ### Compiler options ######################################################### 7 ### Compiler options #########################################################
8  8
9-CC = gcc 9-CC = gcc
10-CFLAGS = -O2 -Wall -DAVRLANG=LANGUAGE_$(LANGUAGE) 10-CFLAGS = -O2 -Wall -DAVRLANG=LANGUAGE_$(LANGUAGE)
11-CPPFLAGS = 11-CPPFLAGS =
12+CC ?= gcc 
13+CFLAGS += -DAVRLANG=LANGUAGE_$(LANGUAGE) 12+CFLAGS += -DAVRLANG=LANGUAGE_$(LANGUAGE)
14+CPPFLAGS ?= 13+CPPFLAGS ?=
15 CCFLAGS = $(CFLAGS) $(CPPFLAGS) 14 CCFLAGS = $(CFLAGS) $(CPPFLAGS)
16-LINK = -lm -lstdc++ 15-LINK = -lm -lstdc++
17+LINK = $(LDFLAGS) $(LIBS) -lm -lstdc++ 16+LINK = $(LDFLAGS) $(LIBS) -lm -lstdc++
18 OBJS = avrparse.o avrlex.o avrasm.o symbol.o semantic.o utils.o 17 OBJS = avrparse.o avrlex.o avrasm.o symbol.o semantic.o utils.o
19+LEX = lex 18+LEX = lex
20+YACC = bison 19+YACC = bison
21  20
22 ### Defaul CC files ######################################################### 21 ### Defaul CC files #########################################################
23  22
24@@ -38,13 +40,15 @@ OBJS = avrparse.o avrlex.o avrasm.o sym 23 .cc.o:
 24- $(CC) -c $(CCFLAGS) $<
 25+ $(CXX) -c $(CCFLAGS) $<
25  26
26 ### Executable ############################################################## 27 ### Executable ##############################################################
27  28
28+all: $(EXENAME) 29+all: $(EXENAME)
29+ 30+
30 $(EXENAME): $(OBJS) 31 $(EXENAME): $(OBJS)
31 $(CC) $(CCFLAGS) $(OBJS) $(LINK) -o $@ 32- $(CC) $(CCFLAGS) $(OBJS) $(LINK) -o $@
 33+ $(CXX) $(CCFLAGS) $(OBJS) $(LINK) -o $@
32  34
33 ### Parser file ############################################################# 35 ### Parser file #############################################################
34  36
35 avrparse.cc: avrparse.y avrasm.hh symbol.hh semantic.hh opcodes.hh 37 avrparse.cc: avrparse.y avrasm.hh symbol.hh semantic.hh opcodes.hh
36- bison -d -o avrparse avrparse.y 38- bison -d -o avrparse avrparse.y
37+ ${YACC} -d -o avrparse avrparse.y 39+ ${YACC} -d -o avrparse avrparse.y
38 mv avrparse avrparse.cc 40 mv avrparse avrparse.cc
39 mv avrparse.h avrparse.hh 41 mv avrparse.h avrparse.hh
40  42
41@@ -52,12 +56,12 @@ avrparse.cc: avrparse.y avrasm.hh symbol 43@@ -52,12 +55,13 @@ avrparse.cc: avrparse.y avrasm.hh symbol
42  44
43 avrlex.cc: avrparse.cc avrlex.l symbol.hh semantic.hh avrparse.hh \ 45 avrlex.cc: avrparse.cc avrlex.l symbol.hh semantic.hh avrparse.hh \
44 opcodes.hh avrasm.hh messages.hh 46 opcodes.hh avrasm.hh messages.hh
45- flex -o$@ avrlex.l 47- flex -o$@ avrlex.l
46+ ${LEX} -o$@ avrlex.l 48+ ${LEX} -o$@ avrlex.l
47  49
48 ### Dependencies ############################################################ 50 ### Dependencies ############################################################
49  51
50-avrlex.o: avrlex.l 52-avrlex.o: avrlex.l
51-avrparse.o: avrparse.y 53-avrparse.o: avrparse.y
 54+avrparse.hh: avrparse.cc
52+avrlex.o: avrlex.cc 55+avrlex.o: avrlex.cc
53+avrparse.o: avrparse.cc 56+avrparse.o: avrparse.cc
54 avrasm.o: avrasm.cc avrasm.hh symbol.hh devices.hh messages.hh 57 avrasm.o: avrasm.cc avrasm.hh symbol.hh devices.hh messages.hh
55 symbol.o: symbol.cc symbol.hh avrasm.hh 58 symbol.o: symbol.cc symbol.hh avrasm.hh
56 utils.o: utils.cc utils.hh avrasm.hh messages.hh msg_us.hh msg_de.hh msg_sp.hh 59 utils.o: utils.cc utils.hh avrasm.hh messages.hh msg_us.hh msg_de.hh msg_sp.hh