From owner-svn-ports-all@freebsd.org Sun Nov 22 22:04:32 2020 Return-Path: Delivered-To: svn-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 9FCD947689D; Sun, 22 Nov 2020 22:04:32 +0000 (UTC) (envelope-from kevans@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 4CfPTD46lDz4XPs; Sun, 22 Nov 2020 22:04:32 +0000 (UTC) (envelope-from kevans@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 8011721B15; Sun, 22 Nov 2020 22:04:32 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AMM4Wjn086222; Sun, 22 Nov 2020 22:04:32 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AMM4VAi086219; Sun, 22 Nov 2020 22:04:31 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202011222204.0AMM4VAi086219@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Sun, 22 Nov 2020 22:04:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r556075 - in branches/2020Q4/textproc/bsdgrep: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in branches/2020Q4/textproc/bsdgrep: . files X-SVN-Commit-Revision: 556075 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Nov 2020 22:04:32 -0000 Author: kevans Date: Sun Nov 22 22:04:31 2020 New Revision: 556075 URL: https://svnweb.freebsd.org/changeset/ports/556075 Log: MFH: r555761 textproc/bsdgrep: fix the build on recent -CURRENT A seatbelt was added to throw a warning if a "SUBDIR." variable appeared non-empty, since that indicates something was trying to expand a MK_ variable most likely and either opts.mk wasn't included or the name of the variable used is wrong. In this particular case, we're repackaging a part from base. I had stripped the src.opts.mk include but hadn't thought to replace it with bsd.opts.mk for userlandy stuff. This also goes as far as fixing the test build, but doesn't yet hook up the tests. On FreeBSD <13 these need a kyua/atf test dep, but I'd like to do a sweep and see if there are any other ports (e.g. from NetBSD base or FreeBSD base) that also have a dependency to weigh in on if this should just be a one-off osversion check or a kyua/atf USES. Approved by: ports-secteam (implicit, build fix) Added: branches/2020Q4/textproc/bsdgrep/files/patch-tests_Makefile - copied unchanged from r555761, head/textproc/bsdgrep/files/patch-tests_Makefile Modified: branches/2020Q4/textproc/bsdgrep/Makefile branches/2020Q4/textproc/bsdgrep/files/patch-Makefile Directory Properties: branches/2020Q4/ (props changed) Modified: branches/2020Q4/textproc/bsdgrep/Makefile ============================================================================== --- branches/2020Q4/textproc/bsdgrep/Makefile Sun Nov 22 21:23:38 2020 (r556074) +++ branches/2020Q4/textproc/bsdgrep/Makefile Sun Nov 22 22:04:31 2020 (r556075) @@ -19,7 +19,8 @@ USES= uidfix MAKE_ENV+= BINDIR="${PREFIX}/bin" \ MANDIR="${MANPREFIX}/man/man" \ CATDIR="${MANPREFIX}/man/man" \ - NLSDIR="${PREFIX}/share/nls" + NLSDIR="${PREFIX}/share/nls" \ + WITHOUT_TESTS=yes CFLAGS+= -std=gnu99 OPTIONS_DEFINE= GNU_COMPAT NLS @@ -38,6 +39,6 @@ pre-install-NLS-on: ${MKDIR} ${STAGEDIR}${PREFIX}/share/nls/gl_ES.ISO8859-1 post-install: - ${LN} -sf ${PREFIX}/bin/grep ${STAGEDIR}${PREFIX}/bin/bsdgrep + ${RLN} ${STAGEDIR}${PREFIX}/bin/grep ${STAGEDIR}${PREFIX}/bin/bsdgrep .include Modified: branches/2020Q4/textproc/bsdgrep/files/patch-Makefile ============================================================================== --- branches/2020Q4/textproc/bsdgrep/files/patch-Makefile Sun Nov 22 21:23:38 2020 (r556074) +++ branches/2020Q4/textproc/bsdgrep/files/patch-Makefile Sun Nov 22 22:04:31 2020 (r556075) @@ -1,10 +1,11 @@ --- Makefile.orig 2017-10-19 20:07:52 UTC +++ Makefile -@@ -2,31 +2,13 @@ +@@ -2,31 +2,14 @@ # $FreeBSD: head/usr.bin/grep/Makefile 322515 2017-08-14 19:21:37Z ngie $ # $OpenBSD: Makefile,v 1.6 2003/06/25 15:00:04 millert Exp $ -.include ++.include - -.if ${MK_BSD_GREP} == "yes" PROG= grep Copied: branches/2020Q4/textproc/bsdgrep/files/patch-tests_Makefile (from r555761, head/textproc/bsdgrep/files/patch-tests_Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q4/textproc/bsdgrep/files/patch-tests_Makefile Sun Nov 22 22:04:31 2020 (r556075, copy of r555761, head/textproc/bsdgrep/files/patch-tests_Makefile) @@ -0,0 +1,58 @@ +--- tests/Makefile.orig 2020-11-20 14:03:37 UTC ++++ tests/Makefile +@@ -3,55 +3,5 @@ + PACKAGE= tests + + ATF_TESTS_SH+= grep_freebsd_test +-NETBSD_ATF_TESTS_SH= grep_test +- +-${PACKAGE}FILES+= d_basic.out +-${PACKAGE}FILES+= d_begin_end_a.out +-${PACKAGE}FILES+= d_begin_end_b.out +-${PACKAGE}FILES+= d_binary.out +-${PACKAGE}FILES+= d_color_a.in +-${PACKAGE}FILES+= d_color_a.out +-${PACKAGE}FILES+= d_color_b.in +-${PACKAGE}FILES+= d_color_b.out +-${PACKAGE}FILES+= d_color_c.out +-${PACKAGE}FILES+= d_context2_a.out +-${PACKAGE}FILES+= d_context2_b.out +-${PACKAGE}FILES+= d_context2_c.out +-${PACKAGE}FILES+= d_context_a.in +-${PACKAGE}FILES+= d_context_a.out +-${PACKAGE}FILES+= d_context_b.in +-${PACKAGE}FILES+= d_context_e.in +-${PACKAGE}FILES+= d_context_b.out +-${PACKAGE}FILES+= d_context_c.out +-${PACKAGE}FILES+= d_context_d.out +-${PACKAGE}FILES+= d_context_e.out +-${PACKAGE}FILES+= d_context_f.out +-${PACKAGE}FILES+= d_context_g.out +-${PACKAGE}FILES+= d_egrep.out +-${PACKAGE}FILES+= d_escmap.in +-${PACKAGE}FILES+= d_f_file_empty.in +-${PACKAGE}FILES+= d_file_exp.in +-${PACKAGE}FILES+= d_file_exp.out +-${PACKAGE}FILES+= d_ignore_case.out +-${PACKAGE}FILES+= d_input +-${PACKAGE}FILES+= d_invert.in +-${PACKAGE}FILES+= d_invert.out +-${PACKAGE}FILES+= d_oflag_zerolen_a.in +-${PACKAGE}FILES+= d_oflag_zerolen_a.out +-${PACKAGE}FILES+= d_oflag_zerolen_b.in +-${PACKAGE}FILES+= d_oflag_zerolen_b.out +-${PACKAGE}FILES+= d_oflag_zerolen_c.in +-${PACKAGE}FILES+= d_oflag_zerolen_c.out +-${PACKAGE}FILES+= d_oflag_zerolen_d.in +-${PACKAGE}FILES+= d_oflag_zerolen_e.in +-${PACKAGE}FILES+= d_oflag_zerolen_e.out +-${PACKAGE}FILES+= d_recurse.out +-${PACKAGE}FILES+= d_recurse_symlink.err +-${PACKAGE}FILES+= d_recurse_symlink.out +-${PACKAGE}FILES+= d_whole_line.out +-${PACKAGE}FILES+= d_word_regexps.out +-${PACKAGE}FILES+= d_zgrep.out +- +-.include + + .include