Index: head/editors/scite/Makefile
===================================================================
--- head/editors/scite/Makefile	(revision 502768)
+++ head/editors/scite/Makefile	(revision 502769)
@@ -1,48 +1,47 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	scite
 DISTVERSION=	4.1.0
 CATEGORIES=	editors gnome
 MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Full-featured SCIntilla based text editor for GTK/GNOME
 
 LICENSE=	SCINTILLA
 LICENSE_NAME=	License for Scintilla and SciTE
 LICENSE_FILE=	${WRKSRC}/../License.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libscintilla.so:x11-toolkits/scintilla
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		compiler:c++17-lang desktop-file-utils gmake pkgconfig tar:tgz
 
 OPTIONS_DEFINE=	DOCS
 
 PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}
 WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
 
-CXXSTD=		c++17
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 MAKEFILE=	makefile
 
 PORTDATA=	*.properties
 PORTDOCS=	*.html *.jpg *.png
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| -Os||g' ${WRKSRC}/makefile
 	@${REINPLACE_CMD} -e 's|$$(SciteDefaultHome)|${DOCSDIR}|' \
 		${WRKSRC}/../src/SciTEGlobal.properties
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/SciTE.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${STAGEDIR}${PREFIX}/share/pixmaps
 	(cd ${WRKSRC}/../src && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC}/../doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/x11-toolkits/scintilla/Makefile
===================================================================
--- head/x11-toolkits/scintilla/Makefile	(revision 502768)
+++ head/x11-toolkits/scintilla/Makefile	(revision 502769)
@@ -1,56 +1,55 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	scintilla
 DISTVERSION=	4.1.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	scite${PORTVERSION:S/.//g}
 
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Full-featured free source code editing component for GTK+
 
 LICENSE=	SCINTILLA
 LICENSE_NAME=	License for Scintilla and SciTE
 LICENSE_FILE=	${WRKSRC}/../License.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		compiler:c++17-lang gmake iconv pkgconfig tar:tgz
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
-CXXSTD=		gnu++17
 MAKEFILE=	makefile
 USE_LDCONFIG=	yes
 USE_GNOME=	gtk20
 MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 CFLAGS+=	-DPIC ${PICFLAG}
 
 MAJOR=		2
 AGE=		0
 REVISION=	0
 MAKE_ARGS=	MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}"
 PLIST_SUB=	MAJOR="${MAJOR}" AGE="${AGE}" REVISION="${REVISION}"
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
 PICFLAG?=	-fPIC
 .else
 PICFLAG?=	-fpic
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| -Os||g' ${WRKSRC}/makefile
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla
 	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${STAGEDIR}${PREFIX}/include/scintilla
 .for f in libscintilla.so libscintilla_lexers.so
 	${INSTALL_LIB} ${WRKSRC}/${f}.${MAJOR}.${AGE}.${REVISION} \
 		${STAGEDIR}${PREFIX}/lib
 	(cd ${STAGEDIR}${PREFIX}/lib && \
 		${LN} -sf ${f}.${MAJOR}.${AGE}.${REVISION} ${f}.${MAJOR} && \
 		${LN} -sf ${f}.${MAJOR} ${f})
 .endfor
 
 .include <bsd.port.post.mk>