diff --git a/math/fxt/Makefile b/math/fxt/Makefile index e11e9d6b2eb3..c41765821dc9 100644 --- a/math/fxt/Makefile +++ b/math/fxt/Makefile @@ -1,25 +1,26 @@ PORTNAME= fxt -PORTVERSION= 2023.06.27 +PORTVERSION= 2023.10.26 CATEGORIES= math MASTER_SITES= https://www.jjj.de/fxt/ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Llibrary of low-level algorithms WWW= https://www.jjj.de/fxt/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING.txt USES= compiler:c++11-lang gmake MAKE_ENV= FXT_INSTALL="${INSTALL_DATA}" MAKEFILE= makefile +USE_CXXSTD= c++11 WRKSRC= ${WRKDIR}/fxt OPTIONS_DEFINE= EXAMPLES post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/math/fxt/distinfo b/math/fxt/distinfo index f1186027ba85..82e1d0586c81 100644 --- a/math/fxt/distinfo +++ b/math/fxt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1688166066 -SHA256 (fxt-2023.06.27.tar.gz) = 2a63ea4d4d01d64177b11edde699ce9348cf8ad923f2c4a0111dd9b1395d4df7 -SIZE (fxt-2023.06.27.tar.gz) = 1854788 +TIMESTAMP = 1698340927 +SHA256 (fxt-2023.10.26.tar.gz) = 121a54fdab9fd68ef75de811ba20740431979532fc551c2dd72e3f45f60e6bfa +SIZE (fxt-2023.10.26.tar.gz) = 1854920 diff --git a/math/fxt/files/patch-makefile b/math/fxt/files/patch-makefile index ed412ac3f861..54801d4c0521 100644 --- a/math/fxt/files/patch-makefile +++ b/math/fxt/files/patch-makefile @@ -1,79 +1,55 @@ ---- makefile.orig 2021-04-06 13:42:27 UTC +--- makefile.orig 2023-10-20 14:17:07 UTC +++ makefile @@ -8,22 +8,22 @@ PROJ=fxt include flags.mk #### choose the FLAG combo here: -FXT_CXXFLAGS= +#FXT_CXXFLAGS= #FXT_CXXFLAGS += -std=c++11 -FXT_CXXFLAGS += -std=c++17 -FXT_CXXFLAGS += -pipe +#FXT_CXXFLAGS += -std=c++17 +#FXT_CXXFLAGS += -pipe #FXT_CXXFLAGS += -fno-exceptions -FXT_CXXFLAGS += $(OFLAGS) # uncomment for OPTIMIZATION +#FXT_CXXFLAGS += $(OFLAGS) # uncomment for OPTIMIZATION #FXT_CXXFLAGS += -O3 # test -O3 - #FXT_CXXFLAGS += $(GFLAGS) # uncomment for DEBUGGING +-FXT_CXXFLAGS += $(GFLAGS) # uncomment for DEBUGGING ++#FXT_CXXFLAGS += $(GFLAGS) # uncomment for DEBUGGING #FXT_CXXFLAGS += $(PFLAGS) # uncomment for PROFILING # -FXT_CXXFLAGS += $(WFLAGS) # uncomment for WARNINGS +#FXT_CXXFLAGS += $(WFLAGS) # uncomment for WARNINGS #FXT_CXXFLAGS += -Werror # make all warnings ERRORS #FXT_CXXFLAGS += -fmax-errors=1 # clang chokes on this one #FXT_CXXFLAGS += -D__NO_MATH_INLINES -FXT_CXXFLAGS += $(FXT_EXTRA_FLAGS) +#FXT_CXXFLAGS += $(FXT_EXTRA_FLAGS) #FXT_CXXFLAGS += $(CLANG_FLAGS) ## for clang++ -@@ -200,27 +200,27 @@ install: lib +@@ -199,15 +199,15 @@ INCDIR=$(PREFIX)/include/fxt + .PHONY: install ## install to $(PREFIX)/lib/ and $(PREFIX)/include/fxt/ + install: lib : '[$@]' - @echo 'PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) INCDIR=$(INCDIR)' +- @echo 'PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) INCDIR=$(INCDIR)' ++ @echo 'PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) INCDIR=$(DESTDIR)$(INCDIR)' @: - @test -d $(INCDIR) || mkdir $(INCDIR) - @$(FXT_INSTALL) $(FXTIDIR)/*.h $(INCDIR)/ - @cd src && for f in $(SHFXTSRCDIRS); do mkdir -p $(INCDIR)/$$f; done - @cd src && for f in $(SHFXTSRCDIRS); do $(FXT_INSTALL) $$f/*.h $(INCDIR)/$$f; done + @test -d $(DESTDIR)$(INCDIR) || mkdir $(DESTDIR)$(INCDIR) + @$(FXT_INSTALL) $(FXTIDIR)/*.h $(DESTDIR)$(INCDIR)/ + @cd src && for f in $(SHFXTSRCDIRS); do mkdir -p $(DESTDIR)$(INCDIR)/$$f; done + @cd src && for f in $(SHFXTSRCDIRS); do $(FXT_INSTALL) $$f/*.h $(DESTDIR)$(INCDIR)/$$f; done @: - @test -d $(LIBDIR) || mkdir $(LIBDIR) - @$(FXT_INSTALL) $(FXTLIB) $(LIBDIR)/ + @test -d $(DESTDIR)$(LIBDIR) || mkdir $(DESTDIR)$(LIBDIR) + @$(FXT_INSTALL) $(FXTLIB) $(DESTDIR)$(LIBDIR)/ : '[$@ OK]' .PHONY: chk-install ##x print whether installed header files are up to date - chk-install: - @(cd src && find . -maxdepth 2 -name \*.h | sort) > tmp-hdr1 -- @(cd $(INCDIR)/ && find . -name \*.h | sort) > tmp-hdr2 -+ @(cd $(DESTDIR)$(INCDIR)/ && find . -name \*.h | sort) > tmp-hdr2 - @-diff tmp-hdr1 tmp-hdr2 - @rm tmp-hdr1 tmp-hdr2 - --.PHONY: uninstall ## uninstall headers and lib, but leave directory $(INCDIR) -+.PHONY: uninstall ## uninstall headers and lib, but leave directory $(DESTDIR)$(INCDIR) - uninstall: -- : '[$@]' ## note: we do not remove $(INCDIR) -- rm -rf $(INCDIR)/* -- rm -f $(LIBDIR)/$(FXTLIB) -+ : '[$@]' ## note: we do not remove $(DESTDIR)$(INCDIR) -+ rm -rf $(DESTDIR)$(INCDIR)/* -+ rm -f $(DESTDIR)$(LIBDIR)/$(FXTLIB) - - .PHONY: reinstall ## uninstall and install - reinstall: # uninstall install -@@ -785,7 +785,7 @@ showsrc: - # @for h in */*.h; do \ - # grep -L $$h depend.mk &>/dev/null || echo $$h ; done - # --## @for h in $$(ls -1 $(INCDIR) ); do \ -+## @for h in $$(ls -1 $(DESTDIR)$(INCDIR) ); do \ - - #.PHONY: shownotes ##x show comments that contain the string "note" - #shownotes: