CVS commit: pkgsrc/math/otter

"Roland Illig" <[email protected]> Sun, 26 Jul 2026 06:14:13 +0000

Newsgroups	gmane.os.netbsd.devel.pkgsrc.cvs
Message-ID	<[email protected]>

Module Name:	pkgsrc
Committed By:	rillig
Date:		Sun Jul 26 06:14:13 UTC 2026

Modified Files:
	pkgsrc/math/otter: Makefile distinfo
Added Files:
	pkgsrc/math/otter/patches: patch-examples-run_All patch-source-Makefile
	    patch-source-dp_util.c patch-source-lisp.c patch-source-proto.h
Removed Files:
	pkgsrc/math/otter/patches: patch-aa patch-ab

Log Message:
math/otter: clean up

Remove ".." from the files to be patched by adjusting WRKSRC.

Add patches needed for C23.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/math/otter/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/otter/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/math/otter/patches/patch-aa
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/math/otter/patches/patch-ab
cvs rdiff -u -r0 -r1.1 pkgsrc/math/otter/patches/patch-examples-run_All \
    pkgsrc/math/otter/patches/patch-source-Makefile \
    pkgsrc/math/otter/patches/patch-source-dp_util.c \
    pkgsrc/math/otter/patches/patch-source-lisp.c \
    pkgsrc/math/otter/patches/patch-source-proto.h

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

(unnamed) (text/x-diff, 5.8 KB)

Modified files:

Index: pkgsrc/math/otter/Makefile
diff -u pkgsrc/math/otter/Makefile:1.17 pkgsrc/math/otter/Makefile:1.18
--- pkgsrc/math/otter/Makefile:1.17	Sun Apr 25 06:36:52 2021
+++ pkgsrc/math/otter/Makefile	Sun Jul 26 06:14:12 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2021/04/25 06:36:52 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2026/07/26 06:14:12 rillig Exp $
 
 DISTNAME=	otter-3.0.6
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	https://www.cs.unm.edu/~mccune/otter/
 
@@ -8,15 +9,13 @@ MAINTAINER=	[email protected]
 HOMEPAGE=	https://www.cs.unm.edu/~mccune/otter/
 COMMENT=	Automated Deduction System
 
+BUILD_DIRS=	source
 BUILD_TARGET=	otter
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/source
 
-INSTALLATION_DIRS=	bin
+AUTO_MKDIRS=	yes
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/otter ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/otter
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/otter
+	${INSTALL_PROGRAM} ${WRKSRC}/source/otter ${DESTDIR}${PREFIX}/bin
 	cd ${WRKDIR}/${PKGNAME_NOREV} && ${INSTALL_DATA} Announce Changelog \
 		Copying README* ${DESTDIR}${PREFIX}/share/doc/otter
 	for d in auto fringe ivy kalman misc program split wos;	do	\

Index: pkgsrc/math/otter/distinfo
diff -u pkgsrc/math/otter/distinfo:1.7 pkgsrc/math/otter/distinfo:1.8
--- pkgsrc/math/otter/distinfo:1.7	Tue Oct 26 10:55:51 2021
+++ pkgsrc/math/otter/distinfo	Sun Jul 26 06:14:12 2026
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:55:51 nia Exp $
+$NetBSD: distinfo,v 1.8 2026/07/26 06:14:12 rillig Exp $
 
 BLAKE2s (otter-3.0.6.tar.gz) = 78d80a883a03abd8b42a2349e2daec5ebf089217e79a00ba41057962a98b3d9c
 SHA512 (otter-3.0.6.tar.gz) = 5f40e769b3d96d01d858c1e04679a2bab65842f2a9fb0f247f5a64b3fd6e10d2f41641844c7d3ab8270d03ab42686bb3a6d57f68b4e8e984824823f1014bcac3
 Size (otter-3.0.6.tar.gz) = 764045 bytes
-SHA1 (patch-aa) = 7e36860368e3cbfcc56b1b1c2e25ff6e0b092e17
-SHA1 (patch-ab) = ea7da3af08c16c8bccb6c7a950debc96c7cf2388
+SHA1 (patch-examples-run_All) = d869f0aac266ebba302efcf7318e1dd8d05ccf7d
+SHA1 (patch-source-Makefile) = d264250cb74c2e00a21f72b97ac31966a89154f8
+SHA1 (patch-source-dp_util.c) = b18c53ed4c24c91b78be0462714b1d1a13eb2b84
+SHA1 (patch-source-lisp.c) = 7a9c8d9c9aa4c9c08c6e1a18350e11ae779e4a1b
+SHA1 (patch-source-proto.h) = 9256d1f06169cdc36a12f57d0f5f6b259f4c6600

Added files:

