Sun May 31 14:11:42 2020 UTC ()
(emulators/simulavr) long standing no regen on patch, and resulting SUBST issue. Fix them (I hope)


(mef)
diff -r1.30 -r1.31 pkgsrc/emulators/simulavr/Makefile
diff -r1.13 -r1.14 pkgsrc/emulators/simulavr/distinfo
diff -r1.2 -r1.3 pkgsrc/emulators/simulavr/patches/patch-src_Makefile.in
diff -r1.1 -r1.2 pkgsrc/emulators/simulavr/patches/patch-src_cmd_gdbserver.cpp
cvs diff -r1.30 -r1.31 pkgsrc/emulators/simulavr/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/simulavr/Makefile 2020/01/18 23:30:50 1.30
+++ pkgsrc/emulators/simulavr/Makefile 2020/05/31 14:11:42 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.30 2020/01/18 23:30:50 rillig Exp $ 1# $NetBSD: Makefile,v 1.31 2020/05/31 14:11:42 mef Exp $
2# 2#
3DISTNAME= simulavr-1.0.0 3DISTNAME= simulavr-1.0.0
4PKGREVISION= 5 4PKGREVISION= 5
5CATEGORIES= emulators 5CATEGORIES= emulators
6MASTER_SITES= http://download.savannah.gnu.org/releases/simulavr/ 6MASTER_SITES= http://download.savannah.gnu.org/releases/simulavr/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.nongnu.org/simulavr/ 9HOMEPAGE= https://www.nongnu.org/simulavr/
10COMMENT= Simulator for Atmel AVR microcontrollers 10COMMENT= Simulator for Atmel AVR microcontrollers
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen 13BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
14BUILD_DEPENDS+= avr-libc-[0-9]*:../../cross/avr-libc 14BUILD_DEPENDS+= avr-libc-[0-9]*:../../cross/avr-libc
@@ -29,26 +29,27 @@ USE_TOOLS+= makeinfo gmake @@ -29,26 +29,27 @@ USE_TOOLS+= makeinfo gmake
29USE_LIBTOOL= yes 29USE_LIBTOOL= yes
30USE_LANGUAGES+= c c++ 30USE_LANGUAGES+= c c++
31 31
32USE_PKGLOCALEDIR= yes 32USE_PKGLOCALEDIR= yes
33GNU_CONFIGURE= yes 33GNU_CONFIGURE= yes
34INFO_FILES= yes 34INFO_FILES= yes
35 35
36# Interim fix 36# Interim fix
37SUBST_CLASSES+= prefix 37SUBST_CLASSES+= prefix
38SUBST_STAGE.prefix= pre-configure 38SUBST_STAGE.prefix= pre-configure
39SUBST_MESSAGE.prefix= Fix include path finding Python.h 39SUBST_MESSAGE.prefix= Fix include path finding Python.h
40SUBST_FILES.prefix= src/Makefile.in 40SUBST_FILES.prefix= src/Makefile.in
41SUBST_VARS.prefix= PREFIX 41SUBST_VARS.prefix= PREFIX
 42SUBST_VARS.prefix+= PY_VER_SUFFIX
