pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/jam



Module Name:    pkgsrc
Committed By:   jakllsch
Date:           Tue Feb 10 20:17:59 UTC 2026

Modified Files:
        pkgsrc/devel/jam: Makefile distinfo
        pkgsrc/devel/jam/patches: patch-aa patch-ab patch-jambase.c
            patch-rules.h
Added Files:
        pkgsrc/devel/jam/patches: patch-mkjambase.c

Log Message:
Patch to make (ft)jam build with gcc-14.

Also, fix all pkglint (except lack of LICENSE=).


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/jam/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/jam/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/jam/patches/patch-aa
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/jam/patches/patch-ab
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/jam/patches/patch-jambase.c \
    pkgsrc/devel/jam/patches/patch-rules.h
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/jam/patches/patch-mkjambase.c

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

Modified files:

Index: pkgsrc/devel/jam/Makefile
diff -u pkgsrc/devel/jam/Makefile:1.20 pkgsrc/devel/jam/Makefile:1.21
--- pkgsrc/devel/jam/Makefile:1.20      Mon Nov 17 11:00:36 2025
+++ pkgsrc/devel/jam/Makefile   Tue Feb 10 20:17:59 2026
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2025/11/17 11:00:36 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2026/02/10 20:17:59 jakllsch Exp $
 #
 
 DISTNAME=      ft${PKGNAME_NOREV}
 PKGNAME=       jam-2.5.2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=freetype/}
 #MASTER_SITES= ftp://ftp.perforce.com/pub/jam/

Index: pkgsrc/devel/jam/distinfo
diff -u pkgsrc/devel/jam/distinfo:1.14 pkgsrc/devel/jam/distinfo:1.15
--- pkgsrc/devel/jam/distinfo:1.14      Tue Oct 26 10:15:06 2021
+++ pkgsrc/devel/jam/distinfo   Tue Feb 10 20:17:59 2026
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 10:15:06 nia Exp $
+$NetBSD: distinfo,v 1.15 2026/02/10 20:17:59 jakllsch Exp $
 
 BLAKE2s (ftjam-2.5.2.tar.bz2) = 1e100fade3e02bc019159346fa48aa168d57594dc4d3736db99953c978d1eec2
 SHA512 (ftjam-2.5.2.tar.bz2) = 0754111d22e27f66800c584b8c891819fc5d089713b9c73d7e51f3e5231f322f5f52a3176fae1d13e4e059aed783faaa4f0cd048123cd1f622fe8554335e7e7a
 Size (ftjam-2.5.2.tar.bz2) = 196631 bytes
-SHA1 (patch-aa) = 64a149995f63cd3d3648f4597769e2ec57b0b0ba
-SHA1 (patch-ab) = 6f6fce24c46d799d7ef9885271960c3d2038f93d
-SHA1 (patch-jambase.c) = 906d3589718e4bf87a0f1740d876c2ddc7a7f90d
-SHA1 (patch-rules.h) = aca330528c722cce5fbf0587fd8c34c457dd8c62
+SHA1 (patch-aa) = 97fecb37e5f44bc184c3560f218faa9126ca3d86
+SHA1 (patch-ab) = cb3836b14500f155cc2977b7c9b934e946027078
+SHA1 (patch-jambase.c) = d98474a6f9659be0bf7bf7fd9b85e61c7d3710af
+SHA1 (patch-mkjambase.c) = 9fffeb5a0500aaa40e98cc126fc745c9468235a4
+SHA1 (patch-rules.h) = b293832ebb648026238641f037ee572b0e880b6f

Index: pkgsrc/devel/jam/patches/patch-aa
diff -u pkgsrc/devel/jam/patches/patch-aa:1.5 pkgsrc/devel/jam/patches/patch-aa:1.6
--- pkgsrc/devel/jam/patches/patch-aa:1.5       Wed Dec 26 18:51:47 2012
+++ pkgsrc/devel/jam/patches/patch-aa   Tue Feb 10 20:17:59 2026
@@ -1,10 +1,21 @@
-$NetBSD: patch-aa,v 1.5 2012/12/26 18:51:47 ryoon Exp $
+$NetBSD: patch-aa,v 1.6 2026/02/10 20:17:59 jakllsch Exp $
 
 Beware of DOS linebreaks.
 
+Add missing #includes
+
 --- jam.h.orig 2006-06-05 10:52:05.000000000 +0000
 +++ jam.h
-@@ -379,19 +379,8 @@
+@@ -363,6 +363,8 @@
+ 
+ # include <sys/types.h>
+ # include <sys/stat.h>
++# include <sys/wait.h>
++# include <unistd.h>
+ 
+ # ifndef OS_MPEIX
+ # include <sys/file.h>
+@@ -379,19 +381,8 @@
  # include <memory.h>
  # endif
  

