From owner-dev-commits-ports-all@freebsd.org Fri Apr 16 04:09:24 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6042A5E3485; Fri, 16 Apr 2021 04:09:24 +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 4FM2lm2FvPz3DpJ; Fri, 16 Apr 2021 04:09:24 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 404C31E1E9; Fri, 16 Apr 2021 04:09:24 +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 13G49Oh1037747; Fri, 16 Apr 2021 04:09:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13G49OSK037746; Fri, 16 Apr 2021 04:09:24 GMT (envelope-from git) Date: Fri, 16 Apr 2021 04:09:24 GMT Message-Id: <202104160409.13G49OSK037746@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: b81865a580a4 - main - Attempt to unbreak MVDSV and QWDtools on recent -CURRENT. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b81865a580a4550ab187e4757dd03bd03e47c58a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Apr 2021 04:09:24 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=b81865a580a4550ab187e4757dd03bd03e47c58a commit b81865a580a4550ab187e4757dd03bd03e47c58a Author: Alexey Dokuchaev AuthorDate: 2021-04-16 04:08:12 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-04-16 04:08:39 +0000 Attempt to unbreak MVDSV and QWDtools on recent -CURRENT. Reported by: pkg-fallout --- games/mvdsv/files/patch-build_make_Makefile.BSD | 2 +- games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/games/mvdsv/files/patch-build_make_Makefile.BSD b/games/mvdsv/files/patch-build_make_Makefile.BSD index b9c83f435da1..2c47406e0d8a 100644 --- a/games/mvdsv/files/patch-build_make_Makefile.BSD +++ b/games/mvdsv/files/patch-build_make_Makefile.BSD @@ -5,7 +5,7 @@ # configure script add FORCE32BITFLAGS=-m32 -DO_CFLAGS = ${CFLAGS} -Wall -pipe -pthread -funsigned-char -DSERVERONLY -DUSE_PR2 -D${BYTE_ORDER}Q__ ${FORCE32BITFLAGS} -+BYTE_ORDER!= ${CC} -x c -dM -E /usr/include/machine/endian.h | sed -n 's,\#define _BYTE_ORDER \(.*\),_\1__,p' ++BYTE_ORDER!= ${CC} -x c -dM -E /usr/include/machine/endian.h | sed -n 's,\#define __BYTE_ORDER__ __ORDER\(.*_ENDIAN__\),_\1,p' +DO_CFLAGS = ${CFLAGS} -Wall -pipe -funsigned-char -DWWW_INTEGRATION -DSERVERONLY -DUSE_PR2 -D${BYTE_ORDER}Q__ ${FORCE32BITFLAGS} -WITH_OPTIMIZED_CFLAGS = YES diff --git a/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD b/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD index 65d6ac1fd450..a606fdf847dd 100644 --- a/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD +++ b/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD @@ -13,7 +13,7 @@ # configure script add FORCE32BITFLAGS=-m32 -DO_CFLAGS = ${CFLAGS} -Wall -pipe -pthread -funsigned-char -DUSE_PR2 -D${BYTE_ORDER}Q__ ${FORCE32BITFLAGS} -+BYTE_ORDER!= ${CC} -x c -dM -E /usr/include/machine/endian.h | sed -n 's,\#define _BYTE_ORDER \(.*\),_\1__,p' ++BYTE_ORDER!= ${CC} -x c -dM -E /usr/include/machine/endian.h | sed -n 's,\#define __BYTE_ORDER__ __ORDER\(.*_ENDIAN__\),_\1,p' +DO_CFLAGS = ${CFLAGS} -Wall -pipe -funsigned-char -DSERVERONLY -D${BYTE_ORDER}Q__ ${FORCE32BITFLAGS} -.if !defined(NOKQUEUE) && (${UNAME} == "FreeBSD" || ${UNAME} == "DragonFly")