Date: Tue, 24 Feb 2026 01:19:21 +0000 From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2f3203c00460 - main - science/simlib: update to 3.09 Message-ID: <699cfc99.18865.e85160e@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f3203c00460beff50ab84f35d465bdbb13657d4 commit 2f3203c00460beff50ab84f35d465bdbb13657d4 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2026-02-20 12:57:42 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2026-02-24 00:44:47 +0000 science/simlib: update to 3.09 - project now portable - ship docs - take maintainership --- science/simlib/Makefile | 42 ++++-------- science/simlib/distinfo | 6 +- science/simlib/files/patch-Makefile | 78 ++++++++++++++++++++++ science/simlib/files/patch-examples_Makefile | 45 +++++++++++++ science/simlib/files/patch-src_Makefile | 56 ++++++++++++++++ science/simlib/files/patch-src_Makefile.Linux | 11 +++ science/simlib/files/patch-src_Makefile.generic | 32 +++++++++ .../simlib/files/patch-src__Makefile.FreeBSD-i386 | 17 ----- science/simlib/files/patch-src__Makefile.generic | 22 ------ science/simlib/files/patch-tests_Makefile | 41 ++++++++++++ 10 files changed, 279 insertions(+), 71 deletions(-) diff --git a/science/simlib/Makefile b/science/simlib/Makefile index 0f4fd449ec11..46d4bbca81ed 100644 --- a/science/simlib/Makefile +++ b/science/simlib/Makefile @@ -1,47 +1,31 @@ PORTNAME= simlib -DISTVERSION= 3.06 -DISTVERSIONSUFFIX= -20181003 +DISTVERSION= 3.09 +DISTVERSIONSUFFIX= -20221108 CATEGORIES= science MASTER_SITES= http://www.fit.vutbr.cz/~peringer/SIMLIB/source/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= fuz@FreeBSD.org COMMENT= SIMulation LIBrary for C++ programming language WWW= https://www.fit.vutbr.cz/~peringer/SIMLIB/index.html.en LICENSE= LGPL20 -BROKEN_riscv64= fails to compile: process.cc:53:3: module process.cc is not ported to this processor architecture -NOT_FOR_ARCHS= aarch64 armv6 armv7 mips mips64 powerpc powerpc64 -NOT_FOR_ARCHS_REASON= contains not working ${ARCH}-dependent assembly code - USES= gmake -USE_CXXSTD= c++14 USE_LDCONFIG= yes -CXXFLAGS+= -fPIC +ALL_TARGET= all +TEST_TARGET= test +CXXFLAGS+= -Wno-inconsistent-missing-override WRKSRC= ${WRKDIR}/${PORTNAME} +PORTDOCS= doxygen + +OPTIONS_DEFINE= DOCS +DOCS_BUILD_DEPENDS= doxygen:devel/doxygen +DOCS_ALL_TARGET= doc -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD -# nm crashes during the build: -# Assertion failed: (ddata->output.size > 0), function cpp_demangle_read_sname, file /usr/src/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c, line 2137. -USE_BINUTILS= yes -BINARY_ALIAS= nm=${NM} -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|make|gmake|g' ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ - ${WRKSRC}/src/Makefile.generic - @${REINPLACE_CMD} -e 's#g++#${CXX}#g' \ - ${WRKSRC}/src/Makefile.FreeBSD-i386 \ - ${WRKSRC}/examples/Makefile.FreeBSD-i386 \ - ${WRKSRC}/tests/Makefile.FreeBSD-i386 - @${MV} ${WRKSRC}/src/Makefile.FreeBSD-i386 ${WRKSRC}/src/Makefile - @${MV} ${WRKSRC}/examples/Makefile.FreeBSD-i386 ${WRKSRC}/examples/Makefile - @${MV} ${WRKSRC}/tests/Makefile.FreeBSD-i386 ${WRKSRC}/tests/Makefile +do-install-DOCS-on: + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} doxygen ${STAGEDIR}${DOCSDIR} post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsimlib.so diff --git a/science/simlib/distinfo b/science/simlib/distinfo index 79d9370071f1..098fe428f31c 100644 --- a/science/simlib/distinfo +++ b/science/simlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539927064 -SHA256 (simlib-3.06-20181003.tar.gz) = 3624d870bca8303f14b3824dbe59db426bbc0e687586038710ef0edfcdc85012 -SIZE (simlib-3.06-20181003.tar.gz) = 1144115 +TIMESTAMP = 1771590580 +SHA256 (simlib-3.09-20221108.tar.gz) = 7836f182da086320ce6144aa148bffd6027961322271e18f3113d24e9089f6f0 +SIZE (simlib-3.09-20221108.tar.gz) = 1137740 diff --git a/science/simlib/files/patch-Makefile b/science/simlib/files/patch-Makefile new file mode 100644 index 000000000000..9557c250fac1 --- /dev/null +++ b/science/simlib/files/patch-Makefile @@ -0,0 +1,78 @@ +--- Makefile.orig 2026-02-20 12:35:59 UTC ++++ Makefile +@@ -6,40 +6,40 @@ all: + uninstall clean doc clean-doc clean-all pack dist + + all: +- make -C src +- make -C examples +- make -C tests ++ $(MAKE) -C src ++ $(MAKE) -C examples ++ $(MAKE) -C tests + + rebuild: clean-all +- make all ++ $(MAKE) all + + 32: clean-all +- make -C src 32 +- make -C examples 32 +- make -C tests 32 ++ $(MAKE) -C src 32 ++ $(MAKE) -C examples 32 ++ $(MAKE) -C tests 32 + 64: clean-all +- make -C src 64 +- make -C examples 64 +- make -C tests 64 ++ $(MAKE) -C src 64 ++ $(MAKE) -C examples 64 ++ $(MAKE) -C tests 64 + + test: clean-all +- make -C src test ++ $(MAKE) -C src test + test32: clean-all +- make -C src test32 ++ $(MAKE) -C src test32 + + ###untested + #fuzzy: +-# make -C src fuzzy ++# $(MAKE) -C src fuzzy + + install: +- make -C src install ++ $(MAKE) -C src install + uninstall: +- make -C src uninstall ++ $(MAKE) -C src uninstall + # cleaning etc. + clean: +- make -C src clean +- make -C examples clean +- make -C tests clean ++ $(MAKE) -C src clean ++ $(MAKE) -C examples clean ++ $(MAKE) -C tests clean + + # doxygen-generated documentation + doc: +@@ -47,12 +47,12 @@ clean-doc: + + clean-doc: + rm -rf ./doc/doxygen +- make -C ./doc/latex clean ++ $(MAKE) -C ./doc/latex clean + + clean-all: clean clean-doc +- make -C examples clean-all +- make -C ./doc/latex clean-all +- make -C tests clean-all ++ $(MAKE) -C examples clean-all ++ $(MAKE) -C ./doc/latex clean-all ++ $(MAKE) -C tests clean-all + + # create archive with .git + pack: clean-all diff --git a/science/simlib/files/patch-examples_Makefile b/science/simlib/files/patch-examples_Makefile new file mode 100644 index 000000000000..aae5b70e8b4b --- /dev/null +++ b/science/simlib/files/patch-examples_Makefile @@ -0,0 +1,45 @@ +--- examples/Makefile.orig 2026-02-20 12:34:53 UTC ++++ examples/Makefile +@@ -4,7 +4,7 @@ + # + + # C++ compiler flags +-CXXFLAGS = -Wall ++CXXFLAGS += -Wall + CXXFLAGS += -std=c++11 + CXXFLAGS += -O2 # add optimization level + CXXFLAGS += -g # add debug info +@@ -17,26 +17,26 @@ all: + + ################################################################# + all: +- CXXFLAGS="$(CXXFLAGS)" gmake -j3 -f $(MAKEFILE) ++ CXXFLAGS="$(CXXFLAGS)" $(MAKE) -f $(MAKEFILE) + + # special versions for 32/64bit version, do "make clean" first + 32: +- CXXFLAGS="$(CXXFLAGS) -m32" gmake -j3 -f $(MAKEFILE) ++ CXXFLAGS="$(CXXFLAGS) -m32" $(MAKE) -f $(MAKEFILE) + + 64: +- CXXFLAGS="$(CXXFLAGS) -m64" gmake -j3 -f $(MAKEFILE) ++ CXXFLAGS="$(CXXFLAGS) -m64" $(MAKE) -f $(MAKEFILE) + + ################################################################# + clean: +- gmake -f $(MAKEFILE) clean-all ++ $(MAKE) -f $(MAKEFILE) clean-all + + plot: all +- gmake -f $(MAKEFILE) plot ++ $(MAKE) -f $(MAKEFILE) plot + + run: all +- gmake -f $(MAKEFILE) run ++ $(MAKE) -f $(MAKEFILE) run + + pack: clean +- gmake -f $(MAKEFILE) pack ++ $(MAKE) -f $(MAKEFILE) pack + + ################################################################# diff --git a/science/simlib/files/patch-src_Makefile b/science/simlib/files/patch-src_Makefile new file mode 100644 index 000000000000..cacc139896e4 --- /dev/null +++ b/science/simlib/files/patch-src_Makefile @@ -0,0 +1,56 @@ +--- src/Makefile.orig 2026-02-20 12:34:00 UTC ++++ src/Makefile +@@ -9,32 +9,32 @@ all: + + ################################################################# + all: +- gmake -j3 -f $(MAKEFILE) ++ $(MAKE) -f $(MAKEFILE) + + # special versions for 32/64 bit platforms + # maybe you need gmake clean first... + 32: +- gmake -f $(MAKEFILE) EXTRA_CXXFLAGS="-m32" ++ $(MAKE) -f $(MAKEFILE) EXTRA_CXXFLAGS="-m32" + 64: +- gmake -f $(MAKEFILE) EXTRA_CXXFLAGS="-m64" ++ $(MAKE) -f $(MAKEFILE) EXTRA_CXXFLAGS="-m64" + + #TODO: change + fuzzy: +- gmake -f $(MAKEFILE) MODULES="fuzzy" fuzzymodule all ++ $(MAKE) -f $(MAKEFILE) MODULES="fuzzy" fuzzymodule all + + ################################################################# + dep: +- gmake -f $(MAKEFILE) dep ++ $(MAKE) -f $(MAKEFILE) dep + ################################################################# + test: +- gmake -f $(MAKEFILE) test ++ $(MAKE) -f $(MAKEFILE) test + test32: +- gmake -f $(MAKEFILE) EXTRA_CXXFLAGS="-m32" test ++ $(MAKE) -f $(MAKEFILE) EXTRA_CXXFLAGS="-m32" test + ################################################################# + install: +- gmake -f $(MAKEFILE) install ++ $(MAKE) -f $(MAKEFILE) install + uninstall: +- gmake -f $(MAKEFILE) uninstall ++ $(MAKE) -f $(MAKEFILE) uninstall + + ############################################################################# + cppcheck: +@@ -42,8 +42,8 @@ clean: + + ################################################################# + clean: +- gmake -f $(MAKEFILE) clean +- gmake -f $(MAKEFILE) MODULES="fuzzy" clean ++ $(MAKE) -f $(MAKEFILE) clean ++ $(MAKE) -f $(MAKEFILE) MODULES="fuzzy" clean + pack: +- gmake -f $(MAKEFILE) pack ++ $(MAKE) -f $(MAKEFILE) pack + ################################################################# diff --git a/science/simlib/files/patch-src_Makefile.Linux b/science/simlib/files/patch-src_Makefile.Linux new file mode 100644 index 000000000000..1edd5bff1bd4 --- /dev/null +++ b/science/simlib/files/patch-src_Makefile.Linux @@ -0,0 +1,11 @@ +--- src/Makefile.Linux.orig 2026-02-20 12:30:56 UTC ++++ src/Makefile.Linux +@@ -8,7 +8,7 @@ CXX?=g++ + CXX?=g++ + + # C++ compiler flags +-CXXFLAGS = -Wall -fPIC ### basic flags (always needed) ++CXXFLAGS += -Wall -fPIC ### basic flags (always needed) + CXXFLAGS += $(EXTRA_CXXFLAGS) ### external setting + CXXFLAGS += -std=c++11 + CXXFLAGS += -O2 diff --git a/science/simlib/files/patch-src_Makefile.generic b/science/simlib/files/patch-src_Makefile.generic new file mode 100644 index 000000000000..aaa0ab8ef082 --- /dev/null +++ b/science/simlib/files/patch-src_Makefile.generic @@ -0,0 +1,32 @@ +--- src/Makefile.generic.orig 2026-02-20 12:38:35 UTC ++++ src/Makefile.generic +@@ -223,15 +223,15 @@ install: all + + #TODO: add version and symlink, do not run ldconfig for local install + install: all +- install -d $(PREFIX)/include $(PREFIX)/lib +- install -m0644 $(SIMLIB_HEADERS) $(PREFIX)/include +- install -m0644 $(LIBNAME).a $(PREFIX)/lib/lib$(LIBNAME).a +- install -m0644 $(LIBNAME).so $(PREFIX)/lib/lib$(LIBNAME).so ++ install -d $(PREFIX)/include $(DESTDIR)/$(PREFIX)/lib ++ install -m0644 $(SIMLIB_HEADERS) $(DESTDIR)/$(PREFIX)/include ++ install -m0644 $(LIBNAME).a $(DESTDIR)/$(PREFIX)/lib/lib$(LIBNAME).a ++ install -m0644 $(LIBNAME).so $(DESTDIR)/$(PREFIX)/lib/lib$(LIBNAME).so + @if ! grep '^'$(PREFIX)/lib'$$' /etc/ld.so.conf >/dev/null; then \ + echo "Please add $(PREFIX)/lib to /etc/ld.so.conf "; \ + fi + @echo "This should be run as root:" +- ldconfig # update dynamic linker cache ++ #ldconfig # update dynamic linker cache + + ############################################################################# + # Uninstall library +@@ -249,7 +249,7 @@ test: all + test: all + $(CXX) $(CXXFLAGS) -o $(TESTFILE) $(TESTFILE).cc -lm simlib.a + ./$(TESTFILE) >$(TESTFILE).output +- sed -i 's/0x[0-9a-f]*/PTR/g' $(TESTFILE).output ++ sed -i '' 's/0x[0-9a-f]*/PTR/g' $(TESTFILE).output + @echo `date` "by" `$(CXX) --version|head -n 1` >>TEST-BY.txt + @echo + -diff -bs $(TESTFILE).output-- $(TESTFILE).output diff --git a/science/simlib/files/patch-src__Makefile.FreeBSD-i386 b/science/simlib/files/patch-src__Makefile.FreeBSD-i386 deleted file mode 100644 index 0117ac7c4690..000000000000 --- a/science/simlib/files/patch-src__Makefile.FreeBSD-i386 +++ /dev/null @@ -1,17 +0,0 @@ ---- src/Makefile.FreeBSD-i386.orig 2008-04-06 14:24:46.000000000 +0800 -+++ src/Makefile.FreeBSD-i386 2008-04-06 14:25:19.000000000 +0800 -@@ -4,11 +4,11 @@ - # - - # name of the compiler for C and C++ language --CC=gcc --CXX=g++ -+CC?=gcc -+CXX?=g++ - - # C++ compiler flags --CXXFLAGS = -Wall -std=c++98 -fPIC -+CXXFLAGS ?= -Wall -std=c++98 -fPIC - CXXFLAGS += -O2 # with optimization - CXXFLAGS += -g # with debug info - #CXXFLAGS += -pg # with profile support diff --git a/science/simlib/files/patch-src__Makefile.generic b/science/simlib/files/patch-src__Makefile.generic deleted file mode 100644 index c2e43c8e68f9..000000000000 --- a/science/simlib/files/patch-src__Makefile.generic +++ /dev/null @@ -1,22 +0,0 @@ ---- src/Makefile.generic.orig 2014-06-10 23:04:24.274911932 +0800 -+++ src/Makefile.generic 2014-06-10 23:05:00.866911669 +0800 -@@ -224,15 +224,10 @@ clean: - - #TODO: add version and symlink - install: all -- install -d $(PREFIX)/include $(PREFIX)/lib -- install -m0644 $(SIMLIB_HEADERS) $(PREFIX)/include -- install -m0644 $(LIBNAME).a $(PREFIX)/lib/lib$(LIBNAME).a -- install -m0644 $(LIBNAME).so $(PREFIX)/lib/lib$(LIBNAME).so -- @if ! grep '^'$(PREFIX)/lib'$$' /etc/ld.so.conf >/dev/null; then \ -- echo "Add $(PREFIX)/lib to /etc/ld.so.conf "; \ -- fi -- @echo "This should be run as root" -- ldconfig # update dynamic linker cache -+ install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(PREFIX)/lib -+ install -m0644 $(SIMLIB_HEADERS) $(DESTDIR)$(PREFIX)/include -+ install -m0644 $(LIBNAME).a $(DESTDIR)$(PREFIX)/lib/lib$(LIBNAME).a -+ install -m0644 $(LIBNAME).so $(DESTDIR)$(PREFIX)/lib/lib$(LIBNAME).so - - ############################################################################# - # Uninstall library diff --git a/science/simlib/files/patch-tests_Makefile b/science/simlib/files/patch-tests_Makefile new file mode 100644 index 000000000000..91169b4ec588 --- /dev/null +++ b/science/simlib/files/patch-tests_Makefile @@ -0,0 +1,41 @@ +--- tests/Makefile.orig 2026-02-20 12:35:22 UTC ++++ tests/Makefile +@@ -4,7 +4,7 @@ + # + + # C++ compiler flags +-CXXFLAGS = -Wall ++CXXFLAGS += -Wall + CXXFLAGS += -std=c++11 + CXXFLAGS += -O2 # add optimization level + CXXFLAGS += -g # add debug info +@@ -17,23 +17,23 @@ all: + + ################################################################# + all: +- CXXFLAGS="$(CXXFLAGS)" gmake -j3 -f $(MAKEFILE) ++ CXXFLAGS="$(CXXFLAGS)" $(MAKE) -f $(MAKEFILE) + + # special versions for 32/64bit version, do "make clean" first + 32: +- CXXFLAGS="$(CXXFLAGS) -m32" gmake -j3 -f $(MAKEFILE) ++ CXXFLAGS="$(CXXFLAGS) -m32" $(MAKE) -f $(MAKEFILE) + + 64: +- CXXFLAGS="$(CXXFLAGS) -m64" gmake -j3 -f $(MAKEFILE) ++ CXXFLAGS="$(CXXFLAGS) -m64" $(MAKE) -f $(MAKEFILE) + + ################################################################# + clean: +- gmake -f $(MAKEFILE) clean-all ++ $(MAKE) -f $(MAKEFILE) clean-all + + run: all +- gmake -f $(MAKEFILE) run ++ $(MAKE) -f $(MAKEFILE) run + + pack: clean +- gmake -f $(MAKEFILE) pack ++ $(MAKE) -f $(MAKEFILE) pack + + #################################################################home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?699cfc99.18865.e85160e>