Index: head/lang/cint/Makefile
===================================================================
--- head/lang/cint/Makefile	(revision 505727)
+++ head/lang/cint/Makefile	(revision 505728)
@@ -1,46 +1,47 @@
 # Created by: Max Khon <fjoe@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	cint
 PORTVERSION=	5.18.00
 PORTREVISION=	12
 CATEGORIES=	lang
 MASTER_SITES=	http://root.cern.ch/drupal/sites/default/files/
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	C/C++ interpreter
 
 BROKEN_powerpc64=	does not build: cint/include/iosenum.h: segmentation fault (core dumped)
 
 BUILD_DEPENDS=	bash:shells/bash
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	CC="${CC}" CXX="${CXX}" LDFLAGS="${LDFLAGS}" \
 		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
 USE_GCC=	yes
 USES=		gmake readline tar:tgz
 USE_LDCONFIG=	${PREFIX}/lib/cint
 ALL_TARGET=
 
 # The port does not build with C++11/C++14, so explicitly use an older
 # standard.
 USE_CXXSTD=	gnu++98
 
 INSTALL_ARGS=	--bindir=${STAGEDIR}${PREFIX}/bin\
 		--libdir=${STAGEDIR}${PREFIX}/lib/cint\
 		--mandir=${STAGEDIR}${PREFIX}/man\
 		--docdir=${STAGEDIR}${DOCSDIR}
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${REINPLACE_CMD} 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' ${WRKSRC}/cint/lib/dll_stl/setup
-	${REINPLACE_CMD} 's,make ,${GMAKE} ,' ${WRKSRC}/cint/lib/*/setup
+	${REINPLACE_CMD} -e 's,make ,${GMAKE} ,' -e '/${GMAKE}/ s,$$, || exit 1,' \
+		${WRKSRC}/cint/lib/*/setup
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/bash configure __have_the_proper_shell@
 
 do-install:
 	cd ${WRKSRC} && ${LOCALBASE}/bin/bash tool/INSTALLBIN ${INSTALL_ARGS}
 
 .include <bsd.port.mk>
Index: head/lang/cint/files/patch-cint_lib_prec__stl_list
===================================================================
--- head/lang/cint/files/patch-cint_lib_prec__stl_list	(nonexistent)
+++ head/lang/cint/files/patch-cint_lib_prec__stl_list	(revision 505728)
@@ -0,0 +1,14 @@
+--- cint/lib/prec_stl/list.orig	2019-07-03 06:45:32 UTC
++++ cint/lib/prec_stl/list
+@@ -96,9 +96,11 @@ class list {
+     iterator operator++(int a);
+     iterator& operator--();
+     iterator operator--(int a);
++#if defined(G__GNUC_VER) && G__GNUC_VER<9000
+     bool operator==(const iterator& x) ;
+ #ifndef G__HPUX
+     bool operator!=(const iterator& x) ;
++#endif
+ #endif
+ #if defined(G__VISUAL) && (G__MSC_VER>=1600)
+ 	private:

Property changes on: head/lang/cint/files/patch-cint_lib_prec__stl_list
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/lang/cint/files/patch-cint_lib_prec__stl_map
===================================================================
--- head/lang/cint/files/patch-cint_lib_prec__stl_map	(nonexistent)
+++ head/lang/cint/files/patch-cint_lib_prec__stl_map	(revision 505728)
@@ -0,0 +1,11 @@
+--- cint/lib/prec_stl/map.orig	2019-07-03 06:37:58 UTC
++++ cint/lib/prec_stl/map
+@@ -115,7 +115,7 @@ class map {
+     iterator operator++(int a);
+     iterator& operator--();
+     iterator operator--(int a);
+-#if defined (G__VISUAL) || (defined(G__GNUC_VER) && G__GNUC_VER>=3004) || defined(G__INTEL_COMPILER)
++#if defined (G__VISUAL) || (defined(G__GNUC_VER) && G__GNUC_VER>=3004 && G__GNUC_VER<9000) || defined(G__INTEL_COMPILER)
+     bool operator==(const iterator& x) ;
+     bool operator!=(const iterator& x) ;
+ #endif

Property changes on: head/lang/cint/files/patch-cint_lib_prec__stl_map
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/lang/cint/files/patch-cint_lib_prec__stl_multimap
===================================================================
--- head/lang/cint/files/patch-cint_lib_prec__stl_multimap	(nonexistent)
+++ head/lang/cint/files/patch-cint_lib_prec__stl_multimap	(revision 505728)
@@ -0,0 +1,11 @@
+--- cint/lib/prec_stl/multimap.orig	2019-07-03 06:42:35 UTC
++++ cint/lib/prec_stl/multimap
+@@ -112,7 +112,7 @@ class multimap {
+     iterator operator++(int a);
+     iterator& operator--();
+     iterator operator--(int a);
+-#if defined (G__VISUAL) || (defined(G__GNUC) && G__GNUC_VER>=3004)
++#if defined (G__VISUAL) || (defined(G__GNUC) && G__GNUC_VER>=3004 && G__GNUC_VER<9000)
+     bool operator==(const iterator& x) ;
+     bool operator!=(const iterator& x) ;
+ #endif

Property changes on: head/lang/cint/files/patch-cint_lib_prec__stl_multimap
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/lang/cint/files/patch-cint_lib_prec__stl_multiset
===================================================================
--- head/lang/cint/files/patch-cint_lib_prec__stl_multiset	(nonexistent)
+++ head/lang/cint/files/patch-cint_lib_prec__stl_multiset	(revision 505728)
@@ -0,0 +1,11 @@
+--- cint/lib/prec_stl/multiset.orig	2019-07-03 06:43:37 UTC
++++ cint/lib/prec_stl/multiset
+@@ -105,7 +105,7 @@ class multiset {
+     iterator operator++(int a);
+     iterator& operator--();
+     iterator operator--(int a);
+-#if defined (G__VISUAL) || (defined(G__GNUC) && G__GNUC_VER>=3004)
++#if defined (G__VISUAL) || (defined(G__GNUC) && G__GNUC_VER>=3004 && G__GNUC_VER<9000)
+     bool operator==(const iterator& x) ;
+     bool operator!=(const iterator& x) ;
+ #endif

Property changes on: head/lang/cint/files/patch-cint_lib_prec__stl_multiset
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/lang/cint/files/patch-cint_lib_prec__stl_set
===================================================================
--- head/lang/cint/files/patch-cint_lib_prec__stl_set	(nonexistent)
+++ head/lang/cint/files/patch-cint_lib_prec__stl_set	(revision 505728)
@@ -0,0 +1,11 @@
+--- cint/lib/prec_stl/set.orig	2019-07-03 06:41:45 UTC
++++ cint/lib/prec_stl/set
+@@ -105,7 +105,7 @@ class set {
+     iterator operator++(int a);
+     iterator& operator--();
+     iterator operator--(int a);
+-#if defined (G__VISUAL) || (defined(G__GNUC) && G__GNUC_VER>=3004)
++#if defined (G__VISUAL) || (defined(G__GNUC) && G__GNUC_VER>=3004 && G__GNUC_VER<9000)
+     bool operator==(const iterator& x) ;
+     bool operator!=(const iterator& x) ;
+ #endif

Property changes on: head/lang/cint/files/patch-cint_lib_prec__stl_set
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property