git: 63cd929ef52c - main - archivers/7-zip: minor fix

The branch main has been updated by makc:

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

commit 63cd929ef52ccbdc059c9a2db905aa213f5ec2c3
Author:     Max Brazhnikov <makc@FreeBSD.org>
AuthorDate: 2021-12-13 20:58:56 +0000
Commit:     Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2021-12-13 20:58:56 +0000

    archivers/7-zip: minor fix
    
    Avoid CFLAGS duplication and remove excessive warning flags
---
 archivers/7-zip/files/patch-CPP_7zip_7zip__gcc.mak | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/archivers/7-zip/files/patch-CPP_7zip_7zip__gcc.mak b/archivers/7-zip/files/patch-CPP_7zip_7zip__gcc.mak
index 593e77c4da87..82ace8e6b679 100644
--- a/archivers/7-zip/files/patch-CPP_7zip_7zip__gcc.mak
+++ b/archivers/7-zip/files/patch-CPP_7zip_7zip__gcc.mak
@@ -1,13 +1,20 @@
---- CPP/7zip/7zip_gcc.mak.orig	2021-12-10 11:04:08 UTC
+--- CPP/7zip/7zip_gcc.mak.orig	2021-12-12 12:16:07 UTC
 +++ CPP/7zip/7zip_gcc.mak
-@@ -22,7 +22,7 @@ CFLAGS_BASE_LIST = -c
+@@ -14,13 +14,13 @@ PROGPATH_STATIC = $(O)/$(PROG)s
+ 
+ 
+ ifneq ($(CC), xlc)
+-CFLAGS_WARN_WALL = -Wall -Werror -Wextra
++CFLAGS_WARN_WALL = 
+ endif
+ 
+ # for object file
+ CFLAGS_BASE_LIST = -c
  # CFLAGS_BASE_LIST = -S
- CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
+-CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
++CFLAGS_BASE = $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
   -DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-- -fPIC
-+ -fPIC $(LOCAL_FLAGS)
- 
- # -D_7ZIP_AFFINITY_DISABLE
+  -fPIC
  
 @@ -111,7 +111,7 @@ MY_MKDIR=mkdir -p