svn commit: r540489 - in head/devel/fhist: . files

[Fernando Apesteguía]

Copy paste failed.

This comes from this PR:
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=247368

Sorry for the inconvenience.

On Fri, Jun 26, 2020 at 12:34 PM Fernando Apesteguía
<fernape at freebsd.org> wrote:
>
> Author: fernape
> Date: Fri Jun 26 10:34:36 2020
> New Revision: 540489
> URL: https://svnweb.freebsd.org/changeset/ports/540489
>
> Log:
>   devel/fhist: and fix bison issues and change maintership
>
>    * Retrofitted Yacc grammars to handle bison 3.6.X
>    * Submitter takes maintainership
>
>   Submitted by: aryeh.friedman at gmail.com
>
> Added:
>   head/devel/fhist/files/patch-common_sub_expr__gram.y   (contents, props changed)
> Modified:
>   head/devel/fhist/Makefile
>   head/devel/fhist/files/patch-common_ac_time.h
>
> Modified: head/devel/fhist/Makefile
> ==============================================================================
> --- head/devel/fhist/Makefile   Fri Jun 26 09:35:06 2020        (r540488)
> +++ head/devel/fhist/Makefile   Fri Jun 26 10:34:36 2020        (r540489)
> @@ -4,17 +4,19 @@
>  PORTNAME=      fhist
>  PORTVERSION=   1.21
>  DISTVERSIONSUFFIX=     .D001
> -PORTREVISION=  5
> +PORTREVISION=  6
>  CATEGORIES=    devel
>  MASTER_SITES=  SF/${PORTNAME}/${PORTVERSION}
>
> -MAINTAINER=    ports at FreeBSD.org
> +MAINTAINER=    aryeh.friedman at gmail.com
>  COMMENT=       Utilities to maintain file history, do file comparisons, and merges
>
>  LICENSE=       GPLv3
>
>  LIB_DEPENDS=   libexplain.so:devel/libexplain
>
> +USES=          bison localbase
> +
>  OPTIONS_DEFINE=        NLS
>
>  WRKSRC=                ${WRKDIR}/${PORTNAME}-${PORTVERSION}
> @@ -24,9 +26,6 @@ GNU_CONFIGURE=        yes
>  CONFIGURE_ARGS=        --with-nlsdir=${PREFIX}/share/locale/en/LC_MESSAGES
>  ALL_TARGET=    all-bin
>  MAKE_JOBS_UNSAFE=yes
> -
> -CPPFLAGS+=     -I${LOCALBASE}/include
> -LDFLAGS+=      -L${LOCALBASE}/lib
>
>  PLIST_FILES=   bin/fcomp bin/fhist bin/fmerge \
>                 man/man1/fcomp.1.gz man/man1/fhist.1.gz \
>
> Modified: head/devel/fhist/files/patch-common_ac_time.h
> ==============================================================================
> --- head/devel/fhist/files/patch-common_ac_time.h       Fri Jun 26 09:35:06 2020        (r540488)
> +++ head/devel/fhist/files/patch-common_ac_time.h       Fri Jun 26 10:34:36 2020        (r540489)
> @@ -1,6 +1,6 @@
> ---- common/ac/time.h.orig      Wed Dec 18 02:09:57 2002
> -+++ common/ac/time.h   Wed Dec 18 02:10:04 2002
> -@@ -29,7 +29,7 @@
> +--- common/ac/time.h.orig      2012-07-13 04:47:15 UTC
> ++++ common/ac/time.h
> +@@ -26,7 +26,7 @@
>    * Catch-22: Dec Alpha OSF/1: need to include time.h before sys/time.h
>    * before time.h
>    */
>
> Added: head/devel/fhist/files/patch-common_sub_expr__gram.y
> ==============================================================================
> --- /dev/null   00:00:00 1970   (empty, because file is newly added)
> +++ head/devel/fhist/files/patch-common_sub_expr__gram.y        Fri Jun 26 10:34:36 2020        (r540489)
> @@ -0,0 +1,10 @@
> +--- common/sub/expr_gram.y.orig        2012-07-13 04:47:15 UTC
> ++++ common/sub/expr_gram.y
> +@@ -16,6 +16,7 @@
> +  * along with this program. If not, see <http://www.gnu.org/licenses/>.
> +  */
> +
> ++%define api.prefix {sub_expr_gram_}
> + %{
> +
> + #include <common/ac/stdarg.h>