CVS commit: pkgsrc/devel/sparse

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jan 31 10:18:23 UTC 2025

Modified Files:
        pkgsrc/devel/sparse: Makefile distinfo
        pkgsrc/devel/sparse/patches: patch-Makefile

Log Message:
sparse: fix installation of cgcc

It's a perl script, so we can't use INSTALL_PROGRAM

Some cleanups while here.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/sparse/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/sparse/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/sparse/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/devel/sparse/Makefile
diff -u pkgsrc/devel/sparse/Makefile:1.17 pkgsrc/devel/sparse/Makefile:1.18
--- pkgsrc/devel/sparse/Makefile:1.17   Sun Dec 31 17:59:47 2023
+++ pkgsrc/devel/sparse/Makefile        Fri Jan 31 10:18:22 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2023/12/31 17:59:47 riastradh Exp $
+# $NetBSD: Makefile,v 1.18 2025/01/31 10:18:22 wiz Exp $
 
 DISTNAME=      sparse-0.6.4
 CATEGORIES=    devel lang
@@ -10,13 +10,15 @@ HOMEPAGE=   http://kernel.org/pub/software
 COMMENT=       Semantic parser for C
 LICENSE=       mit
 
+USE_LANGUAGES=         c
+USE_CC_FEATURES=       c99
+
 TOOLS_CREATE+=                 llvm-config
 TOOLS_SCRIPT.llvm-config=      exit 1
 
 INSTALLATION_DIRS+=    bin
 INSTALLATION_DIRS+=    share/doc/sparse
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
-PKGCONFIG_OVERRIDE+=   sparse.pc.in
 REPLACE_PERL=          cgcc
 USE_TOOLS+=            gmake perl:run
 
@@ -24,13 +26,14 @@ CPPFLAGS+=  -D_POSIX_C_SOURCE=200809L
 CFLAGS+=       -std=gnu99
 
 MAKE_ENV+=     INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}
+MAKE_ENV+=     INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
 MAKE_ENV+=     INSTALL_MAN=${INSTALL_MAN:Q}
 
+TEST_TARGET=   check
+
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/FAQ ${DESTDIR}${PREFIX}/share/doc/sparse/
        ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/share/doc/sparse/
        ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/sparse/
 
-TEST_TARGET=   check
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/sparse/distinfo
diff -u pkgsrc/devel/sparse/distinfo:1.10 pkgsrc/devel/sparse/distinfo:1.11
--- pkgsrc/devel/sparse/distinfo:1.10   Sun Dec 31 17:59:47 2023
+++ pkgsrc/devel/sparse/distinfo        Fri Jan 31 10:18:23 2025
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2023/12/31 17:59:47 riastradh Exp $
+$NetBSD: distinfo,v 1.11 2025/01/31 10:18:23 wiz Exp $
 
 BLAKE2s (sparse-0.6.4.tar.xz) = 9b893e260884c6615d445182e4e190f098e1c418c54cc209c6ae20ee89b590e7
 SHA512 (sparse-0.6.4.tar.xz) = 4ada31e588469d15862579dd7eb926ce1ad717bf96d38d425b9153f2efe73949fdda5bc59d05d926614a08d70e656e4ff531a5f0a1cf8e7725c596dcdba169f9
 Size (sparse-0.6.4.tar.xz) = 370840 bytes
-SHA1 (patch-Makefile) = 57e430d4d3c3a3d88537d4cccc9d24234588d6df
+SHA1 (patch-Makefile) = f32e899999046f308216850e8864481a31672026
 SHA1 (patch-ab) = aed1b3bd22529e8ec9ec2a359dd250cfec1af2c1

Index: pkgsrc/devel/sparse/patches/patch-Makefile
diff -u pkgsrc/devel/sparse/patches/patch-Makefile:1.2 pkgsrc/devel/sparse/patches/patch-Makefile:1.3
--- pkgsrc/devel/sparse/patches/patch-Makefile:1.2      Sun Dec 31 17:59:48 2023
+++ pkgsrc/devel/sparse/patches/patch-Makefile  Fri Jan 31 10:18:23 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.2 2023/12/31 17:59:48 riastradh Exp $
+$NetBSD: patch-Makefile,v 1.3 2025/01/31 10:18:23 wiz Exp $
 
 - honor PKGMANDIR
 - use INSTALL_PROGRAM, INSTALL_MAN
@@ -15,8 +15,13 @@ $NetBSD: patch-Makefile,v 1.2 2023/12/31
  
  PKG_CONFIG ?= pkg-config
  
-@@ -300,10 +301,10 @@ install-man: $(INST_MAN1:%=$(man1dir)/%)
+@@ -298,12 +299,15 @@ install: install-bin install-man
+ install-bin: $(INST_PROGRAMS:%=$(bindir)/%)
+ install-man: $(INST_MAN1:%=$(man1dir)/%)
  
++$(bindir)/cgcc: cgcc
++      @echo "  INSTALL $@"
++      $(Q)$(INSTALL_SCRIPT) $< $@ || exit 1;
  $(bindir)/%: %
        @echo "  INSTALL $@"
 -      $(Q)install -D        $< $@ || exit 1;