diff --git a/dev-cpp/htmlcxx/htmlcxx-0.87.recipe b/dev-cpp/htmlcxx/htmlcxx-0.87.recipe
index 3a4047dff..5b0561185 100644
--- a/dev-cpp/htmlcxx/htmlcxx-0.87.recipe
+++ b/dev-cpp/htmlcxx/htmlcxx-0.87.recipe
@@ -8,10 +8,10 @@ COPYRIGHT="Davi de Castro Reis
 	Robson Braga Ara˙jo"
 LICENSE="Apache v2
 	GNU LGPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="$HOMEPAGE/files/v0.87/htmlcxx-0.87.tar.gz"
 CHECKSUM_SHA256="5d38f938cf4df9a298a5346af27195fffabfef9f460fc2a02233cbcfa8fc75c8"
-PATCHES="htmlcxx-$portVersion-c++17.patch"
+PATCHES="htmlcxx-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -31,13 +31,13 @@ libCssVersionCompat="$libCssVersion compat >= ${libCssVersion%%.*}"
 
 PROVIDES="
 	htmlcxx$secondaryArchSuffix = $portVersion
-	cmd:htmlcxx$commandSuffix
 	lib:libhtmlcxx$secondaryArchSuffix = $libVersionCompat
 	lib:libcss_parser$secondaryArchSuffix = $libCssVersionCompat
 	lib:libcss_parser_pp$secondaryArchSuffix = $libCssVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	"
 
 PROVIDES_tools="
@@ -47,6 +47,7 @@ PROVIDES_tools="
 REQUIRES_tools="
 	htmlcxx$secondaryArchSuffix == $portVersion
 	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
