CVS commit: pkgsrc/devel

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

Module Name:    pkgsrc
Committed By:   khorben
Date:           Tue Apr 12 23:50:43 UTC 2022

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

Log Message:
deforaos-asm: 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 -r1.8 -r1.9 pkgsrc/devel/deforaos-asm/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/deforaos-asm/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/deforaos-asm/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/deforaos-asm/patches/patch-project.conf
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/deforaos-configure/deforaos-configure.mk

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-asm/Makefile
diff -u pkgsrc/devel/deforaos-asm/Makefile:1.8 pkgsrc/devel/deforaos-asm/Makefile:1.9
--- pkgsrc/devel/deforaos-asm/Makefile:1.8      Wed Dec  8 16:03:55 2021
+++ pkgsrc/devel/deforaos-asm/Makefile  Tue Apr 12 23:50:43 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:50:43 khorben Exp $
 
 DISTNAME=      Asm-0.2.3
 PKGNAME=       deforaos-asm-0.2.3
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    devel
 MASTER_SITES=  https://www.defora.org/os/download/download/4423/
 
@@ -18,6 +18,7 @@ MAKE_FLAGS+=  LDFLAGS=${LDFLAGS:Q}
 MAKE_FLAGS+=   INSTALL=${INSTALL}
 AUTO_MKDIRS=   yes
 
+.include "../../devel/deforaos-configure/deforaos-configure.mk"
 .include "../../devel/deforaos-cpp/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk-doc+=        gtk-doc>=1.20
 .include "../../textproc/gtk-doc/buildlink3.mk"

Index: pkgsrc/devel/deforaos-asm/distinfo
diff -u pkgsrc/devel/deforaos-asm/distinfo:1.4 pkgsrc/devel/deforaos-asm/distinfo:1.5
--- pkgsrc/devel/deforaos-asm/distinfo:1.4      Tue Oct 26 10:14:31 2021
+++ pkgsrc/devel/deforaos-asm/distinfo  Tue Apr 12 23:50:43 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:14:31 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/04/12 23:50:43 khorben Exp $
 
 BLAKE2s (Asm-0.2.3.tar.gz) = c33ce3377ede601cc424dbc88087afc5f33af6b2fb481b2d5918d355ead1e62b
 SHA512 (Asm-0.2.3.tar.gz) = 01a78be3e5850d68e683c66b4a357e054b5cd137f1a34e7d1e695a0755eeee90dc1efb5e4c487354d4e375e01f73443d91f5875403354cfc37055a6f8bd6b25a
 Size (Asm-0.2.3.tar.gz) = 111944 bytes
-SHA1 (patch-Makefile) = f671907e213321b54a759669b00f158425c76165
 SHA1 (patch-doc_gtkdoc_Asm-docs.xml) = cbe2857fa158a819ece776709985ba9797426e13
+SHA1 (patch-project.conf) = ac96265fb350404c5e567d8b69b8400b66950aa8

Index: pkgsrc/devel/deforaos-configure/deforaos-configure.mk
diff -u pkgsrc/devel/deforaos-configure/deforaos-configure.mk:1.1 pkgsrc/devel/deforaos-configure/deforaos-configure.mk:1.2
--- pkgsrc/devel/deforaos-configure/deforaos-configure.mk:1.1   Tue Apr 12 23:32:03 2022
+++ pkgsrc/devel/deforaos-configure/deforaos-configure.mk       Tue Apr 12 23:50:43 2022
@@ -1,5 +1,6 @@
-# $NetBSD: deforaos-configure.mk,v 1.1 2022/04/12 23:32:03 khorben Exp $
+# $NetBSD: deforaos-configure.mk,v 1.2 2022/04/12 23:50:43 khorben Exp $
 #
+# used by devel/deforaos-asm/Makefile
 # used by devel/deforaos-cpp/Makefile
 
 BUILD_DEPENDS+=        deforaos-configure-[0-9]*:../../devel/deforaos-configure

Added files:

Index: pkgsrc/devel/deforaos-asm/patches/patch-project.conf
diff -u /dev/null pkgsrc/devel/deforaos-asm/patches/patch-project.conf:1.1
--- /dev/null   Tue Apr 12 23:50:43 2022
+++ pkgsrc/devel/deforaos-asm/patches/patch-project.conf        Tue Apr 12 23:50:43 2022
@@ -0,0 +1,13 @@
+$NetBSD: patch-project.conf,v 1.1 2022/04/12 23:50:43 khorben Exp $
+
+Do not run the tests
+
+--- project.conf.orig  2016-02-20 03:08:24.000000000 +0000
++++ project.conf
+@@ -2,5 +2,5 @@ package=Asm
+ version=0.2.3
+ config=h,sh
+ 
+-subdirs=data,doc,include,src,tools,tests
++subdirs=data,doc,include,src,tools
+ dist=Makefile,COPYING,config.h,config.sh