Index: pkgsrc/devel/jam/patches/patch-ab
diff -u pkgsrc/devel/jam/patches/patch-ab:1.2 pkgsrc/devel/jam/patches/patch-ab:1.3
--- pkgsrc/devel/jam/patches/patch-ab:1.2       Wed Dec 26 18:51:47 2012
+++ pkgsrc/devel/jam/patches/patch-ab   Tue Feb 10 20:17:59 2026
@@ -1,14 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2012/12/26 18:51:47 ryoon Exp $
+$NetBSD: patch-ab,v 1.3 2026/02/10 20:17:59 jakllsch Exp $
 
 Beware of DOS linebreaks.
 
+Begin to fix argv variable declaration for use with execvp().
+
 --- execunix.c.orig    2006-06-05 10:52:27.000000000 +0000
 +++ execunix.c
-@@ -42,6 +42,7 @@
- # include "lists.h"
- # include "execcmd.h"
- # include <errno.h>
-+# include <unistd.h>
- 
- # ifdef USE_EXECUNIX
+@@ -102,7 +102,7 @@ execcmd(
+ {
+       int pid;
+       int slot;
+-      const char *argv[ MAXARGC + 1 ];        /* +1 for NULL */
++      char *argv[ MAXARGC + 1 ];      /* +1 for NULL */
  
+ # ifdef USE_EXECNT
+       char *p;

Index: pkgsrc/devel/jam/patches/patch-jambase.c
diff -u pkgsrc/devel/jam/patches/patch-jambase.c:1.1 pkgsrc/devel/jam/patches/patch-jambase.c:1.2
--- pkgsrc/devel/jam/patches/patch-jambase.c:1.1        Wed Dec 26 18:51:47 2012
+++ pkgsrc/devel/jam/patches/patch-jambase.c    Tue Feb 10 20:17:59 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-jambase.c,v 1.1 2012/12/26 18:51:47 ryoon Exp $
+$NetBSD: patch-jambase.c,v 1.2 2026/02/10 20:17:59 jakllsch Exp $
+
+No need to handle ar specially on Solaris in pkgsrc.
 
 --- jambase.c.orig     2012-12-26 18:50:42.000000000 +0000
 +++ jambase.c
Index: pkgsrc/devel/jam/patches/patch-rules.h
diff -u pkgsrc/devel/jam/patches/patch-rules.h:1.1 pkgsrc/devel/jam/patches/patch-rules.h:1.2
--- pkgsrc/devel/jam/patches/patch-rules.h:1.1  Thu Mar 26 21:19:58 2020
+++ pkgsrc/devel/jam/patches/patch-rules.h      Tue Feb 10 20:17:59 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-rules.h,v 1.1 2020/03/26 21:19:58 rillig Exp $
+$NetBSD: patch-rules.h,v 1.2 2026/02/10 20:17:59 jakllsch Exp $
 
 make.c: In function 'make0':
 make.c:249:41: error: array subscript has type 'char' [-Werror=char-subscripts]
@@ -13,7 +13,7 @@ make.c:490:33: error: array subscript ha
 
 --- rules.h.orig       2006-06-05 10:52:11.000000000 +0000
 +++ rules.h
-@@ -115,7 +115,7 @@ struct _target {
+@@ -115,7 +115,7 @@ struct _target {
  # define      T_FLAG_NOUPDATE 0x20    /* NOUPDATE applied */
  # define      T_FLAG_INTERNAL 0x40    /* internal INCLUDES node */
  
@@ -22,7 +22,7 @@ make.c:490:33: error: array subscript ha
  
  # define      T_BIND_UNBOUND  0       /* a disembodied name */
  # define      T_BIND_MISSING  1       /* couldn't find real file */
-@@ -127,7 +127,7 @@ struct _target {
+@@ -127,7 +127,7 @@ struct _target {
  
        time_t  time;                   /* update time */
        time_t  leaf;                   /* update time of leaf sources */

Added files:

Index: pkgsrc/devel/jam/patches/patch-mkjambase.c
diff -u /dev/null pkgsrc/devel/jam/patches/patch-mkjambase.c:1.1
--- /dev/null   Tue Feb 10 20:17:59 2026
+++ pkgsrc/devel/jam/patches/patch-mkjambase.c  Tue Feb 10 20:17:59 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-mkjambase.c,v 1.1 2026/02/10 20:17:59 jakllsch Exp $
+
+Explicit int return type for main().
+
+--- mkjambase.c.orig   2026-02-10 18:07:54.048821831 +0000
++++ mkjambase.c
+@@ -24,6 +24,7 @@
+ # include <stdio.h>
+ # include <string.h>
+ 
++int
+ main( int argc, char **argv, char **envp )
+ {
+       char buf[ 1024 ];



Home | Main Index | Thread Index | Old Index