diff --git a/dev-cpp/htmlcxx/patches/htmlcxx-0.87-c++17.patch b/dev-cpp/htmlcxx/patches/htmlcxx-0.87-c++17.patch
deleted file mode 100644
index 9f8f060de..000000000
--- a/dev-cpp/htmlcxx/patches/htmlcxx-0.87-c++17.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://sourceforge.net/p/htmlcxx/patches/8/
-
-diff --color -Naur a/html/CharsetConverter.cc b/html/CharsetConverter.cc
---- a/html/CharsetConverter.cc	2018-12-29 03:13:56.000000000 +0000
-+++ b/html/CharsetConverter.cc	2021-05-31 23:03:10.705334580 +0100
-@@ -7,7 +7,7 @@
- using namespace std;
- using namespace htmlcxx;
- 
--CharsetConverter::CharsetConverter(const string &from, const string &to) throw (Exception)
-+CharsetConverter::CharsetConverter(const string &from, const string &to)
- {
- 	mIconvDescriptor = iconv_open(to.c_str(), from.c_str());
- 	if (mIconvDescriptor == (iconv_t)(-1))
-diff --color -Naur a/html/CharsetConverter.h b/html/CharsetConverter.h
---- a/html/CharsetConverter.h	2018-12-29 03:13:56.000000000 +0000
-+++ b/html/CharsetConverter.h	2021-05-31 23:03:19.042574598 +0100
-@@ -17,7 +17,7 @@
- 						: std::runtime_error(arg) {}
- 			};
- 			
--			CharsetConverter(const std::string &from, const std::string &to) throw (Exception);
-+			CharsetConverter(const std::string &from, const std::string &to);
- 			~CharsetConverter();
- 			
- 			std::string convert(const std::string &input);
diff --git a/dev-cpp/htmlcxx/patches/htmlcxx-0.87.patchset b/dev-cpp/htmlcxx/patches/htmlcxx-0.87.patchset
new file mode 100644
index 000000000..f59c1636a
--- /dev/null
+++ b/dev-cpp/htmlcxx/patches/htmlcxx-0.87.patchset
@@ -0,0 +1,478 @@
+From 56c6f93231f8174b76c2ca0a934f45ab632dd142 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <jerseychewi@users.sourceforge.net>
+Date: Tue, 8 Oct 2024 11:24:46 +0000
+Subject: applying patch htmlcxx-0.87-c++17.patch
+
+
+diff --git a/html/CharsetConverter.cc b/html/CharsetConverter.cc
+index 4cf50c7..f0358fc 100644
+--- a/html/CharsetConverter.cc
++++ b/html/CharsetConverter.cc
+@@ -7,7 +7,7 @@
+ using namespace std;
+ using namespace htmlcxx;
+ 
+-CharsetConverter::CharsetConverter(const string &from, const string &to) throw (Exception)
++CharsetConverter::CharsetConverter(const string &from, const string &to)
+ {
+ 	mIconvDescriptor = iconv_open(to.c_str(), from.c_str());
+ 	if (mIconvDescriptor == (iconv_t)(-1))
+diff --git a/html/CharsetConverter.h b/html/CharsetConverter.h
+index e5d21d5..11fa909 100644
+--- a/html/CharsetConverter.h
++++ b/html/CharsetConverter.h
+@@ -17,7 +17,7 @@ namespace htmlcxx
+ 						: std::runtime_error(arg) {}
+ 			};
+ 			
+-			CharsetConverter(const std::string &from, const std::string &to) throw (Exception);
++			CharsetConverter(const std::string &from, const std::string &to);
+ 			~CharsetConverter();
+ 			
+ 			std::string convert(const std::string &input);
+-- 
+2.45.2
+
+
+From eb93b6c2a97c073698a30e7b726af08a11255f5a Mon Sep 17 00:00:00 2001
+From: "Mika T. Lindqvist" <postmaster@raasu.org>
+Date: Tue, 8 Oct 2024 11:47:09 +0000
+Subject: Fix finding iconv.
+
+
+diff --git a/configure.ac b/configure.ac
+index 302d74d..b43b6bf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,29 +1,32 @@
+ #                                               -*- Autoconf -*-
+ # Process this file with autoconf to produce a configure script.
+ 
+-#AC_PREREQ(2.57)
+-AC_INIT([htmlcxx], [0.87])
++#AC_PREREQ([2.72])
++AC_INIT([htmlcxx],[0.87])
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+-AM_DISABLE_STATIC
++AC_DISABLE_STATIC([])
+ 
+ # Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_CC
+ AM_PROG_LEX
+ AC_PROG_YACC
+-AC_PROG_LIBTOOL
++LT_INIT
+ 
+ # Checks for libraries.
+ # Replace `main' with a function in -lfl:
+ AC_CHECK_LIB(fl, main)
+ AC_CHECK_LIB(iconv, iconv_open)
++AC_CHECK_LIB(iconv, libiconv_open)
+ 
+ 
+ # Checks for header files.
+-AC_HEADER_STDC
++AC_CHECK_INCLUDES_DEFAULT
++AC_PROG_EGREP
++
+ # AC_CHECK_HEADERS([])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+@@ -31,13 +34,21 @@ AC_HEADER_STDBOOL
+ AC_C_CONST
+ AC_C_INLINE
+ AC_TYPE_SIZE_T
+-AC_HEADER_TIME
++AC_CHECK_HEADERS_ONCE([sys/time.h])
++# Obsolete code to be removed.
++if test $ac_cv_header_sys_time_h = yes; then
++  AC_DEFINE([TIME_WITH_SYS_TIME],[1],[Define to 1 if you can safely include both <sys/time.h>
++	     and <time.h>.  This macro is obsolete.])
++fi
++# End of obsolete code.
++
+ 
+ # Checks for library functions.
+ 
+-AC_LANG_CPLUSPLUS
++AC_LANG([C++])
+ CXXFLAGS="$CXXFLAGS -DDEFAULT_CSS=\"\\\"$datadir/htmlcxx/css/default.css\\\"\""
+ 
+ AC_CHECK_SPOON
+ AC_CONFIG_FILES([Makefile html/Makefile css/Makefile])
+-AC_OUTPUT(htmlcxx.pc)
++AC_CONFIG_FILES([htmlcxx.pc])
++AC_OUTPUT
+-- 
+2.45.2
+
+
+From 1f612b7285715a0ce6037591118ccaa7d9b4dc60 Mon Sep 17 00:00:00 2001
+From: "Mika T. Lindqvist" <postmaster@raasu.org>
+Date: Fri, 11 Oct 2024 21:09:23 +0000
+Subject: Fix deprecation warning in aclocal.m4 and configure.ac
+
+
+diff --git a/acinclude.m4 b/acinclude.m4
+new file mode 100644
+index 0000000..082b1d8
+--- /dev/null
++++ b/acinclude.m4
+@@ -0,0 +1,31 @@
++dnl #########################################################################
++
++# AC_PROG_BISON
++# ------------
++AN_MAKEVAR([BISON], [AC_PROG_YACC])
++AN_PROGRAM([bison], [AC_PROG_YACC])
++AC_DEFUN([AC_PROG_BISON], [
++  AC_CHECK_PROGS(BISON, 'bison')dnl
++  AC_REQUIRE([AC_PROG_YACC])
++  AC_REQUIRE([AC_PROG_EGREP])
++
++  AC_ARG_VAR(BISON,
++    [The Bison implementation to use.  Defaults to bison'.])dnl
++  AC_ARG_VAR(BFLAGS,
++    [The list of arguments that will be passed by default to BISON.  This script
++     will default BFLAGS to the empty string to avoid a default value of -d' given
++     by some make applications.])
++  AC_CACHE_CHECK([if bison is the parser generator],[ac_cv_prog_bison],[
++    AS_IF([$YACC --version 2>/dev/null | $EGREP -q '^bison '],
++      [ac_cv_prog_bison=yes], [ac_cv_prog_bison=no])
++    ])
++    AS_IF([test "$ac_cv_prog_bison" = "yes"], [
++      dnl replace the yacc compatible compiler with the real bison, as
++      dnl otherwise autoconf limits us to the POSIX yacc.
++      dnl We also change the generated filename to the old one, so that
++      dnl automake's ylwrap can deal with it.
++      YACC="${YACC% -y}"
++    ] m4_ifval(m4_normalize([$1]), [[$1]]),
++    m4_ifval(m4_normalize([$2]), [[$2]])
++  ) 
++])
+diff --git a/aclocal.m4 b/aclocal.m4
+index 84c9544..1452bc0 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1,6 +1,6 @@
+-# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
+ 
+-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
++# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+ 
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -14,13 +14,13 @@
+ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+-[m4_warning([this file was generated for autoconf 2.69.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.72],,
++[m4_warning([this file was generated for autoconf 2.72.
+ You have another version of autoconf.  It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+ 
+-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
++# Copyright (C) 2002-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
+ [am__api_version='1.16'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version.  Point them to the right macro.
+-m4_if([$1], [1.16.1], [],
++m4_if([$1], [1.16.5], [],
+       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+ 
+@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.16.1])dnl
++[AM_AUTOMAKE_VERSION([1.16.5])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+ 
+ # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+ 
+-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
++# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
+ 
+ # AM_CONDITIONAL                                            -*- Autoconf -*-
+ 
+-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
++# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+ 
+-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
++# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -332,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
+ 
+ # Generate code to set up dependency tracking.              -*- Autoconf -*-
+ 
+-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
++# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -371,7 +371,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+   done
+   if test $am_rc -ne 0; then
+     AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+-    for automatic dependency tracking.  Try re-running configure with the
++    for automatic dependency tracking.  If GNU make was not used, consider
++    re-running the configure script with MAKE="gmake" (or whatever is
++    necessary).  You can also try re-running configure with the
+     '--disable-dependency-tracking' option to at least be able to build
+     the package (albeit without support for automatic dependency tracking).])
+   fi
+@@ -398,7 +400,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+ 
+ # Do all the work for Automake.                             -*- Autoconf -*-
+ 
+-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
++# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -426,6 +428,10 @@ m4_defn([AC_PROG_CC])
+ # release and drop the old call support.
+ AC_DEFUN([AM_INIT_AUTOMAKE],
+ [AC_PREREQ([2.65])dnl
++m4_ifdef([_$0_ALREADY_INIT],
++  [m4_fatal([$0 expanded multiple times
++]m4_defn([_$0_ALREADY_INIT]))],
++  [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
+ dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+ dnl the ones we care about.
+ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+@@ -462,7 +468,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ [_AM_SET_OPTIONS([$1])dnl
+ dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+ m4_if(
+-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
++  m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
+   [ok:ok],,
+   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+@@ -514,6 +520,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+ 		  [m4_define([AC_PROG_OBJCXX],
+ 			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+ ])
++# Variables for tags utilities; see am/tags.am
++if test -z "$CTAGS"; then
++  CTAGS=ctags
++fi
++AC_SUBST([CTAGS])
++if test -z "$ETAGS"; then
++  ETAGS=etags
++fi
++AC_SUBST([ETAGS])
++if test -z "$CSCOPE"; then
++  CSCOPE=cscope
++fi
++AC_SUBST([CSCOPE])
++
+ AC_REQUIRE([AM_SILENT_RULES])dnl
+ dnl The testsuite driver may need to know about EXEEXT, so add the
+ dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+@@ -595,7 +615,7 @@ for _am_header in $config_headers :; do
+ done
+ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+ 
+-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
++# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -616,7 +636,7 @@ if test x"${install_sh+set}" != xset; then
+ fi
+ AC_SUBST([install_sh])])
+ 
+-# Copyright (C) 2003-2018 Free Software Foundation, Inc.
++# Copyright (C) 2003-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -635,27 +655,9 @@ fi
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
+ 
+-# Copyright (C) 1998-2018 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# AM_PROG_LEX
+-# -----------
+-# Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
+-# "missing" invocation, for better error output.
+-AC_DEFUN([AM_PROG_LEX],
+-[AC_PREREQ([2.50])dnl
+-AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
+-AC_REQUIRE([AC_PROG_LEX])dnl
+-if test "$LEX" = :; then
+-  LEX=${am_missing_run}flex
+-fi])
+-
+ # Check to see how 'make' treats includes.	            -*- Autoconf -*-
+ 
+-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
++# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -698,7 +700,7 @@ AC_SUBST([am__quote])])
+ 
+ # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+ 
+-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
++# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -719,12 +721,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ AC_REQUIRE_AUX_FILE([missing])dnl
+ if test x"${MISSING+set}" != xset; then
+-  case $am_aux_dir in
+-  *\ * | *\	*)
+-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+-  *)
+-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+-  esac
++  MISSING="\${SHELL} '$am_aux_dir/missing'"
+ fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --is-lightweight"; then
+@@ -737,7 +734,7 @@ fi
+ 
+ # Helper functions for option handling.                     -*- Autoconf -*-
+ 
+-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
++# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -766,7 +763,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
+ AC_DEFUN([_AM_IF_OPTION],
+ [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+ 
+-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
++# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -813,7 +810,7 @@ AC_LANG_POP([C])])
+ # For backward compatibility.
+ AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+ 
+-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
++# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -832,7 +829,7 @@ AC_DEFUN([AM_RUN_LOG],
+ 
+ # Check to make sure that the build environment is sane.    -*- Autoconf -*-
+ 
+-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
++# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -913,7 +910,7 @@ AC_CONFIG_COMMANDS_PRE(
+ rm -f conftest.file
+ ])
+ 
+-# Copyright (C) 2009-2018 Free Software Foundation, Inc.
++# Copyright (C) 2009-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -973,7 +970,7 @@ AC_SUBST([AM_BACKSLASH])dnl
+ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+ ])
+ 
+-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
++# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -1001,7 +998,7 @@ fi
+ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+ 
+-# Copyright (C) 2006-2018 Free Software Foundation, Inc.
++# Copyright (C) 2006-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -1020,7 +1017,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+ 
+ # Check how to create a tarball.                            -*- Autoconf -*-
+ 
+-# Copyright (C) 2004-2018 Free Software Foundation, Inc.
++# Copyright (C) 2004-2021 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -1157,3 +1154,4 @@ m4_include([m4/ltsugar.m4])
+ m4_include([m4/ltversion.m4])
+ m4_include([m4/lt~obsolete.m4])
+ m4_include([m4/spoon.m4])
++m4_include([acinclude.m4])
+diff --git a/configure.ac b/configure.ac
+index b43b6bf..ca0cb47 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -12,8 +12,8 @@ AC_DISABLE_STATIC([])
+ # Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_CC
+-AM_PROG_LEX
+-AC_PROG_YACC
++AC_PROG_LEX(noyywrap)
++AC_PROG_BISON
+ LT_INIT
+ 
+ # Checks for libraries.
+diff --git a/css/css_syntax.y b/css/css_syntax.y
+index 0d9b177..f4da8d3 100644
+--- a/css/css_syntax.y
++++ b/css/css_syntax.y
+@@ -10,7 +10,7 @@
+ %}
+ 
+ %parse-param {void *yyparam}
+-%pure-parser
++%define api.pure
+ 
+ %union {
+ 	char *lexeme;
+-- 
+2.45.2
+