Date: Wed, 19 Jun 2019 08:29:55 +0000 (UTC) From: Chris Rees <crees@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504525 - in head/sysutils/reed: . files Message-ID: <201906190829.x5J8Ttf8062699@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <sys/types.h> + #include <sys/stat.h> +-#include <sys/dir.h> ++#include <dirent.h> + + #include <ctype.h> + #include <curses.h> + #include <dirent.h> + #include <errno.h> +-#include <getopt.h> + #include <grp.h> + #include <limits.h> + #include <pwd.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906190829.x5J8Ttf8062699>