@@ -1,42 +0,0 @@
-# $NetBSD: Makefile,v 1.45 2023/07/06 07:24:26 nia Exp $
-#
-
-DISTNAME=		enchant-1.6.0
-PKGREVISION=		10
-CATEGORIES=		textproc
-MASTER_SITES=		http://www.abisource.com/downloads/enchant/1.6.0/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		https://www.abisource.com/projects/enchant/
-COMMENT=		Generic spell checking library
-LICENSE=		gnu-lgpl-v2.1
-
-USE_TOOLS+=		pkg-config autoconf
-USE_LANGUAGES=		c c++11
-USE_PKGLOCALEDIR=	yes
-USE_LIBTOOL=		yes
-PKGCONFIG_OVERRIDE+=	enchant.pc.in
-GNU_CONFIGURE=		yes
-CFLAGS.SunOS+=		-D__EXTENSIONS__
-
-INSTALLATION_DIRS+=	share/examples
-MAKE_DIRS+=		${PREFIX}/share/enchant
-CONF_FILES=		${PREFIX}/share/examples/enchant-1.ordering ${PREFIX}/share/enchant/enchant.ordering
-
-# Unsupported in pkgsrc:
-# hspell - Hebrew spelling
-# uspell - Yiddish spelling
-# voikko - Finnish spelling
-#
-# hunspell or aspell can be used for these languages.
-CONFIGURE_ARGS+=	--disable-hspell
-CONFIGURE_ARGS+=	--disable-uspell
-CONFIGURE_ARGS+=	--disable-voikko
-
-post-install:
-	cd ${DESTDIR}${PREFIX}/share && ${MV} enchant/enchant.ordering examples/enchant-1.ordering
-
-.include "options.mk"
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2023/07/18 18:47:53 nia Exp $
+# $NetBSD: Makefile,v 1.29 2023/08/02 19:36:51 nia Exp $
 
 DISTNAME=		enchant-2.5.0
 PKGNAME=		${DISTNAME:S/enchant/enchant2/}
@@ -13,8 +13,7 @@
 LICENSE=		gnu-lgpl-v2.1
 
 USE_TOOLS+=		autoconf groff pkg-config
-USE_LANGUAGES=		c c++11
-USE_CXX_FEATURES+=	c++11
+USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	enchant.pc.in
@@ -23,6 +22,10 @@
 INSTALLATION_DIRS+=	share/examples
 MAKE_DIRS+=		${PREFIX}/share/enchant
 CONF_FILES=		${PREFIX}/share/examples/enchant.ordering ${PREFIX}/share/enchant/enchant.ordering
+
+# Mostly needed due to hunspell headers making c++98 default unacceptable.
+FORCE_CXX_STD=		c++11
+USE_CXX_FEATURES+=	c++11
 
 # unsupported in pkgsrc - other dictionaries can be used instead
 # avoid PLIST problems

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/06/28 11:36:12 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2023/08/02 19:36:51 nia Exp $
 
 DISTNAME=	mythes-1.2.4
 PKGREVISION=	3
@@ -17,6 +17,10 @@
 GNU_CONFIGURE=	yes
 
 REPLACE_PERL=	th_gen_idx.pl
+
+# Mostly needed due to hunspell headers making c++98 default unacceptable.
+FORCE_CXX_STD=		c++11
+USE_CXX_FEATURES+=	c++11
 
 PKGCONFIG_OVERRIDE=	mythes.pc.in