drop support for DJGPP and drop support for win32

Support for win32 and DJGPP has been dropped. Calc version 2.14.3.5 was the last to make references to win32 and make references to DJGPP. Future versions of calc may work under those systems, we just elected to remove the somewhat out of date and awkward `win32.mkdef` and related win32 references. If you are a win32 user, please feel free to create a win32 target in Makefile.target and submit as a pull request. If you are a DJGPP user, please feel free to create a DJGPP target in Makefile.target and submit as a pull request. Until someone can test such systems, we prefer to wait until someone is able to test and supply a pull request.
2025-08-16 01:03:29 +03:00 · 2023-08-18 17:05:49 -07:00
parent 7ad1448a1a
commit ea57d2f24f
5 changed files with 41 additions and 291 deletions
--- a/Makefile.config
+++ b/Makefile.config
@@ -190,15 +190,12 @@ CCBAN= -UUNBAN
 #	-DUSE_SGTTY	  use struct sgttyb from <sys/ioctl.h>
 #	-DUSE_NOTHING	  Windows system, don't use any of them
 #
-# Select TERMCONTROL= -DUSE_TERMIOS for DJGPP.
-#
 # If in doubt, leave TERMCONTROL empty.
 #
 TERMCONTROL=
 #TERMCONTROL= -DUSE_TERMIOS
 #TERMCONTROL= -DUSE_TERMIO
 #TERMCONTROL= -DUSE_SGTTY
-#TERMCONTROL= -DUSE_WIN32

 # If your system does not have a vsnprintf() function, you could be in trouble.
 #
@@ -237,8 +234,6 @@ HAVE_VSNPRINTF=
 # a make clobber and try -DCALC_LITTLE_ENDIAN.   If that fails, ask a wizard
 # for help.
 #
-# Select CALC_BYTE_ORDER= -DCALC_LITTLE_ENDIAN for DJGPP.
-#
 CALC_BYTE_ORDER=
 #CALC_BYTE_ORDER= -DBIG_ENDIAN
 #CALC_BYTE_ORDER= -DLITTLE_ENDIAN
@@ -251,8 +246,6 @@ CALC_BYTE_ORDER=
 # In order to avoid make brain damage in some systems, we avoid placing
 # a space after the ='s below.
 #
-# Select CALC_CHARBIT= 8 for DJGPP.
-#
 CALC_CHARBIT=
 #CALC_CHARBIT= 8

@@ -264,8 +257,6 @@ CALC_CHARBIT=
 # In order to avoid make brain damage in some systems, we avoid placing
 # a space after the ='s below.
 #
-# Select LONG_BITS= 32 for DJGPP.
-#
 LONG_BITS=
 #LONG_BITS= 32
 #LONG_BITS= 64
@@ -288,8 +279,6 @@ HAVE_FGETSETPOS=
 # to determine if fpos_t has a __pos structure element.  If HAVE_FPOS_POS
 # is set to -DHAVE_NO_FPOS_POS, then calc assume there is no __pos element.
 #
-# Select HAVE_FPOS_POS= -DHAVE_NO_FPOS_POS for DJGPP.
-#
 # If in doubt, leave HAVE_FPOS_POS empty and this Makefile will figure it out.
 #
 HAVE_FPOS_POS=
@@ -314,8 +303,6 @@ FPOS_POS_BITS=
 # If FPOS_BITS is empty, then the Makefile will determine the size of
 # the file position value.
 #
-# Select FPOS_BITS= 32 for DJGPP.
-#
 # If in doubt, leave FPOS_BITS empty and this Makefile will figure it out.
 #
 FPOS_BITS=
@@ -327,8 +314,6 @@ FPOS_BITS=
 # If OFF_T_BITS is empty, then the Makefile will determine the size of
 # the file offset value.
 #
-# Select OFF_T_BITS= 32 for DJGPP.
-#
 # If in doubt, leave OFF_T_BITS empty and this Makefile will figure it out.
 #
 OFF_T_BITS=
@@ -340,8 +325,6 @@ OFF_T_BITS=
 # If DEV_BITS is empty, then the Makefile will determine the size of
 # the dev_t device value
 #
-# Select DEV_BITS= 32 for DJGPP.
-#
 # If in doubt, leave DEV_BITS empty and this Makefile will figure it out.
 #
 DEV_BITS=