Index: pkgsrc/math/otter/patches/patch-examples-run_All
diff -u /dev/null pkgsrc/math/otter/patches/patch-examples-run_All:1.1
--- /dev/null	Sun Jul 26 06:14:13 2026
+++ pkgsrc/math/otter/patches/patch-examples-run_All	Sun Jul 26 06:14:13 2026
@@ -0,0 +1,21 @@
+$NetBSD: patch-examples-run_All,v 1.1 2026/07/26 06:14:13 rillig Exp $
+
+Adjust path of executable file, assuming it is in the PATH.
+
+--- examples/Run_all.orig	Tue Oct 10 12:00:04 2000
++++ examples/Run_all
+@@ -1,4 +1,4 @@
+-#
++#!/bin/csh
+ #
+ #  Run a set of otter jobs ($1/*.in) and compare the
+ #  results ($1/*.out) to $1/*.ppro180.
+@@ -18,7 +18,7 @@
+ if ($#argv >= 2) then
+    set OTTER=$2
+ else
+-   set OTTER=../../source/otter
++   set OTTER=otter
+ endif
+ 
+ if ($#argv >= 3) then
Index: pkgsrc/math/otter/patches/patch-source-Makefile
diff -u /dev/null pkgsrc/math/otter/patches/patch-source-Makefile:1.1
--- /dev/null	Sun Jul 26 06:14:13 2026
+++ pkgsrc/math/otter/patches/patch-source-Makefile	Sun Jul 26 06:14:13 2026
@@ -0,0 +1,23 @@
+$NetBSD: patch-source-Makefile,v 1.1 2026/07/26 06:14:13 rillig Exp $
+
+Pass the CFLAGS to the compiler.
+
+--- source/Makefile.orig	Thu Apr 13 15:34:18 2000
++++ source/Makefile
+@@ -80,14 +80,14 @@
+ # Specify the C compiler.  I recommend gcc (GNU C Compiler) if you have it.
+ # In many Linux environments, cc is just a symlink to gcc.
+ 
+-CC = cc
++#CC = cc
+ 
+ #############################################################################
+ #
+ # Specify the compiler flags; include DFLAGS (above) -- Pick one of these
+ #
+ # optimized
+-CFLAGS = -O $(DFLAGS)
++CFLAGS += $(DFLAGS)
+ #
+ # save symbols for debuggers
+ # CFLAGS = -g $(DFLAGS)
Index: pkgsrc/math/otter/patches/patch-source-dp_util.c
diff -u /dev/null pkgsrc/math/otter/patches/patch-source-dp_util.c:1.1
--- /dev/null	Sun Jul 26 06:14:13 2026
+++ pkgsrc/math/otter/patches/patch-source-dp_util.c	Sun Jul 26 06:14:13 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-source-dp_util.c,v 1.1 2026/07/26 06:14:13 rillig Exp $
+
+Add missing types for C23.
+
+--- source/dp_util.c.orig	1999-12-01 21:50:00.000000000 +0000
++++ source/dp_util.c
+@@ -792,7 +792,7 @@ static void instances_recurse(struct clause *c,
+  *
+  *************/
+ 
+-int sym_lessthan(n1, n2)
++int sym_lessthan(int n1, int n2)
+ {
+   int a1 = sn_to_arity(n1);
+   int a2 = sn_to_arity(n2);
Index: pkgsrc/math/otter/patches/patch-source-lisp.c
diff -u /dev/null pkgsrc/math/otter/patches/patch-source-lisp.c:1.1
--- /dev/null	Sun Jul 26 06:14:13 2026
+++ pkgsrc/math/otter/patches/patch-source-lisp.c	Sun Jul 26 06:14:13 2026
@@ -0,0 +1,11 @@
+$NetBSD: patch-source-lisp.c,v 1.1 2026/07/26 06:14:13 rillig Exp $
+
+Add missing header to get proper declarations for exit and free.
+
+--- source/lisp.c.orig	1999-06-23 15:15:16.000000000 +0000
++++ source/lisp.c
+@@ -1,3 +1,4 @@
++#include <stdlib.h>
+ #include "lisp.h"
+ 
+ /*************************************************************************/
Index: pkgsrc/math/otter/patches/patch-source-proto.h
diff -u /dev/null pkgsrc/math/otter/patches/patch-source-proto.h:1.1
--- /dev/null	Sun Jul 26 06:14:13 2026
+++ pkgsrc/math/otter/patches/patch-source-proto.h	Sun Jul 26 06:14:13 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-source-proto.h,v 1.1 2026/07/26 06:14:13 rillig Exp $
+
+Fix typo.
+
+--- source/proto.h.orig	1999-12-01 22:39:40.000000000 +0000
++++ source/proto.h
+@@ -542,7 +542,7 @@ void dp_transform();
+ void dp_p_term();
+ int clause_to_pair();
+ void dp_transform();
+-void igcns_transform();
++void icgns_transform();
+ 
+ /* check.c */
+