CVS commit: pkgsrc/devel

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Tue Apr 12 23:32:03 UTC 2022

Modified Files:
        pkgsrc/devel/deforaos-cpp: Makefile distinfo
Added Files:
        pkgsrc/devel/deforaos-configure: deforaos-configure.mk
        pkgsrc/devel/deforaos-cpp/patches: patch-project.conf
Removed Files:
        pkgsrc/devel/deforaos-cpp/patches: patch-Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/deforaos-configure/deforaos-configure.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/deforaos-cpp/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/deforaos-cpp/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/deforaos-cpp/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/deforaos-cpp/patches/patch-project.conf

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

Modified files:

Index: pkgsrc/devel/deforaos-cpp/Makefile
diff -u pkgsrc/devel/deforaos-cpp/Makefile:1.8 pkgsrc/devel/deforaos-cpp/Makefile:1.9
--- pkgsrc/devel/deforaos-cpp/Makefile:1.8      Wed Dec  8 16:03:55 2021
+++ pkgsrc/devel/deforaos-cpp/Makefile  Tue Apr 12 23:32:03 2022
@@ -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"

Index: pkgsrc/devel/deforaos-cpp/distinfo
diff -u pkgsrc/devel/deforaos-cpp/distinfo:1.3 pkgsrc/devel/deforaos-cpp/distinfo:1.4
--- pkgsrc/devel/deforaos-cpp/distinfo:1.3      Tue Oct 26 10:14:32 2021
+++ pkgsrc/devel/deforaos-cpp/distinfo  Tue Apr 12 23:32:03 2022
@@ -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

Added files:

Index: pkgsrc/devel/deforaos-configure/deforaos-configure.mk
diff -u /dev/null pkgsrc/devel/deforaos-configure/deforaos-configure.mk:1.1
--- /dev/null   Tue Apr 12 23:32:03 2022
+++ pkgsrc/devel/deforaos-configure/deforaos-configure.mk       Tue Apr 12 23:32:03 2022
@@ -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

Index: pkgsrc/devel/deforaos-cpp/patches/patch-project.conf
diff -u /dev/null pkgsrc/devel/deforaos-cpp/patches/patch-project.conf:1.1
--- /dev/null   Tue Apr 12 23:32:03 2022
+++ pkgsrc/devel/deforaos-cpp/patches/patch-project.conf        Tue Apr 12 23:32:03 2022
@@ -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