From owner-svn-ports-head@freebsd.org Fri Aug 28 17:41:35 2020 Return-Path: Delivered-To: svn-ports-head@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 7F5B43B9B92; Fri, 28 Aug 2020 17:41:35 +0000 (UTC) (envelope-from garga@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BdRjW2qy7z40jy; Fri, 28 Aug 2020 17:41:35 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 448CF189AB; Fri, 28 Aug 2020 17:41:35 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07SHfZk0002257; Fri, 28 Aug 2020 17:41:35 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07SHfYcp002253; Fri, 28 Aug 2020 17:41:34 GMT (envelope-from garga@FreeBSD.org) Message-Id: <202008281741.07SHfYcp002253@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Fri, 28 Aug 2020 17:41:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546768 - in head/archivers/sharutils: . files X-SVN-Group: ports-head X-SVN-Commit-Author: garga X-SVN-Commit-Paths: in head/archivers/sharutils: . files X-SVN-Commit-Revision: 546768 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Aug 2020 17:41:35 -0000 Author: garga Date: Fri Aug 28 17:41:34 2020 New Revision: 546768 URL: https://svnweb.freebsd.org/changeset/ports/546768 Log: archivers/sharutils: Fix build with -fno-common Sponsored by: Rubicon Communications, LLC (Netgate) Added: head/archivers/sharutils/files/patch-src_shar.c (contents, props changed) head/archivers/sharutils/files/patch-src_unshar.c (contents, props changed) head/archivers/sharutils/files/patch-src_uudecode.c (contents, props changed) Modified: head/archivers/sharutils/Makefile Modified: head/archivers/sharutils/Makefile ============================================================================== --- head/archivers/sharutils/Makefile Fri Aug 28 17:39:55 2020 (r546767) +++ head/archivers/sharutils/Makefile Fri Aug 28 17:41:34 2020 (r546768) @@ -12,13 +12,14 @@ COMMENT= Pack, send, and unpack shell archives; synchr LICENSE= GPLv3 +USES= charsetfix cpe perl5 tar:xz + OPTIONS_DEFINE= NLS GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=g --disable-uucode INSTALL_TARGET= install install-man INFO= sharutils -USES= charsetfix cpe perl5 tar:xz USE_PERL5= build OPTIONS_SUB= yes CPE_VENDOR= gnu @@ -30,6 +31,14 @@ NLS_CONFIGURE_OFF= --disable-nls post-patch: @${REINPLACE_CMD} -e '/Please include config.h first./ s,^.*$$,#include ,' \ ${WRKSRC}/lib/unistd.in.h + @${REINPLACE_CMD} -e '/char const . const program_name/d' \ + ${WRKSRC}/src/shar-opts.h \ + ${WRKSRC}/src/shar-opts.c \ + ${WRKSRC}/src/unshar-opts.h \ + ${WRKSRC}/src/unshar-opts.c \ + ${WRKSRC}/src/uudecode-opts.h \ + ${WRKSRC}/src/uudecode-opts.c \ + ${WRKSRC}/src/uuencode-opts.h .for man in shar.1 unshar.1 @${REINPLACE_CMD} \ -e 's, SHAR , GSHAR ,' \ Added: head/archivers/sharutils/files/patch-src_shar.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/sharutils/files/patch-src_shar.c Fri Aug 28 17:41:34 2020 (r546768) @@ -0,0 +1,11 @@ +--- src/shar.c.orig 2020-08-28 17:03:20 UTC ++++ src/shar.c +@@ -83,6 +83,8 @@ static const char cright_years_z[] = + + #define LOG10_MAX_INT 11 + ++char const * const program_name = "shar"; ++ + /* System related declarations. */ + + /* Convert a possibly-signed character to an unsigned character. This is Added: head/archivers/sharutils/files/patch-src_unshar.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/sharutils/files/patch-src_unshar.c Fri Aug 28 17:41:34 2020 (r546768) @@ -0,0 +1,11 @@ +--- src/unshar.c.orig 2020-08-28 17:03:20 UTC ++++ src/unshar.c +@@ -32,6 +32,8 @@ + + #include "xgetcwd.h" + ++char const * const program_name = "unshar"; ++ + /* + * FIXME: actually configure this stuff: + */ Added: head/archivers/sharutils/files/patch-src_uudecode.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/sharutils/files/patch-src_uudecode.c Fri Aug 28 17:41:34 2020 (r546768) @@ -0,0 +1,11 @@ +--- src/uudecode.c.orig 2020-08-28 17:15:21 UTC ++++ src/uudecode.c +@@ -82,6 +82,8 @@ static char const cright_years_z[] = + #define UU_CHMOD(_n, _fd, _m) chmod ((_n), UU_MODE_BITS(_m)) + #endif + ++char const * const program_name = "uudecode"; ++ + struct passwd *getpwnam (); + + static uudecode_exit_code_t read_stduu(