42 43
43# Following SUBST_CLASSES are from diff against git version (as of 2013-08-08) 44# Following SUBST_CLASSES are from diff against git version (as of 2013-08-08)
44# See also 45# See also
45# http://savannah.nongnu.org/bugs/?35737 46# http://savannah.nongnu.org/bugs/?35737
46SUBST_CLASSES+= compare2 47SUBST_CLASSES+= compare2
47SUBST_STAGE.compare2= pre-configure 48SUBST_STAGE.compare2= pre-configure
48SUBST_MESSAGE.compare2= Convert poisoned SIG_OUTPUT_COMPARE2 to TIMER2_COMP_vect 49SUBST_MESSAGE.compare2= Convert poisoned SIG_OUTPUT_COMPARE2 to TIMER2_COMP_vect
49SUBST_FILES.compare2= examples/atmega128_timer/main.c 50SUBST_FILES.compare2= examples/atmega128_timer/main.c
50SUBST_FILES.compare2+= examples/python/example.c 51SUBST_FILES.compare2+= examples/python/example.c
51SUBST_FILES.compare2+= examples/python/example_io.c 52SUBST_FILES.compare2+= examples/python/example_io.c
52SUBST_FILES.compare2+= examples/python/ex_pinout.c 53SUBST_FILES.compare2+= examples/python/ex_pinout.c
53SUBST_FILES.compare2+= regress/timertest/timer_8bit_ctc.c 54SUBST_FILES.compare2+= regress/timertest/timer_8bit_ctc.c
54SUBST_SED.compare2= -e 's/SIG_OUTPUT_COMPARE2/TIMER2_COMP_vect/g' 55SUBST_SED.compare2= -e 's/SIG_OUTPUT_COMPARE2/TIMER2_COMP_vect/g'
cvs diff -r1.13 -r1.14 pkgsrc/emulators/simulavr/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/simulavr/distinfo 2020/05/26 11:28:50 1.13
+++ pkgsrc/emulators/simulavr/distinfo 2020/05/31 14:11:42 1.14
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: distinfo,v 1.13 2020/05/26 11:28:50 joerg Exp $ 1$NetBSD: distinfo,v 1.14 2020/05/31 14:11:42 mef Exp $
2 2
3SHA1 (simulavr-1.0.0.tar.gz) = e7cacc74be974793bd9c18330ec8d128fbd17d42 3SHA1 (simulavr-1.0.0.tar.gz) = e7cacc74be974793bd9c18330ec8d128fbd17d42
4RMD160 (simulavr-1.0.0.tar.gz) = 0e9eb32f398943449b564e919765348c32f4c600 4RMD160 (simulavr-1.0.0.tar.gz) = 0e9eb32f398943449b564e919765348c32f4c600
5SHA512 (simulavr-1.0.0.tar.gz) = d6649c2c61730beacbab01f882517fbbc8d9b8bdd7356e16dcdb02efa09f284fb633fe2d6e2d1bbe868648aa11685eaa6531540e6007eb9aeafd09da0b4af49f 5SHA512 (simulavr-1.0.0.tar.gz) = d6649c2c61730beacbab01f882517fbbc8d9b8bdd7356e16dcdb02efa09f284fb633fe2d6e2d1bbe868648aa11685eaa6531540e6007eb9aeafd09da0b4af49f
6Size (simulavr-1.0.0.tar.gz) = 1013014 bytes 6Size (simulavr-1.0.0.tar.gz) = 1013014 bytes
7SHA1 (patch-configure) = 8fe7c24d17ded8a5b53688f5d35b4aaf55e6c830 7SHA1 (patch-configure) = 8fe7c24d17ded8a5b53688f5d35b4aaf55e6c830
8SHA1 (patch-doc_simulavr_texinfo) = b2d169f24623c090038a6d4196f284ae9a611831 8SHA1 (patch-doc_simulavr_texinfo) = b2d169f24623c090038a6d4196f284ae9a611831
9SHA1 (patch-examples_atmel_key_StdDefs_c) = 73a89da0144d1d0cc2c678476270ea1f79300089 9SHA1 (patch-examples_atmel_key_StdDefs_c) = 73a89da0144d1d0cc2c678476270ea1f79300089
10SHA1 (patch-examples_atmel_key_scancodes.h) = f7f6d3f2da8eec4cf9b52800a499bd8300545bc0 10SHA1 (patch-examples_atmel_key_scancodes.h) = f7f6d3f2da8eec4cf9b52800a499bd8300545bc0
11SHA1 (patch-regress_timertest_timer_16bit.c) = 81ee86847fd4d40817b2f4bf01e03aca86856f3c 11SHA1 (patch-regress_timertest_timer_16bit.c) = 81ee86847fd4d40817b2f4bf01e03aca86856f3c
12SHA1 (patch-src_cmd_gdbserver.cpp) = 4697b3ddb0e1b5e8088beab2a0af67c226921447 12SHA1 (patch-src_Makefile.in) = 4db5a6b72180958466cd46979cb3ad40f45ab9ed
 13SHA1 (patch-src_cmd_gdbserver.cpp) = 29156d12667eaa1545628f64737766b75a4e92ed
13SHA1 (patch-src_systemclock_cpp) = 91535a11446dade72752dd0d549d4a605c5e90bc 14SHA1 (patch-src_systemclock_cpp) = 91535a11446dade72752dd0d549d4a605c5e90bc
14SHA1 (patch-src_systemclock_h) = fce9df95336b02b3152ec9b162a085c8c4b20283 15SHA1 (patch-src_systemclock_h) = fce9df95336b02b3152ec9b162a085c8c4b20283
15SHA1 (patch-src_traceval_cpp) = a92597bd935916fa0ec366b9187df33f075a7c83 16SHA1 (patch-src_traceval_cpp) = a92597bd935916fa0ec366b9187df33f075a7c83
16SHA1 (patch-src_traceval_h) = 140fc29e4879d1a4d9ad650ce8eb0be6939e1aae 17SHA1 (patch-src_traceval_h) = 140fc29e4879d1a4d9ad650ce8eb0be6939e1aae
cvs diff -r1.2 -r1.3 pkgsrc/emulators/simulavr/patches/patch-src_Makefile.in (expand / switch to unified diff)

