build completes but see TODO

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: build completes but see TODO
From: mayuresh <mayuresh%acm.org@localhost>
Date: Mon, 04 Jul 2022 09:03:52 +0000
Module Name:	pkgsrc-wip
Committed By:	mayuresh <mayuresh%acm.org@localhost>
Pushed By:	mayuresh
Date:		Mon Jul 4 14:33:52 2022 +0530
Changeset:	cc344e8053c3973d62b920904342b08b18ab0a43

Modified Files:
	ltsmin/Makefile
	ltsmin/PLIST
	ltsmin/TODO
	ltsmin/distinfo
Added Files:
	ltsmin/patches/patch-src_pins-lib_modules_dve-pins.c
	ltsmin/patches/patch-src_pins-lib_modules_opaal-pins.c
	ltsmin/patches/patch-src_pins2lts-sym_pins2lts-sym.c
	ltsmin/patches/patch-src_util-lib_sort__r.h

Log Message:
build completes but see TODO

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cc344e8053c3973d62b920904342b08b18ab0a43

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

diffstat:
 ltsmin/Makefile                                    |  5 ++-
 ltsmin/PLIST                                       | 52 ++++++++++++++++++++--
 ltsmin/TODO                                        |  8 +++-
 ltsmin/distinfo                                    |  4 ++
 .../patches/patch-src_pins-lib_modules_dve-pins.c  | 12 +++++
 .../patch-src_pins-lib_modules_opaal-pins.c        | 12 +++++
 .../patches/patch-src_pins2lts-sym_pins2lts-sym.c  | 14 ++++++
 ltsmin/patches/patch-src_util-lib_sort__r.h        | 13 ++++++
 8 files changed, 114 insertions(+), 6 deletions(-)

diffs:
diff --git a/ltsmin/Makefile b/ltsmin/Makefile
index 77d2eece26..9f7943e5f5 100644
--- a/ltsmin/Makefile
+++ b/ltsmin/Makefile
@@ -15,11 +15,14 @@ WRKSRC=	${WRKDIR}/ltsmin-3.0.2
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 DEPENDS+=	flex>=2.6.4:../../devel/flex
+USE_TOOLS+=	gmake
 CONFIG_SHELL=	bash
 BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
 CONFIGURE_ARGS+=	PKG_CONFIG=${PREFIX}/bin/pkg-config
 CONFIGURE_ARGS+=	CFLAGS=-D__NetBSD__
-
+CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/${PKGBASE}
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/share/man
+CONFIGURE_ARGS+=	--htmldir=${PREFIX}/share/doc/html/${PKGBASE}
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
diff --git a/ltsmin/PLIST b/ltsmin/PLIST
index 92ba51a2d7..bf491197b8 100644
--- a/ltsmin/PLIST
+++ b/ltsmin/PLIST
@@ -1,4 +1,50 @@
 @comment $NetBSD$
-@comment TODO: to fill this file with the file listing:
-@comment TODO: 1. run "/usr/bin/make package"
-@comment TODO: 2. run "/usr/bin/make print-PLIST"
+bin/dve2lts-dist
+bin/dve2lts-mc
+bin/dve2lts-seq
+bin/dve2lts-sym
+bin/dve2torx
+bin/etf2lts-dist
+bin/etf2lts-mc
+bin/etf2lts-seq
+bin/etf2lts-sym
+bin/etf2torx
+bin/gcf
+bin/ltl2ba
+bin/ltsmin-compare
+bin/ltsmin-convert
+bin/ltsmin-printtrace
+bin/ltsmin-reduce
+bin/opaal2lts-mc
+bin/pins2lts-dist
+bin/pins2lts-mc
+bin/pins2lts-seq
+bin/pins2lts-sym
+bin/pins2torx
+bin/pnml2lts-dist
+bin/pnml2lts-mc
+bin/pnml2lts-seq
+bin/pnml2lts-sym
+bin/prom2lts-dist
+bin/prom2lts-mc
+bin/prom2lts-seq
+bin/prom2lts-sym
+bin/prom2torx
+bin/spgsolver
+bin/spins
+include/ltsmin/bitvector.h
+include/ltsmin/chunk_support.h
+include/ltsmin/chunk_table_factory.h
+include/ltsmin/dlopen-api.h
+include/ltsmin/dm.h
+include/ltsmin/feedback.h
+include/ltsmin/lts-type.h
+include/ltsmin/ltsmin-standard.h
+include/ltsmin/pins-util.h
+include/ltsmin/pins.h
+include/ltsmin/string-map.h
+include/ltsmin/tables.h
+share/doc/ltsmin/AUTHORS
+share/doc/ltsmin/CODING-STANDARDS
+share/doc/ltsmin/COPYING
+share/doc/ltsmin/README.md
diff --git a/ltsmin/TODO b/ltsmin/TODO
index 0846512f33..f000ea5b4c 100644
--- a/ltsmin/TODO
+++ b/ltsmin/TODO
@@ -1,6 +1,10 @@
-undefined ref to WIFEXITED, WEXITSTATUS
+Make __NetBSD__ and patches specific to NetBSD
 
