deforaos-cpp: re-generate the Makefiles before building

This makes use of a new helper for DeforaOS configure, found in
devel/deforaos-configure/deforaos-configure.mk.

Bumps PKGREVISION for DeforaOS libSystem update.

5 files changed, 35 insertions, 18 deletions

diff --git a/devel/deforaos-configure/deforaos-configure.mk b/devel/deforaos-configure/deforaos-configure.mk
new file mode 100644
index 00000000000..f90d10a0fba
--- /dev/null
+++ b/devel/deforaos-configure/deforaos-configure.mk
@@ -0,0 +1,17 @@
+# $NetBSD: deforaos-configure.mk,v 1.1 2022/04/12 23:32:03 khorben Exp $
+#
+# used by devel/deforaos-cpp/Makefile
+
+BUILD_DEPENDS+=	deforaos-configure-[0-9]*:../../devel/deforaos-configure
+
+DEFORAOS_CONFIGURE?=		${PREFIX}/bin/configure
+DEFORAOS_CONFIGURE_ARGS?=	-v
+DEFORAOS_CONFIGURE_DIRS?=	.
+_BUILD_DEFS+=			DEFORAOS_CONFIGURE DEFORAOS_CONFIGURE_ARGS DEFORAOS_CONFIGURE_DIRS
+_DO_CONFIGURE_TARGETS+=		do-configure-deforaos
+
+do-configure-deforaos:
+.for dir in ${DEFORAOS_CONFIGURE_DIRS}
+	@${ECHO_MSG} "Running DeforaOS configure in ${dir}"
+	@${RUN} cd ${WRKSRC} && ${DEFORAOS_CONFIGURE} ${DEFORAOS_CONFIGURE_ARGS} ${dir}
+.endfor
diff --git a/devel/deforaos-cpp/Makefile b/devel/deforaos-cpp/Makefile
index 6ec438dda9e..342ba6cf37e 100644
--- a/devel/deforaos-cpp/Makefile
+++ b/devel/deforaos-cpp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2021/12/08 16:03:55 adam Exp $
+# $NetBSD: Makefile,v 1.9 2022/04/12 23:32:03 khorben Exp $
 
 DISTNAME=	CPP-0.0.3
 PKGNAME=	deforaos-cpp-0.0.3
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	https://www.defora.org/os/download/download/4422/
 
@@ -20,6 +20,7 @@ MAKE_FLAGS+=	INSTALL=${INSTALL}
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/cpp ${DESTDIR}${PREFIX}/bin/deforaos-cpp
 
+.include "../../devel/deforaos-configure/deforaos-configure.mk"
 .include "../../devel/deforaos-libsystem/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk-doc+=	gtk-doc>=1.20
 .include "../../textproc/gtk-doc/buildlink3.mk"
diff --git a/devel/deforaos-cpp/distinfo b/devel/deforaos-cpp/distinfo
index 51518c0f1ff..0a50a728ed1 100644
--- a/devel/deforaos-cpp/distinfo
+++ b/devel/deforaos-cpp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 10:14:32 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/04/12 23:32:03 khorben Exp $
 
 BLAKE2s (CPP-0.0.3.tar.gz) = 1e3d5eb256bd1b2fbbb6a6287077fe9e543a14867367d7d7307ce448df9edb92
 SHA512 (CPP-0.0.3.tar.gz) = cc436c92f9ff55c3a4bbcc952546b09b7665b435561176e8cec0cc427d1a5bb92b0475dc0a1016db2c2f634649a1c73280e57508312ba632c9b1548e0b38b578
 Size (CPP-0.0.3.tar.gz) = 21742 bytes
-SHA1 (patch-Makefile) = 9772302b7f40b1f43e8b4d1f2e001b4841039bba
+SHA1 (patch-project.conf) = ec82075e4f509c2e5b8f866a82f3d14746485821
diff --git a/devel/deforaos-cpp/patches/patch-Makefile b/devel/deforaos-cpp/patches/patch-Makefile
deleted file mode 100644
index a95be60ee1e..00000000000
--- a/devel/deforaos-cpp/patches/patch-Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2016/02/20 02:54:45 khorben Exp $
-
-Do not run the tests
-
---- Makefile.orig	2016-02-20 02:49:12.000000000 +0000
-+++ Makefile
-@@ -1,6 +1,6 @@
- PACKAGE	= CPP
- VERSION	= 0.0.3
--SUBDIRS	= data doc include src tests
-+SUBDIRS	= data doc include src
- RM	= rm -f
- LN	= ln -f
- TAR	= tar
diff --git a/devel/deforaos-cpp/patches/patch-project.conf b/devel/deforaos-cpp/patches/patch-project.conf
new file mode 100644
index 00000000000..2842588bba1
--- /dev/null
+++ b/devel/deforaos-cpp/patches/patch-project.conf
@@ -0,0 +1,13 @@
+$NetBSD: patch-project.conf,v 1.1 2022/04/12 23:32:03 khorben Exp $
+
+Do not run the tests
+
+--- project.conf.orig	2016-02-20 02:49:10.000000000 +0000
++++ project.conf
+@@ -2,5 +2,5 @@ package=CPP
+ version=0.0.3
+ config=h,sh
+ 
+-subdirs=data,doc,include,src,tests
++subdirs=data,doc,include,src
+ dist=Makefile,COPYING,config.h,config.sh