--- pkgsrc/emulators/simulavr/patches/patch-src_Makefile.in 2014/08/29 04:40:06 1.2
+++ pkgsrc/emulators/simulavr/patches/patch-src_Makefile.in 2020/05/31 14:11:42 1.3
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-src_Makefile.in,v 1.2 2014/08/29 04:40:06 mef Exp $ 1$NetBSD: patch-src_Makefile.in,v 1.3 2020/05/31 14:11:42 mef Exp $
2 2
3/usr/pkg/bin/swig -c++ -python -Ipython -o pysim ... 3/usr/pkg/bin/swig -c++ -python -Ipython -o pysim ...
4... 4...
5pysimulavr_wrap.cpp:146:20: fatal error: Python.h: No such file or directory 5pysimulavr_wrap.cpp:146:20: fatal error: Python.h: No such file or directory
6 6
7--- src/Makefile.in.orig 2013-07-07 10:12:33.000000000 +0900 7--- src/Makefile.in.orig 2013-07-07 10:12:33.000000000 +0900
8+++ src/Makefile.in 2013-07-07 10:31:40.000000000 +0900 8+++ src/Makefile.in 2013-07-07 10:31:40.000000000 +0900
9@@ -395,7 +395,7 @@ 9@@ -395,7 +395,7 @@
10 @USE_SWIG_TRUE@@USE_TCL_TRUE@TCL_LIB = @AVR_TCL_LIB@ 10 @USE_SWIG_TRUE@@USE_TCL_TRUE@TCL_LIB = @AVR_TCL_LIB@
11 @USE_SWIG_TRUE@@USE_TCL_TRUE@TCL_INCLUDE = @AVR_TCL_INCLUDE@ 11 @USE_SWIG_TRUE@@USE_TCL_TRUE@TCL_INCLUDE = @AVR_TCL_INCLUDE@
12 @PYTHON_USE_TRUE@@USE_SWIG_TRUE@PYTHON_MODUL_LIB = _pysimulavr@PYTHON_MODULE_EXTENSION@ 12 @PYTHON_USE_TRUE@@USE_SWIG_TRUE@PYTHON_MODUL_LIB = _pysimulavr@PYTHON_MODULE_EXTENSION@
13-@PYTHON_USE_TRUE@@USE_SWIG_TRUE@PYTHON_XTRA_INC = -Ipython 13-@PYTHON_USE_TRUE@@USE_SWIG_TRUE@PYTHON_XTRA_INC = -Ipython
14+@PYTHON_USE_TRUE@@USE_SWIG_TRUE@PYTHON_XTRA_INC = -I@PREFIX@/include/python2.7 -Ipython 14+@PYTHON_USE_TRUE@@USE_SWIG_TRUE@PYTHON_XTRA_INC = -I@PREFIX@/include/@PY_VER_SUFFIX@ -Ipython
15 @PYTHON_USE_TRUE@@USE_SWIG_TRUE@PYTHON_MODUL_INTERFACE = $(srcdir)/python/pysimulavr.i 15 @PYTHON_USE_TRUE@@USE_SWIG_TRUE@PYTHON_MODUL_INTERFACE = $(srcdir)/python/pysimulavr.i
16 @PYTHON_USE_TRUE@@USE_SWIG_TRUE@nodist_lib_pysimulavr_la_SOURCES = pysimulavr_wrap.cpp 16 @PYTHON_USE_TRUE@@USE_SWIG_TRUE@nodist_lib_pysimulavr_la_SOURCES = pysimulavr_wrap.cpp
17 @PYTHON_USE_TRUE@@USE_SWIG_TRUE@lib_pysimulavr_la_CPPFLAGS = $(PYTHON_CPPFLAGS) $(PYTHON_XTRA_INC) 17 @PYTHON_USE_TRUE@@USE_SWIG_TRUE@lib_pysimulavr_la_CPPFLAGS = $(PYTHON_CPPFLAGS) $(PYTHON_XTRA_INC)
cvs diff -r1.1 -r1.2 pkgsrc/emulators/simulavr/patches/patch-src_cmd_gdbserver.cpp (expand / switch to unified diff)

--- pkgsrc/emulators/simulavr/patches/patch-src_cmd_gdbserver.cpp 2020/05/26 11:28:50 1.1
+++ pkgsrc/emulators/simulavr/patches/patch-src_cmd_gdbserver.cpp 2020/05/31 14:11:42 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-src_cmd_gdbserver.cpp,v 1.1 2020/05/26 11:28:50 joerg Exp $ 1$NetBSD: patch-src_cmd_gdbserver.cpp,v 1.2 2020/05/31 14:11:42 mef Exp $
 2
 3Use BSD bind, not STL bind.
2 4
3--- src/cmd/gdbserver.cpp.orig 2020-05-26 01:36:49.070961229 +0000 5--- src/cmd/gdbserver.cpp.orig 2020-05-26 01:36:49.070961229 +0000
4+++ src/cmd/gdbserver.cpp 6+++ src/cmd/gdbserver.cpp
5@@ -183,7 +183,7 @@ GdbServerSocketUnix::GdbServerSocketUnix 7@@ -183,7 +183,7 @@ GdbServerSocketUnix::GdbServerSocketUnix
6 address->sin_port = htons(port); 8 address->sin_port = htons(port);
7 memset(&address->sin_addr, 0, sizeof(address->sin_addr)); 9 memset(&address->sin_addr, 0, sizeof(address->sin_addr));
8  10
9- if(bind(sock, (struct sockaddr *)address, sizeof(address))) 11- if(bind(sock, (struct sockaddr *)address, sizeof(address)))
10+ if(::bind(sock, (struct sockaddr *)address, sizeof(address))) 12+ if(::bind(sock, (struct sockaddr *)address, sizeof(address)))
11 avr_error("Can not bind socket: %s", strerror(errno)); 13 avr_error("Can not bind socket: %s", strerror(errno));
12  14
13 if(listen(sock, 1) < 0) 15 if(listen(sock, 1) < 0)