@@ -354,8 +337,6 @@ DEV_BITS=
 # If INODE_BITS is empty, then the Makefile will determine the size of
 # the ino_t inode value
 #
-# Select INODE_BITS= 32 for DJGPP.
-#
 # If in doubt, leave INODE_BITS empty and this Makefile will figure it out.
 #
 INODE_BITS=
@@ -474,8 +455,6 @@ HAVE_MEMMOVE=
 # -DHAVE_NO_USTAT, then calc will use internal functions to simulate
 # the ustat() function that gets file system statistics.
 #
-# Select HAVE_USTAT= -DHAVE_NO_USTAT for DJGPP.
-#
 # If in doubt, leave HAVE_USTAT empty and this Makefile will figure it out.
 #
 HAVE_USTAT=
@@ -488,8 +467,6 @@ HAVE_USTAT=
 # -DHAVE_NO_STATFS, then calc will use internal functions to simulate
 # the statfs() function that gets file system statistics.
 #
-# Select HAVE_STATFS= -DHAVE_NO_STATFS for DJGPP.
-#
 # If in doubt, leave HAVE_STATFS empty and this Makefile will figure it out.
 #
 HAVE_STATFS=
@@ -501,8 +478,6 @@ HAVE_STATFS=
 #    HAVE_SYS_VFS_H= YES	assume that the include file exists
 #    HAVE_SYS_VFS_H= NO		assume that the include file does not exist
 #
-# Select HAVE_SYS_VFS_H= NO for DJGPP.
-#
 # When in doubt, leave HAVE_SYS_VFS_H empty.
 #
 HAVE_SYS_VFS_H=
@@ -515,8 +490,6 @@ HAVE_SYS_VFS_H=
 #    HAVE_SYS_PARAM_H= YES	assume that the include file exists
 #    HAVE_SYS_PARAM_H= NO	assume that the include file does not exist
 #
-# Select HAVE_SYS_PARAM_H= NO for DJGPP.
-#
 # When in doubt, leave HAVE_SYS_PARAM_H empty.
 #
 HAVE_SYS_PARAM_H=
@@ -529,8 +502,6 @@ HAVE_SYS_PARAM_H=
 #    HAVE_SYS_MOUNT_H= YES	assume that the include file exists
 #    HAVE_SYS_MOUNT_H= NO	assume that the include file does not exist
 #
-# Select HAVE_SYS_MOUNT_H= NO for DJGPP.
-#
 # When in doubt, leave HAVE_SYS_MOUNT_H empty.
 #
 HAVE_SYS_MOUNT_H=
@@ -544,8 +515,6 @@ HAVE_SYS_MOUNT_H=
 # -DHAVE_NO_GETSID, then calc will use internal functions to simulate
 # the getsid() function that gets session ID.
 #
-# Select HAVE_GETSID= -DHAVE_NO_GETSID for DJGPP.
-#
 # If in doubt, leave HAVE_GETSID empty and this Makefile will figure it out.
 #
 HAVE_GETSID=
@@ -558,8 +527,6 @@ HAVE_GETSID=
 # -DHAVE_NO_GETPGID, then calc will use internal functions to simulate
 # the getpgid() function that sets the process group ID.
 #
-# Select HAVE_GETPGID= -DHAVE_NO_GETPGID for DJGPP.
-#
 # If in doubt, leave HAVE_GETPGID empty and this Makefile will figure it out.
 #
 HAVE_GETPGID=
@@ -572,8 +539,6 @@ HAVE_GETPGID=
 # -DHAVE_NO_GETTIME, then calc will use internal functions to simulate
 # the clock_gettime() function.
 #
-# Select HAVE_GETTIME= -DHAVE_NO_GETTIME for DJGPP.
-#
 # If in doubt, leave HAVE_GETTIME empty and this Makefile will figure it out.
 #
 HAVE_GETTIME=
@@ -586,8 +551,6 @@ HAVE_GETTIME=
 # -DHAVE_NO_GETPRID, then calc will use internal functions to simulate
 # the getprid() function.
 #
-# Select HAVE_GETPRID= -DHAVE_NO_GETPRID for DJGPP.
-#
 # If in doubt, leave HAVE_GETPRID empty and this Makefile will figure it out.
 #
 HAVE_GETPRID=
