RE-flex: Fix pkglint warnings

[Malte Dehling <mdehling%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Malte Dehling <mdehling%gmail.com@localhost>
Pushed By:	mdehling
Date:		Sun Mar 17 17:57:45 2024 -0700
Changeset:	495d2d7ef94d0b6c6eb918edfb784d80a35f91a4

Modified Files:
	RE-flex/Makefile
	RE-flex/distinfo
	RE-flex/options.mk
	RE-flex/patches/patch-src_Makefile.in

Log Message:
RE-flex: Fix pkglint warnings

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=495d2d7ef94d0b6c6eb918edfb784d80a35f91a4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 RE-flex/Makefile                      | 4 ++--
 RE-flex/distinfo                      | 2 +-
 RE-flex/options.mk                    | 4 +---
 RE-flex/patches/patch-src_Makefile.in | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diffs:
diff --git a/RE-flex/Makefile b/RE-flex/Makefile
index 7901c0df9a..3bd3b5d71d 100644
--- a/RE-flex/Makefile
+++ b/RE-flex/Makefile
@@ -40,8 +40,8 @@ do-install:
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 post-install: post-install-doxygen post-install-examples
-.  for f in README.md LICENSE.txt CONTRIBUTING.md CODE_OF_CONDUCT.md lex.vim
+.for f in README.md LICENSE.txt CONTRIBUTING.md CODE_OF_CONDUCT.md lex.vim
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/RE-flex
-.  endfor
+.endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/RE-flex/distinfo b/RE-flex/distinfo
index e0b3ef4a02..b3ae8c678a 100644
--- a/RE-flex/distinfo
+++ b/RE-flex/distinfo
@@ -8,5 +8,5 @@ SHA1 (patch-examples_Make) = 2e7a07f62cf80ef502cb76b8cdb980c7a2d0773b
 SHA1 (patch-include_reflex_convert.h) = ed9fbae2d615907a0b596ba5ee9080eb3129c9dc
 SHA1 (patch-include_reflex_pattern.h) = 3dee984028b48ecc7c34aa1e6b487bb4de89c079
 SHA1 (patch-lib_Makefile.in) = 470fe61aa837f3321e749096a00062b0a19da007
-SHA1 (patch-src_Makefile.in) = 8b0e6c6e1acf266cce75fa264ad91f89862fbb88
+SHA1 (patch-src_Makefile.in) = ac44cbb6e6c2913a982dfd0d2e7fb1e91f3d54f3
 SHA1 (patch-src_reflex.cpp) = 194f655b8f2fc15e8d09c66618c9981c5d70b6ce
diff --git a/RE-flex/options.mk b/RE-flex/options.mk
index 053172f28b..aad0ec6ce5 100644
--- a/RE-flex/options.mk
+++ b/RE-flex/options.mk
@@ -52,9 +52,7 @@ SUBST_CLASSES+=		path
 SUBST_FILES.path=	examples/Make
 SUBST_MESSAGE.path=	Updating paths.
 SUBST_STAGE.path=	pre-install
-SUBST_SED.path+=	-e 's|@CC@|${CC}|g'
-SUBST_SED.path+=	-e 's|@CXX@|${CXX}|g'
-SUBST_SED.path+=	-e 's|@PREFIX@|${PREFIX}|g'
+SUBST_VARS.path=	CC CXX PREFIX
 
 .PHONY: post-install-examples
 
diff --git a/RE-flex/patches/patch-src_Makefile.in b/RE-flex/patches/patch-src_Makefile.in
index dee7c6971e..73c516fbc7 100644
--- a/RE-flex/patches/patch-src_Makefile.in
+++ b/RE-flex/patches/patch-src_Makefile.in
@@ -2,7 +2,7 @@ $NetBSD$
 
 use libtool
 
---- src/Makefile.in.orig	2023-11-05 19:06:12.000000000 +0000
+--- src/Makefile.in.orig	2024-03-17 20:54:34.000000000 +0000
 +++ src/Makefile.in
 @@ -103,7 +103,7 @@ am__installdirs = "$(DESTDIR)$(bindir)"
  PROGRAMS = $(bin_PROGRAMS)
@@ -30,7 +30,7 @@ use libtool
  CXXDEPMODE = @CXXDEPMODE@
  CXXFLAGS = @CXXFLAGS@
  CYGPATH_W = @CYGPATH_W@
-@@ -381,9 +381,10 @@ uninstall-binPROGRAMS:
+@@ -381,9 +382,10 @@ uninstall-binPROGRAMS:
  clean-binPROGRAMS:
  	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)