-Despite buildlink to buddy, config gives error for libbdd
+Despite buildlink to buddy, configure gives error for libbdd. buddy doesn't
+have .pc file.
+
+Defining --docdir as configure argument installs minimal documentation. But
+defining htmldir or mandir does not get the man pages and htmls respectively.
 
 Try to meet deps:
 
diff --git a/ltsmin/distinfo b/ltsmin/distinfo
index fd8380db7e..5db0dd9bcf 100644
--- a/ltsmin/distinfo
+++ b/ltsmin/distinfo
@@ -7,3 +7,7 @@ Size (ltsmin-v3.0.2-source.tgz) = 3273078 bytes
 SHA1 (patch-Makefile.in) = a20bc2c99a8baa2d5c3580990d20b41944454520
 SHA1 (patch-configure) = 8e15569fd3d58708b8b489e63df33d0b4878a41a
 SHA1 (patch-src_hre_hre__pthread.c) = db0b7a74f43dcd01ca3ac6bbaefca4a2b96e0053
+SHA1 (patch-src_pins-lib_modules_dve-pins.c) = 2ed2fa4485cef28505c8d941a70d920c9a85f1ab
+SHA1 (patch-src_pins-lib_modules_opaal-pins.c) = a6de6ae4170796398bbd775e5af2a16a439e3224
+SHA1 (patch-src_pins2lts-sym_pins2lts-sym.c) = 15024896eaa379f2ecacbe2c0caaa76252165033
+SHA1 (patch-src_util-lib_sort__r.h) = 87d951d7877f855cb09d45d6c5c91d7986bbabb2
diff --git a/ltsmin/patches/patch-src_pins-lib_modules_dve-pins.c b/ltsmin/patches/patch-src_pins-lib_modules_dve-pins.c
new file mode 100644
index 0000000000..635887a935
--- /dev/null
+++ b/ltsmin/patches/patch-src_pins-lib_modules_dve-pins.c
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/pins-lib/modules/dve-pins.c.orig	2018-07-03 19:28:10.000000000 +0000
++++ src/pins-lib/modules/dve-pins.c
+@@ -6,6 +6,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/wait.h>
+ #include <unistd.h>
+ 
+ #include <dm/dm.h>
diff --git a/ltsmin/patches/patch-src_pins-lib_modules_opaal-pins.c b/ltsmin/patches/patch-src_pins-lib_modules_opaal-pins.c
new file mode 100644
index 0000000000..93ca25e39b
--- /dev/null
+++ b/ltsmin/patches/patch-src_pins-lib_modules_opaal-pins.c
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/pins-lib/modules/opaal-pins.c.orig	2018-07-03 19:28:10.000000000 +0000
++++ src/pins-lib/modules/opaal-pins.c
+@@ -6,6 +6,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/wait.h>
+ #include <unistd.h>
+ 
+ #include <dm/dm.h>
diff --git a/ltsmin/patches/patch-src_pins2lts-sym_pins2lts-sym.c b/ltsmin/patches/patch-src_pins2lts-sym_pins2lts-sym.c
new file mode 100644
index 0000000000..b9a220b6d9
--- /dev/null
+++ b/ltsmin/patches/patch-src_pins2lts-sym_pins2lts-sym.c
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/pins2lts-sym/pins2lts-sym.c.orig	2018-07-03 19:28:10.000000000 +0000
++++ src/pins2lts-sym/pins2lts-sym.c
+@@ -1,7 +1,9 @@
+ #include <hre/config.h>
+ 
+ #include <float.h>
++#ifdef __APPLE__
+ #include <alloca.h>
++#endif
+ #include <assert.h>
+ #include <dirent.h>
+ #include <limits.h>
diff --git a/ltsmin/patches/patch-src_util-lib_sort__r.h b/ltsmin/patches/patch-src_util-lib_sort__r.h
new file mode 100644
index 0000000000..8dcf80777d
--- /dev/null
+++ b/ltsmin/patches/patch-src_util-lib_sort__r.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/util-lib/sort_r.h.orig	2018-07-03 19:28:10.000000000 +0000
++++ src/util-lib/sort_r.h
+@@ -182,7 +182,7 @@ static _SORT_R_INLINE void sort_r_simple
+   {
+     #if defined _SORT_R_LINUX
+ 
+-      #if defined __GLIBC__ && ((__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 8))
++      #if defined __GLIBC__ && ((__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 8)) || defined __NetBSD__
+ 
+         /* no qsort_r in glibc before 2.8, need to use nested qsort */
+         sort_r_simple(base, nel, width, compar, arg);
Prev by Date: Remove etsh: import into main
Next by Date: Mafile patch for == was redundant. Removed.
Previous by Thread: Remove etsh: import into main
Next by Thread: Mafile patch for == was redundant. Removed.
Indexes:
Home | Main Index | Thread Index | Old Index