@@ -599,8 +562,6 @@ HAVE_GETPRID=
 #    HAVE_URANDOM_H= YES	assume that /dev/urandom exists
 #    HAVE_URANDOM_H= NO		assume that /dev/urandom does not exist
 #
-# Select HAVE_URANDOM_H= NO for DJGPP.
-#
 # When in doubt, leave HAVE_URANDOM_H empty.
 #
 HAVE_URANDOM_H=
@@ -642,8 +603,6 @@ HAVE_STRDUP=
 # ALIGN32= -DMUST_ALIGN32    force 32 bit alignment
 # ALIGN32= -UMUST_ALIGN32    allow non-alignment of 32 bit accesses
 #
-# Select ALIGN32= -UMUST_ALIGN32 for DJGPP.
-#
 # When in doubt, be safe and pick ALIGN32=-DMUST_ALIGN32.
 #
 ALIGN32=
@@ -656,8 +615,6 @@ ALIGN32=
 #    HAVE_STDLIB_H= YES		assume that the include file exists
 #    HAVE_STDLIB_H= NO		assume that the include file does not exist
 #
-# Select HAVE_STDLIB_H= YES for DJGPP.
-#
 # When in doubt, leave HAVE_STDLIB_H empty.
 #
 HAVE_STDLIB_H=
@@ -670,8 +627,6 @@ HAVE_STDLIB_H=
 #    HAVE_STRING_H= YES		assume that the include file exists
 #    HAVE_STRING_H= NO		assume that the include file does not exist
 #
-# Select HAVE_STRING_H= YES for DJGPP.
-#
 # When in doubt, leave HAVE_STRING_H empty.
 #
 HAVE_STRING_H=
@@ -684,8 +639,6 @@ HAVE_STRING_H=
 #    HAVE_TIMES_H= YES		assume that the include file exists
 #    HAVE_TIMES_H= NO		assume that the include file does not exist
 #
-# Select HAVE_TIMES_H= NO for DJGPP.
-#
 # When in doubt, leave HAVE_TIMES_H empty.
 #
 HAVE_TIMES_H=
@@ -698,8 +651,6 @@ HAVE_TIMES_H=
 #    HAVE_SYS_TIMES_H= YES	assume that the include file exists
 #    HAVE_SYS_TIMES_H= NO	assume that the include file does not exist
 #
-# Select HAVE_SYS_TIMES_H= YES for DJGPP.
-#
 # When in doubt, leave HAVE_SYS_TIMES_H empty.
 #
 HAVE_SYS_TIMES_H=
@@ -712,8 +663,6 @@ HAVE_SYS_TIMES_H=
 #    HAVE_TIME_H= YES		assume that the include file exists
 #    HAVE_TIME_H= NO		assume that the include file does not exist
 #
-# Select HAVE_TIME_H= YES for DJGPP.
-#
 # When in doubt, leave HAVE_TIME_H empty.
 #
 HAVE_TIME_H=
@@ -726,8 +675,6 @@ HAVE_TIME_H=
 #    HAVE_SYS_TIME_H= YES	assume that the include file exists
 #    HAVE_SYS_TIME_H= NO	assume that the include file does not exist
 #
-# Select HAVE_SYS_TIME_H= YES for DJGPP.
-#
 # When in doubt, leave HAVE_SYS_TIME_H empty.
 #
 HAVE_SYS_TIME_H=
@@ -740,8 +687,6 @@ HAVE_SYS_TIME_H=
 #    HAVE_UNISTD_H= YES		assume that the include file exists
 #    HAVE_UNISTD_H= NO		assume that the include file does not exist
 #
-# Select HAVE_UNISTD_H= YES for DJGPP.
-#
 # When in doubt, leave HAVE_UNISTD_H empty.
 #
 HAVE_UNISTD_H=
@@ -754,8 +699,6 @@ HAVE_UNISTD_H=
 #    HAVE_LIMITS_H= YES		assume that the include file exists
 #    HAVE_LIMITS_H= NO		assume that the include file does not exist
 #
-# Select HAVE_LIMITS_H= YES for DJGPP.
-#
 # When in doubt, leave HAVE_LIMITS_H empty.
 #
 HAVE_LIMITS_H=
@@ -768,8 +711,6 @@ HAVE_LIMITS_H=
 # to determine if the unused attribute is supported.  If HAVE_UNUSED is set to
 # -DHAVE_NO_UNUSED, then the unused attribute will not be used.
 #
-# Select HAVE_UNUSED= for DJGPP.
-#
 # If in doubt, leave HAVE_UNUSED empty and this Makefile will figure it out.
 #
 HAVE_UNUSED=
@@ -817,10 +758,6 @@ HAVE_STRLCAT=
 #
 # ${INCDIR}		where the system include (.h) files are kept
 #
-# For DJGPP, select:
-#
-#	INCDIR= /dev/env/DJDIR/include
-#
 # If in doubt, for non-macOS hosts set:
 #
 #	INCDIR= /usr/include
@@ -828,6 +765,7 @@ HAVE_STRLCAT=
 # However, if you are on macOS then set:
 #
 #	INCDIR= ${PREFIX}/include
+#
 ifeq ($(target),Darwin)

 # determine default INCDIR for macOS
@@ -873,12 +811,6 @@ endif	# ($(target),Darwin)
 #
 #	You might be better off not changing LIBDIR in the first place.
 #
-# For DJGPP, select:
-#
-#	BINDIR= /dev/env/DJDIR/bin
-#	LIBDIR= /dev/env/DJDIR/lib
-#	CALC_SHAREDIR= /dev/env/DJDIR/share/calc
-#
 # If in doubt, for non-macOS hosts set:
 #
 #	BINDIR= /usr/bin
@@ -996,8 +928,6 @@ T=

 # where man section 1 pages are installed
 #
-# Select MANDIR= /dev/env/DJDIR/man/man1 for DJGPP.
-#
 # Use MANDIR= to disable installation of the calc man (source) page.
 #
 # NOTE: man pages not installed by macOS must go under,
@@ -1020,8 +950,6 @@ endif	# ($(target),Darwin)

 # where cat (formatted man) pages are installed
 #
-# Select CATDIR= /dev/env/DJDIR/man/cat1 for DJGPP.
-#
 # Use CATDIR= to disable installation of the calc cat (formatted) page.
 #
 # NOTE: If CATDIR is non-empty, then one should have either the
@@ -1070,8 +998,6 @@ CATEXT= 1
 #
 #     The cat page is not built or installed
 #
-# Select NROFF= groff for DJGPP.
-#
 # If in doubt and you don't want to fool with man pages, set MANDIR
 # and CATDIR to empty and ignore the NROFF, NROFF_ARG and MANMAKE
 # lines below.
@@ -1102,8 +1028,6 @@ ALLOW_CUSTOM= -DCUSTOM
 # If the $CALCPATH environment variable is not defined, then the following
 # path will be searched for calc resource file routines.
 #
-# Select CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR} for DJGPP.
-#
 ifeq ($(ALLOW_CUSTOM),-DCUSTOM)
 CALCPATH= .:./cal:~/.cal:${T}${CALC_SHAREDIR}:${T}${CUSTOMCALDIR}
 else	# ($(ALLOW_CUSTOM),-DCUSTOM)
@@ -1123,8 +1047,6 @@ endif	# RPM_TOP
 # If the $CALCRC environment variable is not defined, then the following
 # path will be searched for calc resource files.
 #
-# Select CALCRC= ./.calcinit:~/.calcrc:${CALC_SHAREDIR}/startup for DJGPP.
-#
 CALCRC= ./.calcinit:~/.calcrc:${CALC_SHAREDIR}/startup
 #CALCRC= ./.calcinit;~/.calcrc;${CALC_SHAREDIR}/startup

@@ -1207,8 +1129,6 @@ endif	# ($(HOMEBREW_PREFIX),)

 # If $PAGER is not set, use this program to display a help file
 #
-# Select CALCPAGER= less.exe -ci for DJGPP.
-#
 #CALCPAGER= more
 #CALCPAGER= pg
 #CALCPAGER= cat
@@ -1217,8 +1137,6 @@ CALCPAGER= less

 # Debug/Optimize options for ${CC} and ${LCC}
 #
-# Select DEBUG= -O2 -gstabs+ -DWINDOZ for DJGPP.
-#
 #DEBUG=
 #DEBUG= -g
 #DEBUG= -g3