Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Apr 2021 04:09:24 GMT
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: b81865a580a4 - main - Attempt to unbreak MVDSV and QWDtools on recent -CURRENT.
Message-ID:  <202104160409.13G49OSK037746@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b81865a580a4550ab187e4757dd03bd03e47c58a

commit b81865a580a4550ab187e4757dd03bd03e47c58a
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2021-04-16 04:08:12 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
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")



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104160409.13G49OSK037746>