From owner-svn-ports-all@freebsd.org Wed Jun 19 08:29:56 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A323815D5D99; Wed, 19 Jun 2019 08:29:56 +0000 (UTC) (envelope-from crees@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) server-signature RSA-PSS (4096 bits) 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 4958682ECF; Wed, 19 Jun 2019 08:29:56 +0000 (UTC) (envelope-from crees@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 0CFD521D55; Wed, 19 Jun 2019 08:29:56 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5J8Tt3J062702; Wed, 19 Jun 2019 08:29:55 GMT (envelope-from crees@FreeBSD.org) Received: (from crees@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5J8Ttf8062699; Wed, 19 Jun 2019 08:29:55 GMT (envelope-from crees@FreeBSD.org) Message-Id: <201906190829.x5J8Ttf8062699@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: crees set sender to crees@FreeBSD.org using -f From: Chris Rees Date: Wed, 19 Jun 2019 08:29:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504525 - in head/sysutils/reed: . files X-SVN-Group: ports-head X-SVN-Commit-Author: crees X-SVN-Commit-Paths: in head/sysutils/reed: . files X-SVN-Commit-Revision: 504525 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4958682ECF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Wed, 19 Jun 2019 08:29:56 -0000 Author: crees Date: Wed Jun 19 08:29:55 2019 New Revision: 504525 URL: https://svnweb.freebsd.org/changeset/ports/504525 Log: sysutils/reed: Remove sys/dir.h It was replaced a long time ago with sys/dirent.h, which is implicitly included from dirent.h Use sed instead of perl, remove redundant seds and use a patch for the source file for clarity PR: ports/238696 Submitted by: rene Added: head/sysutils/reed/files/patch-reed.c (contents, props changed) Modified: head/sysutils/reed/Makefile head/sysutils/reed/files/patch-cfg.data (contents, props changed) Modified: head/sysutils/reed/Makefile ============================================================================== --- head/sysutils/reed/Makefile Wed Jun 19 08:28:35 2019 (r504524) +++ head/sysutils/reed/Makefile Wed Jun 19 08:29:55 2019 (r504525) @@ -14,20 +14,16 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= ncurses perl5 shebangfix -USE_PERL5= run build patch -SHEBANG_FILES= wrap breed +USE_PERL5= run +SHEBANG_FILES= wrap breed fix_bookmarks.pl HAS_CONFIGURE= yes CONFIGURE_SCRIPT= configures CONFIGURE_ENV+= INCDIR="${NCURSESINC}" post-patch: - @${PERL} -pi -e 's!/usr/local!${PREFIX}!g' ${WRKSRC}/configures - @${PERL} -pi -e 's!sys/dir.h!dirent.h!g;s!.*getopt.h.*\n!!' \ + @${REINPLACE_CMD} 's!/usr/local!${PREFIX}!g' ${WRKSRC}/configures + @${REINPLACE_CMD} 's!sys/dir.h!dirent.h!g;\!getopt.h!d' \ ${WRKSRC}/reed.c - @${PERL} -pi -e 's!getopt.h !!' ${WRKSRC}/cfg.data - @${PERL} -pi -e 's!-O2!${CFLAGS}!' ${WRKSRC}/Makefile.in - @${PERL} -pi -e 's!^#!/usr/bin/perl!#!${PERL}!' \ - ${WRKSRC}/fix_bookmarks.pl do-install: ${INSTALL_PROGRAM} ${WRKSRC}/reed ${STAGEDIR}${PREFIX}/bin Modified: head/sysutils/reed/files/patch-cfg.data ============================================================================== --- head/sysutils/reed/files/patch-cfg.data Wed Jun 19 08:28:35 2019 (r504524) +++ head/sysutils/reed/files/patch-cfg.data Wed Jun 19 08:29:55 2019 (r504525) @@ -1,3 +1,5 @@ +$FreeBSD$ + --- cfg.data.orig 2002-11-09 00:59:08 UTC +++ cfg.data @@ -1,6 +1,6 @@ @@ -7,4 +9,5 @@ -LIBS="c curses" +LIBS="c ncurses" PM="Getopt/Std Text/Wrap" - HEADERS="sys/dir.h sys/stat.h ctype.h curses.h dirent.h getopt.h regex.h limits.h time.h unistd.h" +-HEADERS="sys/dir.h sys/stat.h ctype.h curses.h dirent.h getopt.h regex.h limits.h time.h unistd.h" ++HEADERS="sys/stat.h ctype.h ncurses.h dirent.h regex.h limits.h time.h unistd.h" Added: head/sysutils/reed/files/patch-reed.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/reed/files/patch-reed.c Wed Jun 19 08:29:55 2019 (r504525) @@ -0,0 +1,19 @@ +$FreeBSD$ + +--- reed.c.orig 2002-11-09 00:59:08 UTC ++++ reed.c +@@ -24,13 +24,12 @@ + + #include + #include +-#include ++#include + + #include + #include + #include + #include +-#include + #include + #include + #include