On Sun, Sep 27, 2020 at 06:52:24PM +0200, Dima Pasechnik wrote:
> if it helps, upstream follows the GNU libtool versioning guidelines, in
> https://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
> - at least it tries.
> I think it missed a version bump before (in the version 0.94k, which OpenBSD
> skipped),
> but not this time.
Pulled your diff from upstream. OKs? Comments?
-m
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/cddlib/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile 16 Jul 2020 04:46:18 -0000 1.1.1.1
+++ Makefile 3 Oct 2020 13:18:17 -0000
@@ -4,10 +4,10 @@ COMMENT = C library for double descripti
GH_ACCOUNT = cddlib
GH_PROJECT = cddlib
-GH_TAGNAME = 0.94j
+GH_TAGNAME = 0.94l
-SHARED_LIBS += cdd 0.0 # 0.0
-SHARED_LIBS += cddgmp 0.0 # 0.0
+SHARED_LIBS += cdd 0.1 # 1.1
+SHARED_LIBS += cddgmp 0.1 # 1.1
CATEGORIES = math
@@ -20,7 +20,6 @@ PERMIT_PACKAGE = Yes
WANTLIB += c gmp
-BUILD_DEPENDS = print/texlive/base
LIB_DEPENDS = devel/gmp
USE_GMAKE = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/cddlib/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 16 Jul 2020 04:46:18 -0000 1.1.1.1
+++ distinfo 3 Oct 2020 13:18:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (cddlib-0.94j.tar.gz) = 9Uu6eFufaBS+XPbXaGHdYQgpl8e0jgJE/DzOpxlYktQ=
-SIZE (cddlib-0.94j.tar.gz) = 496651
+SHA256 (cddlib-0.94l.tar.gz) = 0TyOj7Pm6P/9A0bgo5b833zq4oyjxPe//68Pr4Novb0=
+SIZE (cddlib-0.94l.tar.gz) = 493895
Index: patches/patch-Makefile_am
===================================================================
RCS file: patches/patch-Makefile_am
diff -N patches/patch-Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_am 3 Oct 2020 13:18:17 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Avoid building documentation
+
+--- Makefile.am.orig Sun Sep 20 20:38:23 2020
++++ Makefile.am Sun Sep 20 20:38:36 2020
+@@ -1,5 +1,5 @@
+ # Directories where we can build something.
+-SUBDIRS = doc lib-src src
++SUBDIRS = lib-src src
+
+ # Install the examples into /usr/share/doc/cddlib/examples*
+ nobase_doc_DATA = $(srcdir)/examples/* $(srcdir)/examples-ine/*
$(srcdir)/examples-ine3d/* $(srcdir)/examples-ext/*
Index: patches/patch-lib-src_Makefile_gmp_am
===================================================================
RCS file: patches/patch-lib-src_Makefile_gmp_am
diff -N patches/patch-lib-src_Makefile_gmp_am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib-src_Makefile_gmp_am 3 Oct 2020 13:18:17 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: lib-src/Makefile.gmp.am
+--- lib-src/Makefile.gmp.am.orig
++++ lib-src/Makefile.gmp.am
+@@ -9,7 +9,7 @@ cddtypes_f.h
+
+ libcddgmp_la_SOURCES = $(libcdd_la_SOURCES)
+ libcddgmp_la_CPPFLAGS = -DGMPRATIONAL
+-libcddgmp_la_LDFLAGS = -lgmp
++libcddgmp_la_LDFLAGS = $(AM_LDFLAGS) -lgmp
+ # do not ship generated source files
+ nodist_libcddgmp_la_SOURCES = \
+ cddcore_f.c \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/cddlib/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 16 Jul 2020 04:46:18 -0000 1.1.1.1
+++ pkg/PLIST 3 Oct 2020 13:18:17 -0000
@@ -27,24 +27,23 @@
@bin bin/testlp3_gmp
@bin bin/testshoot
@bin bin/testshoot_gmp
-include/cdd.h
-include/cdd_f.h
-include/cddmp.h
-include/cddmp_f.h
-include/cddtypes.h
-include/cddtypes_f.h
-include/setoper.h
-include/splitmix64.h
+include/cddlib/
+include/cddlib/cdd.h
+include/cddlib/cdd_f.h
+include/cddlib/cddmp.h
+include/cddlib/cddmp_f.h
+include/cddlib/cddtypes.h
+include/cddlib/cddtypes_f.h
+include/cddlib/setoper.h
+include/cddlib/splitmix64.h
@static-lib lib/libcdd.a
lib/libcdd.la
@lib lib/libcdd.so.${LIBcdd_VERSION}
@static-lib lib/libcddgmp.a
lib/libcddgmp.la
@lib lib/libcddgmp.so.${LIBcddgmp_VERSION}
+lib/pkgconfig/cddlib.pc
share/doc/cddlib/
-share/doc/cddlib/cddlibman.dvi
-share/doc/cddlib/cddlibman.pdf
-share/doc/cddlib/cddlibman.ps
share/doc/cddlib/examples/
share/doc/cddlib/examples-ext/
share/doc/cddlib/examples-ext/ccc4.ext
