Received: by mail.netbsd.org (Postfix, from userid 605) id A90D384D8B; Sun, 31 May 2020 14:11:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3421C84D77 for ; Sun, 31 May 2020 14:11:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id WddcGjj3x7al for ; Sun, 31 May 2020 14:11:42 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 73E2984CE0 for ; Sun, 31 May 2020 14:11:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6CF42FB27; Sun, 31 May 2020 14:11:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1590934302292550" MIME-Version: 1.0 Date: Sun, 31 May 2020 14:11:42 +0000 From: "Makoto Fujiwara" Subject: CVS commit: pkgsrc/emulators/simulavr To: pkgsrc-changes@NetBSD.org Reply-To: mef@netbsd.org X-Mailer: log_accum Message-Id: <20200531141142.6CF42FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1590934302292550 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: mef Date: Sun May 31 14:11:42 UTC 2020 Modified Files: pkgsrc/emulators/simulavr: Makefile distinfo pkgsrc/emulators/simulavr/patches: patch-src_Makefile.in patch-src_cmd_gdbserver.cpp Log Message: (emulators/simulavr) long standing no regen on patch, and resulting SUBST issue. Fix them (I hope) To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 pkgsrc/emulators/simulavr/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/emulators/simulavr/distinfo cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/emulators/simulavr/patches/patch-src_Makefile.in cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/emulators/simulavr/patches/patch-src_cmd_gdbserver.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1590934302292550 Content-Disposition: inline Content-Length: 4093 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/simulavr/Makefile diff -u pkgsrc/emulators/simulavr/Makefile:1.30 pkgsrc/emulators/simulavr/Makefile:1.31 --- pkgsrc/emulators/simulavr/Makefile:1.30 Sat Jan 18 23:30:50 2020 +++ pkgsrc/emulators/simulavr/Makefile Sun May 31 14:11:42 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2020/01/18 23:30:50 rillig Exp $ +# $NetBSD: Makefile,v 1.31 2020/05/31 14:11:42 mef Exp $ # DISTNAME= simulavr-1.0.0 PKGREVISION= 5 @@ -39,6 +39,7 @@ SUBST_STAGE.prefix= pre-configure SUBST_MESSAGE.prefix= Fix include path finding Python.h SUBST_FILES.prefix= src/Makefile.in SUBST_VARS.prefix= PREFIX +SUBST_VARS.prefix+= PY_VER_SUFFIX # Following SUBST_CLASSES are from diff against git version (as of 2013-08-08) # See also Index: pkgsrc/emulators/simulavr/distinfo diff -u pkgsrc/emulators/simulavr/distinfo:1.13 pkgsrc/emulators/simulavr/distinfo:1.14 --- pkgsrc/emulators/simulavr/distinfo:1.13 Tue May 26 11:28:50 2020 +++ pkgsrc/emulators/simulavr/distinfo Sun May 31 14:11:42 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2020/05/26 11:28:50 joerg Exp $ +$NetBSD: distinfo,v 1.14 2020/05/31 14:11:42 mef Exp $ SHA1 (simulavr-1.0.0.tar.gz) = e7cacc74be974793bd9c18330ec8d128fbd17d42 RMD160 (simulavr-1.0.0.tar.gz) = 0e9eb32f398943449b564e919765348c32f4c600 @@ -9,7 +9,8 @@ SHA1 (patch-doc_simulavr_texinfo) = b2d1 SHA1 (patch-examples_atmel_key_StdDefs_c) = 73a89da0144d1d0cc2c678476270ea1f79300089 SHA1 (patch-examples_atmel_key_scancodes.h) = f7f6d3f2da8eec4cf9b52800a499bd8300545bc0 SHA1 (patch-regress_timertest_timer_16bit.c) = 81ee86847fd4d40817b2f4bf01e03aca86856f3c -SHA1 (patch-src_cmd_gdbserver.cpp) = 4697b3ddb0e1b5e8088beab2a0af67c226921447 +SHA1 (patch-src_Makefile.in) = 4db5a6b72180958466cd46979cb3ad40f45ab9ed +SHA1 (patch-src_cmd_gdbserver.cpp) = 29156d12667eaa1545628f64737766b75a4e92ed SHA1 (patch-src_systemclock_cpp) = 91535a11446dade72752dd0d549d4a605c5e90bc SHA1 (patch-src_systemclock_h) = fce9df95336b02b3152ec9b162a085c8c4b20283 SHA1 (patch-src_traceval_cpp) = a92597bd935916fa0ec366b9187df33f075a7c83 Index: pkgsrc/emulators/simulavr/patches/patch-src_Makefile.in diff -u pkgsrc/emulators/simulavr/patches/patch-src_Makefile.in:1.2 pkgsrc/emulators/simulavr/patches/patch-src_Makefile.in:1.3 --- pkgsrc/emulators/simulavr/patches/patch-src_Makefile.in:1.2 Fri Aug 29 04:40:06 2014 +++ pkgsrc/emulators/simulavr/patches/patch-src_Makefile.in Sun May 31 14:11:42 2020 @@ -1,4 +1,4 @@ -$NetBSD: patch-src_Makefile.in,v 1.2 2014/08/29 04:40:06 mef Exp $ +$NetBSD: patch-src_Makefile.in,v 1.3 2020/05/31 14:11:42 mef Exp $ /usr/pkg/bin/swig -c++ -python -Ipython -o pysim ... ... @@ -11,7 +11,7 @@ pysimulavr_wrap.cpp:146:20: fatal error: @USE_SWIG_TRUE@@USE_TCL_TRUE@TCL_INCLUDE = @AVR_TCL_INCLUDE@ @PYTHON_USE_TRUE@@USE_SWIG_TRUE@PYTHON_MODUL_LIB = _pysimulavr@PYTHON_MODULE_EXTENSION@ -@PYTHON_USE_TRUE@@USE_SWIG_TRUE@PYTHON_XTRA_INC = -Ipython -+@PYTHON_USE_TRUE@@USE_SWIG_TRUE@PYTHON_XTRA_INC = -I@PREFIX@/include/python2.7 -Ipython ++@PYTHON_USE_TRUE@@USE_SWIG_TRUE@PYTHON_XTRA_INC = -I@PREFIX@/include/@PY_VER_SUFFIX@ -Ipython @PYTHON_USE_TRUE@@USE_SWIG_TRUE@PYTHON_MODUL_INTERFACE = $(srcdir)/python/pysimulavr.i @PYTHON_USE_TRUE@@USE_SWIG_TRUE@nodist_lib_pysimulavr_la_SOURCES = pysimulavr_wrap.cpp @PYTHON_USE_TRUE@@USE_SWIG_TRUE@lib_pysimulavr_la_CPPFLAGS = $(PYTHON_CPPFLAGS) $(PYTHON_XTRA_INC) Index: pkgsrc/emulators/simulavr/patches/patch-src_cmd_gdbserver.cpp diff -u pkgsrc/emulators/simulavr/patches/patch-src_cmd_gdbserver.cpp:1.1 pkgsrc/emulators/simulavr/patches/patch-src_cmd_gdbserver.cpp:1.2 --- pkgsrc/emulators/simulavr/patches/patch-src_cmd_gdbserver.cpp:1.1 Tue May 26 11:28:50 2020 +++ pkgsrc/emulators/simulavr/patches/patch-src_cmd_gdbserver.cpp Sun May 31 14:11:42 2020 @@ -1,4 +1,6 @@ -$NetBSD: patch-src_cmd_gdbserver.cpp,v 1.1 2020/05/26 11:28:50 joerg Exp $ +$NetBSD: patch-src_cmd_gdbserver.cpp,v 1.2 2020/05/31 14:11:42 mef Exp $ + +Use BSD bind, not STL bind. --- src/cmd/gdbserver.cpp.orig 2020-05-26 01:36:49.070961229 +0000 +++ src/cmd/gdbserver.cpp --_----------=_1590934302292550--