From 42d5749da23db2374c04934237ec9fccac70c832 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Wed, 23 Apr 2025 19:28:55 -0700 Subject: [PATCH] prep CHANGES for the next release of calc Change Makefile.config to, if not using not HomeBrew, then try to detect macports and/or using /opt/local/{lib,include}. Changed version from 2.15.1.0 to 2.15.1.1. Put full date range (1989-2025) of calc source into version.h. --- CHANGES | 6 ++++++ Makefile.config | 14 ++++++++++++++ version.h | 4 ++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index cc8ce28..0b1c983 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +The following are the changes from calc version 2.15.1.1 to date: + + Change Makefile.config to, if not using not HomeBrew, then try to + detect macports and/or using /opt/local/{lib,include}. + + The following are the changes from calc version 2.15.0.7 to 2.15.1.0: Converted all ASCII tabs to ASCII spaces using a 8 character diff --git a/Makefile.config b/Makefile.config index 4af112c..e0d26d3 100644 --- a/Makefile.config +++ b/Makefile.config @@ -1112,6 +1112,9 @@ READLINE_EXTRAS= -lhistory -lncurses #READLINE_LIB= -L${PREFIX}/lib -lreadline #READLINE_EXTRAS= -lhistory -lncurses # +#READLINE_LIB= -L/opt/local/lib -lreadline +#READLINE_EXTRAS= -lhistory -lncurses +# # For Apple OS X: install fink from http://fink.sourceforge.net # and then do a 'fink install readline' and then use: # @@ -1130,6 +1133,7 @@ READLINE_EXTRAS= -lhistory -lncurses READLINE_INCLUDE= #READLINE_INCLUDE= -I/usr/gnu/include #READLINE_INCLUDE= -I${PREFIX}/include +#READLINE_INCLUDE= -I/opt/local/include # Handle the case where macOS is being used with HomeBrew # # and using the readline, history, and ncurses libraries. @@ -1137,6 +1141,16 @@ READLINE_INCLUDE= ifneq ($(HOMEBREW_PREFIX),) READLINE_LIB:= -L${HOMEBREW_PREFIX}/opt/readline/lib -lreadline READLINE_INCLUDE:= -I${HOMEBREW_PREFIX}/opt/readline/include + +# If not HomeBrew, then try to detect macports and/or using /opt/local/{lib,include} +# +else # perhaps macports and/or using /opt/local/{lib,include} ? +ifneq ($(wildcard /opt/local/lib/*),) +READLINE_LIB:= -L/opt/local/lib -lreadline +endif +ifneq ($(wildcard /opt/local/incliude/*),) +READLINE_INCLUDE:= -I/opt/local/include +endif endif # ($(HOMEBREW_PREFIX),) # If $PAGER is not set, use this program to display a help file diff --git a/version.h b/version.h index d1231b4..16f946e 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ /* * version - determine the version of calc * - * Copyright (C) 2023 David I. Bell and Landon Curt Noll + * Copyright (C) 1989-2025 David I. Bell and Landon Curt Noll * * Calc is open software; you can redistribute it and/or modify it under * the terms of the version 2.1 of the GNU Lesser General Public License @@ -64,7 +64,7 @@ #define MAJOR_VER 2 /* level 1: major library version */ #define MINOR_VER 15 /* level 2: minor library version */ #define MAJOR_PATCH 1 /* level 3: major software version level */ -#define MINOR_PATCH 0 /* level 4: minor software version level */ +#define MINOR_PATCH 1 /* level 4: minor software version level */ #endif /* !INCLUDE_VERSION_H*/