Bug 227601 - textproc/gnugrep: update to 3.1
Summary: textproc/gnugrep: update to 3.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Alexey Dokuchaev
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-04-18 04:33 UTC by John Hein
Modified: 2019-03-03 21:00 UTC (History)
2 users (show)

See Also:
tobik: maintainer-feedback-


Attachments
[patch] update gnugrep to 3.1 (1.42 KB, patch)
2018-04-18 04:33 UTC, John Hein
jcfyecrayz: maintainer-approval? (johans)
Details | Diff
Update; Remove un-needed items; changed options (2.31 KB, patch)
2018-08-29 05:04 UTC, Nathan
no flags Details | Diff
Update; Adjust options; remove conflicts (2.43 KB, patch)
2018-08-29 05:13 UTC, Nathan
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description John Hein 2018-04-18 04:33:59 UTC
Created attachment 192610 [details]
[patch] update gnugrep to 3.1

The attached patch updates textproc/gnugrep to 3.1

It also removes PCRE_*FLAGS in favor of depending on pkg-config at build time.  The configure script can find pcre without any help if pkg-config is installed.

Also, use PREFIX instead of LOCALBASE in post-patch.  This fixes bin/ scripts for the installed port in case PREFIX != LOCALBASE.

Q/A: Tested successfully in poudriere with all options on.
Comment 1 Nathan 2018-08-29 05:04:54 UTC
Created attachment 196665 [details]
Update; Remove un-needed items; changed options

textproc/gnugrep:
* Update to 3.1
* Added uses perl
 -- configure looks for it and gives   
    warning without
* Changed on/off
 --Makes Makefile clean        
 --Allow auto on/off swap
* Added test target
 -- Tests passes
Comment 2 Nathan 2018-08-29 05:05:30 UTC
Also patch I submitted, builds fine on 11.2 and 12-CURRENT amd64
Comment 3 Nathan 2018-08-29 05:13:23 UTC
Created attachment 196666 [details]
Update; Adjust options; remove conflicts

textproc/gnugrep:
* Update to 3.1
* Added uses perl
 -- configure looks for it and gives
    warning without
* Changed on/off
 --Makes Makefile clean
 --Allow auto on/off swap
* Removed conflicts
 -- BSD's grep is installed in /usr/bin
    This port installs in /usr/local/bin
* Added test target
 -- Tests passes
Comment 4 John Hein 2018-10-31 18:56:52 UTC
(In reply to Nathan from comment #3)
Nathan, the textproc/bsdgrep port is not installed in /usr/bin.  It goes to /usr/local by default (or alternately $PREFIX if defined).  So the CONFLICTS line should not be removed.  Maybe you are thinking about the grep that is part of the base system (instead of the bsdgrep port)?

Also I don't think "PCRE_USES=perl5" is needed.  Everything works fine for me using gnu grup with pcre expressions without perl installed at build-time or run-time.

Other than those issues, your latest patch seems fine to me.

I think this officially qualifies for a maintainer timeout.
Comment 5 Nathan 2018-11-02 04:30:50 UTC
(In reply to John Hein from comment #4)
I'll take a re-look at this ASAP.
Comment 6 John Hein 2019-02-19 17:29:04 UTC
Comment on attachment 192610 [details]
[patch] update gnugrep to 3.1

Ping.
Comment 7 Tobias Kortkamp freebsd_committer 2019-03-01 16:16:57 UTC
Updated to 3.3 by danfe@ in ports r494301.
Comment 8 Alexey Dokuchaev freebsd_committer 2019-03-01 16:21:38 UTC
Oh, I've totally missed this PR, sorry!  No need to reopen, I'll examine attached patches and commit things that I've neglected.
Comment 9 commit-hook freebsd_committer 2019-03-01 17:19:12 UTC
A commit references this bug:

Author: danfe
Date: Fri Mar  1 17:19:00 UTC 2019
New revision: 494305
URL: https://svnweb.freebsd.org/changeset/ports/494305

Log:
  - Patch the installed script to point to $PREFIX, not $LOCALBASE
  - Add TEST_TARGET (currently, sometimes not all tests would pass)

  PR:	227601

Changes:
  head/textproc/gnugrep/Makefile
Comment 10 John Hein 2019-03-03 21:00:04 UTC
(In reply to Alexey Dokuchaev from comment #8)
Thanks.

Nathan converted the multiple ON/OFF occurrences to WITH.  Not worth opening a new bug, though.

==========================================
Index: Makefile
===================================================================
--- Makefile    (revision 494505)
+++ Makefile    (working copy)
@@ -27,17 +27,14 @@
 OPTIONS_SUB=           yes

 ICONV_CONFIGURE_USES=  iconv
-ICONV_CONFIGURE_ON=    --with-libiconv-prefix=${LOCALBASE}
-ICONV_CONFIGURE_OFF=   --without-libiconv-prefix
+ICONV_CONFIGURE_WITH=  libiconv-prefix=${LOCALBASE}

 LIBSIGSEGV_LIB_DEPENDS=        libsigsegv.so:devel/libsigsegv
-LIBSIGSEGV_CONFIGURE_ON=       --with-libsigsegv-prefix=${LOCALBASE}
-LIBSIGSEGV_CONFIGURE_OFF=      --without-libsigsegv-prefix
+LIBSIGSEGV_CONFIGURE_WITH=     libsigsegv-prefix=${LOCALBASE}

 NLS_USES=              gettext
 NLS_CONFIGURE_ENABLE=  nls
-NLS_CONFIGURE_ON=      --with-libintl-prefix=${LOCALBASE}
-NLS_CONFIGURE_OFF=     --without-libintl-prefix
+NLS_CONFIGURE_WITH=    libintl-prefix=${LOCALBASE}

 PCRE_LIB_DEPENDS=      libpcre.so:devel/pcre
 PCRE_USES=             pkgconfig
==========================================