git: b2892643a365 - main - math/apron: Update 0.9.12 -> 0.9.12
Yuri Victorovich
yuri at FreeBSD.org
Thu Sep 2 03:50:08 UTC 2021
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b2892643a365beff3e84f73d08df71fe12c85807
commit b2892643a365beff3e84f73d08df71fe12c85807
Author: Yuri Victorovich <yuri at FreeBSD.org>
AuthorDate: 2021-09-02 03:48:19 +0000
Commit: Yuri Victorovich <yuri at FreeBSD.org>
CommitDate: 2021-09-02 03:50:05 +0000
math/apron: Update 0.9.12 -> 0.9.12
---
devel/ikos/Makefile | 2 +-
math/apron/Makefile | 40 +++--------
math/apron/distinfo | 6 +-
math/apron/files/patch-apron_Makefile | 17 -----
math/apron/files/patch-box_Makefile | 14 ----
math/apron/files/patch-newpolka_Makefile | 14 ----
math/apron/files/patch-octagons_Makefile | 15 ----
math/apron/files/patch-ppl_Makefile | 14 ----
math/apron/files/patch-products_Makefile | 14 ----
math/apron/files/patch-taylor1plus_Makefile | 14 ----
math/apron/pkg-plist | 107 ++++++++++++++++++++++++++++
11 files changed, 121 insertions(+), 136 deletions(-)
diff --git a/devel/ikos/Makefile b/devel/ikos/Makefile
index a18a2615ccb8..0703a63eb69d 100644
--- a/devel/ikos/Makefile
+++ b/devel/ikos/Makefile
@@ -1,7 +1,7 @@
PORTNAME= ikos
DISTVERSIONPREFIX= v
DISTVERSION= 3.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MAINTAINER= yuri at FreeBSD.org
diff --git a/math/apron/Makefile b/math/apron/Makefile
index 19e1c06c373e..6bb03728c63c 100644
--- a/math/apron/Makefile
+++ b/math/apron/Makefile
@@ -1,6 +1,6 @@
PORTNAME= apron
-DISTVERSION= 0.9.12
-DISTVERSIONSUFFIX= .r${SVN_REVISION}
+DISTVERSIONPREFIX= v
+DISTVERSION= 0.9.13
CATEGORIES= math
MAINTAINER= yuri at FreeBSD.org
@@ -11,7 +11,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_aarch64= ld: error: ../apron/libapron_debug.so: undefined reference to fpsetround
-FETCH_DEPENDS= svn:devel/subversion
LIB_DEPENDS= libgmp.so:math/gmp \
libmpfr.so:math/mpfr \
libppl.so:devel/ppl
@@ -19,34 +18,15 @@ LIB_DEPENDS= libgmp.so:math/gmp \
USES= gmake localbase:ldflags
USE_LDCONFIG= yes
-SVN_URL= svn://scm.gforge.inria.fr/svnroot/apron/apron/trunk
-SVN_REVISION= 1104
-
-do-fetch:
- @if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}" ]; then \
- ${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
- cd ${DISTDIR}/${DIST_SUBDIR} && \
- svn co -r ${SVN_REVISION} ${SVN_URL} ${PORTNAME}-${DISTVERSIONFULL} && \
- (cd ${PORTNAME}-${DISTVERSIONFULL} && ${RM} -r .svn) && \
- ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \
- ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -print0 | LC_ALL=C ${SORT} -z | \
- ${TAR} czf ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} --format=bsdtar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \
- ${RM} -r ${PORTNAME}-${DISTVERSIONFULL}; \
- fi
-
-pre-build:
- @${CP} ${WRKSRC}/Makefile.config.model ${WRKSRC}/Makefile.config
- @${REINPLACE_CMD} -e ' \
- s|^APRON_PREFIX *=.*$$|APRON_PREFIX=${STAGEDIR}${LOCALBASE}|; \
- s|^HAS_OCAML *=.*$$|HAS_OCAML=|; \
- s|^HAS_OCAMLOPT *=.*$$|HAS_OCAMLOPT=|; \
- s|^OCAMLFIND *=.*$$|OCAMLFIND=|; \
- s|^# HAS_PPL *=.*$$|HAS_PPL=1|' \
- ${WRKSRC}/Makefile.config
+HAS_CONFIGURE= yes
+CONFIGURE_ARGS= -prefix ${STAGEDIR}${PREFIX} -no-ocaml -no-java
+
+USE_GITHUB= yes
+GH_ACCOUNT= antoinemine
post-stage:
- @${RM} ${STAGEDIR}${LOCALBASE}/bin/*test*
- @${RM} ${STAGEDIR}${LOCALBASE}/lib/*.a
- @${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/lib*.so
+ @${STRIP_CMD} \
+ ${STAGEDIR}${LOCALBASE}/bin/* \
+ ${STAGEDIR}${LOCALBASE}/lib/lib*.so
.include <bsd.port.mk>
diff --git a/math/apron/distinfo b/math/apron/distinfo
index 90b71639da27..dc613a3ddb4a 100644
--- a/math/apron/distinfo
+++ b/math/apron/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581280527
-SHA256 (apron-0.9.12.r1104.tar.gz) = 5249ebd06e274ca55c0ecc5cb0ed799f22eac5abd0a3f82388182f0107323aee
-SIZE (apron-0.9.12.r1104.tar.gz) = 984719
+TIMESTAMP = 1630529475
+SHA256 (antoinemine-apron-v0.9.13_GH0.tar.gz) = 4af627e24623ab26948ea980077d015bfb9543374d857fbb42a8b6571e2fb36e
+SIZE (antoinemine-apron-v0.9.13_GH0.tar.gz) = 988019
diff --git a/math/apron/files/patch-apron_Makefile b/math/apron/files/patch-apron_Makefile
deleted file mode 100644
index b8363b6a3fb6..000000000000
--- a/math/apron/files/patch-apron_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- apron/Makefile.orig 2018-12-14 19:17:40 UTC
-+++ apron/Makefile
-@@ -141,12 +141,12 @@ libapron_debug.a: $(O_FILES_DEBUG) ../it
- $(RANLIB) $@
-
- libapron.so: $(O_FILES) ../itv/libitv.a
-- $(CC_APRON_DYLIB) $(CFLAGS) -o $@ $(O_FILES) $(patsubst \
-+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS) -o $@ $(O_FILES) $(patsubst \
- %,../itv/%,$(filter %.o, $(shell $(AR) t \
- ../itv/libitv.a))) $(LDFLAGS)
-
- libapron_debug.so: $(O_FILES_DEBUG) ../itv/libitv_debug.a
-- $(CC_APRON_DYLIB) $(CFLAGS_DEBUG) -o $@ $(O_FILES_DEBUG) \
-+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS_DEBUG) -o $@ $(O_FILES_DEBUG) \
- $(patsubst %,../itv/%,$(filter %.o, $(shell $(AR) t \
- ../itv/libitv_debug.a))) $(LDFLAGS)
-
diff --git a/math/apron/files/patch-box_Makefile b/math/apron/files/patch-box_Makefile
deleted file mode 100644
index 076318ef355e..000000000000
--- a/math/apron/files/patch-box_Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- box/Makefile.orig 2018-12-14 19:21:04 UTC
-+++ box/Makefile
-@@ -147,9 +147,9 @@ libbox%_debug.a: $(subst .c,%_debug.o,$(
- $(AR) rcs $@ $^
- $(RANLIB) $@
- libbox%.so: $(subst .c,%.o,$(CCMODULES:%=%.c))
-- $(CC_APRON_DYLIB) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
-+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
- libbox%_debug.so: $(subst .c,%_debug.o,$(CCMODULES:%=%.c))
-- $(CC_APRON_DYLIB) $(CFLAGS_DEBUG) -o $@ $^ $(LDFLAGS) $(LIBS_DEBUG)
-+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS_DEBUG) -o $@ $^ $(LDFLAGS) $(LIBS_DEBUG)
-
- %MPQ.o: %.c
- $(CC) $(CFLAGS) $(ICFLAGS) -DNUM_MPQ -c -o $@ $<
diff --git a/math/apron/files/patch-newpolka_Makefile b/math/apron/files/patch-newpolka_Makefile
deleted file mode 100644
index f71ef4e9f2b3..000000000000
--- a/math/apron/files/patch-newpolka_Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- newpolka/Makefile.orig 2018-12-14 19:21:39 UTC
-+++ newpolka/Makefile
-@@ -165,9 +165,9 @@ libpolka%_debug.a: $(subst .c,%_debug.o,
- $(AR) rcs $@ $^
- $(RANLIB) $@
- libpolka%.so: $(subst .c,%.o,$(CCMODULES:%=%.c))
-- $(CC_APRON_DYLIB) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
-+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
- libpolka%_debug.so: $(subst .c,%_debug.o,$(CCMODULES:%=%.c))
-- $(CC_APRON_DYLIB) $(CFLAGS_DEBUG) -o $@ $^ $(LDFLAGS) $(LIBS_DEBUG)
-+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS_DEBUG) -o $@ $^ $(LDFLAGS) $(LIBS_DEBUG)
-
- %Rl.o: %.c $(CCINC)
- $(CC) $(CFLAGS) $(ICFLAGS) -DNUM_LONGRAT -c -o $@ $<
diff --git a/math/apron/files/patch-octagons_Makefile b/math/apron/files/patch-octagons_Makefile
deleted file mode 100644
index b6d1bdf66dff..000000000000
--- a/math/apron/files/patch-octagons_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- octagons/Makefile.orig 2018-12-14 19:22:15 UTC
-+++ octagons/Makefile
-@@ -158,10 +158,10 @@ liboct%_debug.a: $(subst .c,%_debug.o,$(
- $(RANLIB) $@
-
- liboct%.so: $(subst .c,%.o,$(CCSOURCES))
-- $(CC_APRON_DYLIB) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
-+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
-
- liboct%_debug.so: $(subst .c,%_debug.o,$(CCSOURCES))
-- $(CC_APRON_DYLIB) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS_DEBUG)
-+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS_DEBUG)
-
- ifneq ($(HAS_SHARED),)
- octtest%: oct_test%.o liboct%_debug.a liboct%_debug.so
diff --git a/math/apron/files/patch-ppl_Makefile b/math/apron/files/patch-ppl_Makefile
deleted file mode 100644
index 25642a68417f..000000000000
--- a/math/apron/files/patch-ppl_Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- ppl/Makefile.orig 2018-12-14 19:22:48 UTC
-+++ ppl/Makefile
-@@ -105,9 +105,9 @@ libap_ppl_debug.a: $(subst .cc,_debug.o,
- $(AR) rcs $@ $^
- $(RANLIB) $@
- libap_ppl.so: $(subst .cc,.o,$(CXXSOURCES))
-- $(CXX_APRON_DYLIB) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
-+ $(CXX_APRON_DYLIB) -Wl,-soname,$@ $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
- libap_ppl_debug.so: $(subst .cc,_debug.o,$(CXXSOURCES))
-- $(CXX_APRON_DYLIB) $(CXXFLAGS_DEBUG) -o $@ $^ $(LDFLAGS) $(LIBS_DEBUG)
-+ $(CXX_APRON_DYLIB) -Wl,-soname,$@ $(CXXFLAGS_DEBUG) -o $@ $^ $(LDFLAGS) $(LIBS_DEBUG)
-
- ifneq ($(HAS_SHARED),)
- ap_ppl_test: libap_ppl_debug.so
diff --git a/math/apron/files/patch-products_Makefile b/math/apron/files/patch-products_Makefile
deleted file mode 100644
index d838193882a9..000000000000
--- a/math/apron/files/patch-products_Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- products/Makefile.orig 1970-01-01 00:00:00 UTC
-+++ products/Makefile
-@@ -120,9 +120,9 @@ libap_pkgrid_debug.a: ap_pkgrid_debug.o
- $(AR) rcs $@ $^
- $(RANLIB) $@
- libap_pkgrid.so: ap_pkgrid.o
-- $(CXX_APRON_DYLIB) $(CXXFLAGS) -o $@ $^ -L../newpolka -lpolkaMPQ $(LDFLAGS) $(LIBS)
-+ $(CXX_APRON_DYLIB) -Wl,-soname,$@ $(CXXFLAGS) -o $@ $^ -L../newpolka -lpolkaMPQ $(LDFLAGS) $(LIBS)
- libap_pkgrid_debug.so: ap_pkgrid_debug.o
-- $(CXX_APRON_DYLIB) $(CXXFLAGS_DEBUG) -o $@ $^ -L../newpolka -lpolkaMPQ_debug $(LDFLAGS) $(LIBS_DEBUG)
-+ $(CXX_APRON_DYLIB) -Wl,-soname,$@ $(CXXFLAGS_DEBUG) -o $@ $^ -L../newpolka -lpolkaMPQ_debug $(LDFLAGS) $(LIBS_DEBUG)
-
- #---------------------------------------
- # C rules
diff --git a/math/apron/files/patch-taylor1plus_Makefile b/math/apron/files/patch-taylor1plus_Makefile
deleted file mode 100644
index 18eb1941578b..000000000000
--- a/math/apron/files/patch-taylor1plus_Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- taylor1plus/Makefile.orig 2018-12-14 19:24:08 UTC
-+++ taylor1plus/Makefile
-@@ -178,9 +178,9 @@ libt1p%_debug.a: $(subst .c,%_debug.o,$(
- ## should work across all archs
- ##
- libt1p%.so: $(subst .c,%.o,$(CCMODULES:%=%.c))
-- $(CC_APRON_DYLIB) $(CFLAGS) -o $@ $^ $(LDFLAGS) -lbox$* -lpolkaMPQ $(LIBS)
-+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS) -o $@ $^ $(LDFLAGS) -lbox$* -lpolkaMPQ $(LIBS)
- libt1p%_debug.so: $(subst .c,%_debug.o,$(CCMODULES:%=%.c))
-- $(CC_APRON_DYLIB) $(CFLAGS_DEBUG) -o $@ $^ $(LDFLAGS) -lbox$*_debug -lpolkaMPQ_debug $(LIBS_DEBUG)
-+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS_DEBUG) -o $@ $^ $(LDFLAGS) -lbox$*_debug -lpolkaMPQ_debug $(LIBS_DEBUG)
-
- %MPQ.o: %.c
- $(CC) $(CFLAGS) $(ICFLAGS) -DNUM_MPQ -c -o $@ $<
diff --git a/math/apron/pkg-plist b/math/apron/pkg-plist
index a399a089f9a4..d158a8fc0111 100644
--- a/math/apron/pkg-plist
+++ b/math/apron/pkg-plist
@@ -1,3 +1,6 @@
+bin/ap_ppl_test
+bin/octtestD
+bin/octtestMPQ
include/ap_abstract0.h
include/ap_abstract1.h
include/ap_coeff.h
@@ -30,6 +33,60 @@ include/ap_tcons1.h
include/ap_texpr0.h
include/ap_texpr1.h
include/ap_var.h
+include/ap_version.h
+include/apronxx/apronxx.hh
+include/apronxx/apxx_abstract0.hh
+include/apronxx/apxx_abstract0_inline.hh
+include/apronxx/apxx_abstract1.hh
+include/apronxx/apxx_abstract1_inline.hh
+include/apronxx/apxx_box.hh
+include/apronxx/apxx_box_inline.hh
+include/apronxx/apxx_coeff.hh
+include/apronxx/apxx_coeff_inline.hh
+include/apronxx/apxx_dimension.hh
+include/apronxx/apxx_dimension_inline.hh
+include/apronxx/apxx_environment.hh
+include/apronxx/apxx_environment_inline.hh
+include/apronxx/apxx_expr0.hh
+include/apronxx/apxx_expr1.hh
+include/apronxx/apxx_generator0.hh
+include/apronxx/apxx_generator0_inline.hh
+include/apronxx/apxx_generator1.hh
+include/apronxx/apxx_generator1_inline.hh
+include/apronxx/apxx_interval.hh
+include/apronxx/apxx_interval_inline.hh
+include/apronxx/apxx_lincons0.hh
+include/apronxx/apxx_lincons0_inline.hh
+include/apronxx/apxx_lincons1.hh
+include/apronxx/apxx_lincons1_inline.hh
+include/apronxx/apxx_linexpr0.hh
+include/apronxx/apxx_linexpr0_inline.hh
+include/apronxx/apxx_linexpr1.hh
+include/apronxx/apxx_linexpr1_inline.hh
+include/apronxx/apxx_manager.hh
+include/apronxx/apxx_manager_inline.hh
+include/apronxx/apxx_oct.hh
+include/apronxx/apxx_oct_inline.hh
+include/apronxx/apxx_polka.hh
+include/apronxx/apxx_polka_inline.hh
+include/apronxx/apxx_ppl.hh
+include/apronxx/apxx_ppl_inline.hh
+include/apronxx/apxx_ppl_product.hh
+include/apronxx/apxx_ppl_product_inline.hh
+include/apronxx/apxx_scalar.hh
+include/apronxx/apxx_scalar_inline.hh
+include/apronxx/apxx_t1p.hh
+include/apronxx/apxx_t1p_inline.hh
+include/apronxx/apxx_tcons0.hh
+include/apronxx/apxx_tcons0_inline.hh
+include/apronxx/apxx_tcons1.hh
+include/apronxx/apxx_tcons1_inline.hh
+include/apronxx/apxx_texpr0.hh
+include/apronxx/apxx_texpr0_inline.hh
+include/apronxx/apxx_texpr1.hh
+include/apronxx/apxx_texpr1_inline.hh
+include/apronxx/apxx_var.hh
+include/apronxx/apxx_var_inline.hh
include/bound.h
include/bound_def.h
include/box.h
@@ -59,31 +116,81 @@ include/oct/oct_internal.h
include/pk.h
include/pkeq.h
include/t1p.h
+lib/libap_pkgrid.a
lib/libap_pkgrid.so
+lib/libap_pkgrid_debug.a
lib/libap_pkgrid_debug.so
+lib/libap_ppl.a
lib/libap_ppl.so
+lib/libap_ppl_debug.a
lib/libap_ppl_debug.so
+lib/libapron.a
lib/libapron.so
+lib/libapron_debug.a
lib/libapron_debug.so
+lib/libapronxx.a
+lib/libapronxx.so
+lib/libapronxx_debug.a
+lib/libapronxx_debug.so
+lib/libboxD.a
lib/libboxD.so
+lib/libboxD_debug.a
lib/libboxD_debug.so
+lib/libboxMPFR.a
lib/libboxMPFR.so
+lib/libboxMPFR_debug.a
lib/libboxMPFR_debug.so
+lib/libboxMPQ.a
lib/libboxMPQ.so
+lib/libboxMPQ_debug.a
lib/libboxMPQ_debug.so
+lib/libitv.a
+lib/libitvD.a
+lib/libitvD_debug.a
+lib/libitvDl.a
+lib/libitvDl_debug.a
+lib/libitvIl.a
+lib/libitvIl_debug.a
+lib/libitvIll.a
+lib/libitvIll_debug.a
+lib/libitvMPFR.a
+lib/libitvMPFR_debug.a
+lib/libitvMPQ.a
+lib/libitvMPQ_debug.a
+lib/libitvMPZ.a
+lib/libitvMPZ_debug.a
+lib/libitvRl.a
+lib/libitvRl_debug.a
+lib/libitvRll.a
+lib/libitvRll_debug.a
+lib/libitv_debug.a
+lib/liboctD.a
lib/liboctD.so
+lib/liboctD_debug.a
lib/liboctD_debug.so
+lib/liboctMPQ.a
lib/liboctMPQ.so
+lib/liboctMPQ_debug.a
lib/liboctMPQ_debug.so
+lib/libpolkaMPQ.a
lib/libpolkaMPQ.so
+lib/libpolkaMPQ_debug.a
lib/libpolkaMPQ_debug.so
+lib/libpolkaRll.a
lib/libpolkaRll.so
+lib/libpolkaRll_debug.a
lib/libpolkaRll_debug.so
+lib/libt1pD.a
lib/libt1pD.so
+lib/libt1pD_debug.a
lib/libt1pD_debug.so
+lib/libt1pMPFR.a
lib/libt1pMPFR.so
+lib/libt1pMPFR_debug.a
lib/libt1pMPFR_debug.so
+lib/libt1pMPQ.a
lib/libt1pMPQ.so
+lib/libt1pMPQ_debug.a
lib/libt1pMPQ_debug.so
lib/oct.idl
lib/polka.idl
More information about the dev-commits-ports-main
mailing list