From nobody Fri Apr 1 04:12:36 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 485FB1A42646; Fri, 1 Apr 2022 04:12:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KV6Fx1btfz3L4p; Fri, 1 Apr 2022 04:12:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648786357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pYFmSxznvWQD9CrSPjV5kGQOeXVFduPKtI3OYXwT0DA=; b=myhy56cYIuPvLuf3/FrJWOpVS6EBkJQj3q0Fogw28i5NePTeUNfnGzhEvqL7x0XaXD2NfM fuDrR4nm3xvr6bkP7+gqTClp+2OLTVcbKHuIPQfO42BX1hg9lx6Taxluh4PobmI2anK1U0 xMPYFVL2kXLeFTFqo3Z4NG4urx2J8YsdhLYebW+Ll97WZ26BRTKUFcotlMt0foCL/91O+k rT/f9pDyXnRS4xRTZqTgikHfWW3reNEjmADYig5xSMKdpzmYayA5TX7UIB+EgVhgnd+j9y kb9FeeblLGzGf+v1f3i1ZcJhsRbbMeA4YLYZcpwQ15ow8i4o14NuqWYKd8/O2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 17084560B; Fri, 1 Apr 2022 04:12:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2314Cawr084799; Fri, 1 Apr 2022 04:12:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2314CaTQ084798; Fri, 1 Apr 2022 04:12:36 GMT (envelope-from git) Date: Fri, 1 Apr 2022 04:12:36 GMT Message-Id: <202204010412.2314CaTQ084798@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guangyuan Yang Subject: git: 9478a8c169cd - main - emulators/gxemul: Update to 0.7.0 and take maintainership List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ygy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9478a8c169cd07d375213573bb139dce11f9ee19 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648786357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pYFmSxznvWQD9CrSPjV5kGQOeXVFduPKtI3OYXwT0DA=; b=wwyxTPrHb01+N3AwjFJ1MK/Y5CQ5BIEMSZ/mnfVHv2Irjdg5QiferaihHuO1IViYm7k4Az hhCmJKxtNEFTVAK6NCNrWuckq1Nkc6zVlBIn2uJPP6y0BAtGpIMxac7CEl2PiuUn9giS/A R9WX15YHRQVCTlqY0ZqIK44h45x5vmouAT8TMXTigJCu8M9Lg1691MmgNMibRYEmKDngLv uaMZHsJc1l3LfLMLKeAmcgDwCVQ26gPx+7wUbofKrPToMnPwU7XztzG8MW1GICdOofSDlv Nk2Sbmzo/9C39HU7hhoimG8HAiRg1CrAjbFOeHRtvF1HAWb+1FrZSI2VOBMs6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648786357; a=rsa-sha256; cv=none; b=EdkACRPR98L5TouowzGWFDCzv77eiPFq4qaM/8f/Dtnz1NtNdy4P2M4brHsE45wplgzEZx oBHME2Ap+EsJjUZDfG7UluBfLuYUyRVhZQR33uHy5DV6Y0W0J1JB/P+vtfTH7WipHkHiNV Kf08aEpqrsz0prZsYAMAJV3rX4y6TbUfgreVgpad1kCNMej3691Uw9ZLR0sZIb7kU8OOmK L51AWdQYRRi4oK9C2Sol/yfPqxoZCKVJ0jBTWAsAsuSnCgPSPYZ0jXaxC1IO/ZOkBmKylT Hv2BTBiVLvGMGgwpn86gglcsB0SzcdGIIKo8qRsFV6/NGDWTgFz8VkrIoHG2hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ygy: URL: https://cgit.FreeBSD.org/ports/commit/?id=9478a8c169cd07d375213573bb139dce11f9ee19 commit 9478a8c169cd07d375213573bb139dce11f9ee19 Author: Mitchell Clay AuthorDate: 2022-04-01 04:12:21 +0000 Commit: Guangyuan Yang CommitDate: 2022-04-01 04:12:21 +0000 emulators/gxemul: Update to 0.7.0 and take maintainership Changelog: http://gavare.se/gxemul/gxemul-stable/doc/RELEASE.html PR: 261874 --- emulators/gxemul/Makefile | 6 ++--- emulators/gxemul/distinfo | 6 ++--- emulators/gxemul/files/patch-configure | 27 +++++++++++++--------- ...es_dev__wdc.cc => patch-src_devices_dev__wdc.c} | 8 +++---- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile index 7f53d8ec6b90..753b69e1c816 100644 --- a/emulators/gxemul/Makefile +++ b/emulators/gxemul/Makefile @@ -1,19 +1,17 @@ # Created by: Janni PORTNAME= gxemul -PORTVERSION= 0.6.3 +PORTVERSION= 0.7.0 CATEGORIES= emulators MASTER_SITES= http://gavare.se/gxemul/src/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mclay@astate.edu COMMENT= Instruction-level machine emulator LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE HAS_CONFIGURE= yes -CONFIGURE_ARGS= --disable-valgrind \ - --without-unittests CONFIGURE_ENV= CXX=${CXX} \ LOCALBASE=${LOCALBASE} \ PREFIX=${PREFIX} diff --git a/emulators/gxemul/distinfo b/emulators/gxemul/distinfo index 80784d3641aa..4dec1ab0b30c 100644 --- a/emulators/gxemul/distinfo +++ b/emulators/gxemul/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1613553517 -SHA256 (gxemul-0.6.3.tar.gz) = 163604d4888218e5fdbc6858b9fc1ec1607d005eadbec424f3a9663e1f2986ed -SIZE (gxemul-0.6.3.tar.gz) = 6024573 +TIMESTAMP = 1644505943 +SHA256 (gxemul-0.7.0.tar.gz) = 79c4437c6f8ca904f46d33ac36062a65fdcf4a92a248478e408ab11295cf8e83 +SIZE (gxemul-0.7.0.tar.gz) = 5985021 diff --git a/emulators/gxemul/files/patch-configure b/emulators/gxemul/files/patch-configure index 8cb11e97e73e..44a604ea7f60 100644 --- a/emulators/gxemul/files/patch-configure +++ b/emulators/gxemul/files/patch-configure @@ -1,19 +1,19 @@ ---- configure.orig 2018-09-06 07:41:13 UTC +--- configure.orig 2021-04-22 18:04:21 UTC +++ configure -@@ -360,10 +360,10 @@ if [ z$NOX11 = z ]; then +@@ -330,10 +330,10 @@ if [ z$NOX11 = z ]; then XOK=0 - XINCLUDE=-I/usr/X11R6/include + XINCLUDE=-I${LOCALBASE}/include - $CXX $CXXFLAGS _test_x11.cc -c -o _test_x11.o $XINCLUDE 2> /dev/null + $CC $CFLAGS _test_x11.c -c -o _test_x11.o $XINCLUDE 2> /dev/null -- XLIB="-L/usr/X11R6/lib -lX11" -+ XLIB="-L${LOCALBASE}/lib -lX11" - $CXX $CXXFLAGS _test_x11.o -o _test_x11 $XLIB 2> /dev/null +- XLIB="-L/usr/X11R6/lib -lX11 -Wl,-rpath,/usr/X11R6/lib" ++ XLIB="-L${LOCALBASE}/lib -lX11 -Wl,-rpath,${LOCALBASE}/lib" + $CC $CFLAGS _test_x11.o -o _test_x11 $XLIB 2> /dev/null if [ -x _test_x11 ]; then -@@ -578,22 +578,6 @@ else +@@ -539,27 +539,6 @@ else fi fi rm -f _testprog _testprog.error _testprog.stdout @@ -21,15 +21,20 @@ - -# -O optimization for non-debug builds. Try -O and -O3. -if [ ! z"$DEBUG" = zYES ]; then -- $CXX $CXXFLAGS -O _testprog.cc -o _testprog 2> /dev/null +- printf "checking whether -O3 or -O can be used (non-DEBUG build)... " +- $CC $CFLAGS -O _testprog.c -o _testprog 2> /dev/null - if [ -x _testprog ]; then - rm -f _testprog -- $CXX $CXXFLAGS -O3 _testprog.cc -o _testprog 2> /dev/null +- $CC $CFLAGS -O3 _testprog.c -o _testprog 2> /dev/null - if [ -x _testprog ]; then -- CXXFLAGS="-O3 $CXXFLAGS" +- CFLAGS="-O3 $CFLAGS" +- printf "yes, -O3\n" - else -- CXXFLAGS="-O $CXXFLAGS" +- CFLAGS="-O $CFLAGS" +- printf "yes, -O\n" - fi +- else +- printf "no\n" - fi -fi -rm -f _testprog diff --git a/emulators/gxemul/files/patch-src_devices_dev__wdc.cc b/emulators/gxemul/files/patch-src_devices_dev__wdc.c similarity index 79% rename from emulators/gxemul/files/patch-src_devices_dev__wdc.cc rename to emulators/gxemul/files/patch-src_devices_dev__wdc.c index fc921947292f..113adf3b46ba 100644 --- a/emulators/gxemul/files/patch-src_devices_dev__wdc.cc +++ b/emulators/gxemul/files/patch-src_devices_dev__wdc.c @@ -1,6 +1,6 @@ ---- src/devices/dev_wdc.cc.orig 2014-08-17 08:45:12 UTC -+++ src/devices/dev_wdc.cc -@@ -274,12 +274,12 @@ void wdc__read(struct cpu *cpu, struct w +--- src/devices/dev_wdc.c.orig 2021-04-22 18:04:20 UTC ++++ src/devices/dev_wdc.c +@@ -274,12 +274,12 @@ void wdc__read(struct cpu *cpu, struct wdc_data *d) + (int64_t)d->head * d->sectors_per_track[d->drive] + (int64_t)d->heads[d->drive] * d->sectors_per_track[d->drive] * cyl); @@ -15,7 +15,7 @@ #endif while (count > 0) { -@@ -320,12 +320,12 @@ void wdc__write(struct cpu *cpu, struct +@@ -320,12 +320,12 @@ void wdc__write(struct cpu *cpu, struct wdc_data *d) uint64_t offset = 512 * (d->sector - 1 + (int64_t)d->head * d->sectors_per_track[d->drive] + (int64_t)d->heads[d->drive] * d->sectors_per_track[d->drive] * cyl);