Bugfix update to algol68g-2.8.5 -- tests disappeared from the tarball
This commit is contained in:
parent
b9141b1e04
commit
4beb3ec2f7
@ -1,7 +1,7 @@
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 2017/06/29 15:56:14 bcallah Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 2018/08/14 00:50:17 bcallah Exp $
|
||||
|
||||
COMMENT = Algol 68 Genie compiler-interpreter
|
||||
DISTNAME = algol68g-2.8.4
|
||||
DISTNAME = algol68g-2.8.5
|
||||
CATEGORIES = lang
|
||||
|
||||
HOMEPAGE = https://jmvdveer.home.xs4all.nl/algol.html
|
||||
@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM = Yes
|
||||
|
||||
MASTER_SITES = https://jmvdveer.home.xs4all.nl/
|
||||
|
||||
WANTLIB += c gsl gslcblas m ncurses pthread readline
|
||||
WANTLIB += c curses gsl gslcblas m pthread readline
|
||||
|
||||
LIB_DEPENDS = devel/gsl
|
||||
|
||||
@ -21,4 +21,6 @@ CONFIGURE_ARGS = --disable-plotutils --disable-postgresql
|
||||
CONFIGURE_ENV = CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
|
||||
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
|
||||
|
||||
NO_TEST = Yes
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (algol68g-2.8.4.tar.gz) = WCPM0MGP4Qo2ihF8w5JHSMSl0P6N/w2dgY/3PDQlZfA=
|
||||
SIZE (algol68g-2.8.4.tar.gz) = 516697
|
||||
SHA256 (algol68g-2.8.5.tar.gz) = D3V8ZKg0L+OOxQG95oth0m0FHf/UV0LKWLcoipnH4tg=
|
||||
SIZE (algol68g-2.8.5.tar.gz) = 543905
|
||||
|
@ -1,11 +1,60 @@
|
||||
$OpenBSD: patch-configure,v 1.1.1.1 2017/06/29 15:56:14 bcallah Exp $
|
||||
$OpenBSD: patch-configure,v 1.2 2018/08/14 00:50:17 bcallah Exp $
|
||||
|
||||
Enable compiler on OpenBSD.
|
||||
Enable compiler on OpenBSD (regenerated configure script)
|
||||
|
||||
Index: configure
|
||||
--- configure.orig
|
||||
+++ configure
|
||||
@@ -2371,10 +2371,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
@@ -708,7 +708,6 @@ infodir
|
||||
docdir
|
||||
oldincludedir
|
||||
includedir
|
||||
-runstatedir
|
||||
localstatedir
|
||||
sharedstatedir
|
||||
sysconfdir
|
||||
@@ -792,7 +791,6 @@ datadir='${datarootdir}'
|
||||
sysconfdir='${prefix}/etc'
|
||||
sharedstatedir='${prefix}/com'
|
||||
localstatedir='${prefix}/var'
|
||||
-runstatedir='${localstatedir}/run'
|
||||
includedir='${prefix}/include'
|
||||
oldincludedir='/usr/include'
|
||||
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
||||
@@ -1045,15 +1043,6 @@ do
|
||||
| -silent | --silent | --silen | --sile | --sil)
|
||||
silent=yes ;;
|
||||
|
||||
- -runstatedir | --runstatedir | --runstatedi | --runstated \
|
||||
- | --runstate | --runstat | --runsta | --runst | --runs \
|
||||
- | --run | --ru | --r)
|
||||
- ac_prev=runstatedir ;;
|
||||
- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
||||
- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
||||
- | --run=* | --ru=* | --r=*)
|
||||
- runstatedir=$ac_optarg ;;
|
||||
-
|
||||
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||||
ac_prev=sbindir ;;
|
||||
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||||
@@ -1191,7 +1180,7 @@ fi
|
||||
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||||
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||||
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||||
- libdir localedir mandir runstatedir
|
||||
+ libdir localedir mandir
|
||||
do
|
||||
eval ac_val=\$$ac_var
|
||||
# Remove trailing slashes.
|
||||
@@ -1344,7 +1333,6 @@ Fine tuning of the installation directories:
|
||||
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||||
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||||
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||||
- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
||||
--libdir=DIR object code libraries [EPREFIX/lib]
|
||||
--includedir=DIR C header files [PREFIX/include]
|
||||
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||||
@@ -2383,10 +2371,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
|
||||
@ -16,7 +65,12 @@ Index: configure
|
||||
#
|
||||
# Platform ids.
|
||||
#
|
||||
@@ -2593,11 +2589,11 @@ $as_echo "netbsd" >&6; }
|
||||
@@ -2601,15 +2585,15 @@ $as_echo "netbsd" >&6; }
|
||||
#
|
||||
# OpenBSD.
|
||||
#
|
||||
-*86-*-openbsd* | *86_64-*-openbsd*)
|
||||
+i386-*-openbsd* | amd64-*-openbsd* | x86_64-*-openbsd* | arm*-*-openbsd* | aarch64-*-openbsd*)
|
||||
|
||||
$as_echo "#define HAVE_OPENBSD 1" >>confdefs.h
|
||||
|
||||
@ -31,58 +85,29 @@ Index: configure
|
||||
;;
|
||||
#
|
||||
# Others, untested.
|
||||
@@ -2695,7 +2691,7 @@ fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: initialising..." >&5
|
||||
$as_echo "$as_me: initialising..." >&6;}
|
||||
-am__api_version='1.14'
|
||||
+am__api_version='1.15'
|
||||
|
||||
# Find a good install program. We prefer a C program (faster),
|
||||
# so one script is as good as another. But avoid the broken or
|
||||
@@ -2867,8 +2863,8 @@ test "$program_suffix" != NONE &&
|
||||
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
|
||||
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
|
||||
|
||||
-# expand $ac_aux_dir to an absolute path
|
||||
-am_aux_dir=`cd $ac_aux_dir && pwd`
|
||||
+# Expand $ac_aux_dir to an absolute path.
|
||||
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
|
||||
|
||||
if test x"${MISSING+set}" != xset; then
|
||||
case $am_aux_dir in
|
||||
@@ -2887,7 +2883,7 @@ else
|
||||
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
|
||||
fi
|
||||
|
||||
-if test x"${install_sh}" != xset; then
|
||||
+if test x"${install_sh+set}" != xset; then
|
||||
case $am_aux_dir in
|
||||
*\ * | *\ *)
|
||||
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
|
||||
@@ -3215,8 +3211,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
|
||||
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
|
||||
mkdir_p='$(MKDIR_P)'
|
||||
|
||||
-# We need awk for the "check" target. The system "awk" is bad on
|
||||
-# some platforms.
|
||||
+# We need awk for the "check" target (and possibly the TAP driver). The
|
||||
+# system "awk" is bad on some platforms.
|
||||
# Always define AMTAR for backward compatibility. Yes, it's still used
|
||||
# in the wild :-( We should find a proper way to deprecate it ...
|
||||
AMTAR='$${TAR-tar}'
|
||||
@@ -3275,6 +3271,7 @@ END
|
||||
fi
|
||||
@@ -18564,287 +18548,6 @@ fi
|
||||
|
||||
|
||||
+
|
||||
ac_config_headers="$ac_config_headers source/a68g-config.h"
|
||||
|
||||
|
||||
@@ -18570,220 +18567,6 @@ fi
|
||||
|
||||
done
|
||||
|
||||
$as_echo "#define HAVE_POSTGRESQL 1" >>confdefs.h
|
||||
-
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
-if test "x$enable_compiler" = "xyes"; then
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: Dynamic loader..." >&5
|
||||
-$as_echo "$as_me: Dynamic loader..." >&6;}
|
||||
- for ac_header in dlfcn.h
|
||||
-do :
|
||||
- ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
|
||||
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
|
||||
- cat >>confdefs.h <<_ACEOF
|
||||
-#define HAVE_DLFCN_H 1
|
||||
-_ACEOF
|
||||
-
|
||||
-fi
|
||||
-
|
||||
-done
|
||||
-
|
||||
- ac_fn_c_check_decl "$LINENO" "dlopen" "ac_cv_have_decl_dlopen" "
|
||||
-#include <dlfcn.h>
|
||||
-
|
||||
@ -297,6 +322,54 @@ Index: configure
|
||||
-
|
||||
-
|
||||
- fi
|
||||
if test "x$enable_compiler" = "xyes"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
|
||||
$as_echo_n "checking for dlopen in -ldl... " >&6; }
|
||||
- if test "x$enable_compiler" = "xyes"; then
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
|
||||
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
|
||||
-if ${ac_cv_lib_dl_dlopen+:} false; then :
|
||||
- $as_echo_n "(cached) " >&6
|
||||
-else
|
||||
- ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-ldl $LIBS"
|
||||
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
-/* end confdefs.h. */
|
||||
-
|
||||
-/* Override any GCC internal prototype to avoid an error.
|
||||
- Use char because int might match the return type of a GCC
|
||||
- builtin and then its argument prototype would still apply. */
|
||||
-#ifdef __cplusplus
|
||||
-extern "C"
|
||||
-#endif
|
||||
-char dlopen ();
|
||||
-int
|
||||
-main ()
|
||||
-{
|
||||
-return dlopen ();
|
||||
- ;
|
||||
- return 0;
|
||||
-}
|
||||
-_ACEOF
|
||||
-if ac_fn_c_try_link "$LINENO"; then :
|
||||
- ac_cv_lib_dl_dlopen=yes
|
||||
-else
|
||||
- ac_cv_lib_dl_dlopen=no
|
||||
-fi
|
||||
-rm -f core conftest.err conftest.$ac_objext \
|
||||
- conftest$ac_exeext conftest.$ac_ext
|
||||
-LIBS=$ac_check_lib_save_LIBS
|
||||
-fi
|
||||
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
|
||||
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
|
||||
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
|
||||
- cat >>confdefs.h <<_ACEOF
|
||||
-#define HAVE_LIBDL 1
|
||||
-_ACEOF
|
||||
-
|
||||
- LIBS="-ldl $LIBS"
|
||||
-
|
||||
-fi
|
||||
-
|
||||
-
|
||||
-$as_echo "#define HAVE_DL 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
fi
|
||||
|
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-source_a68g_c,v 1.1.1.1 2017/06/29 15:56:14 bcallah Exp $
|
||||
$OpenBSD: patch-source_a68g_c,v 1.2 2018/08/14 00:50:17 bcallah Exp $
|
||||
|
||||
Enable compiler on OpenBSD.
|
||||
|
||||
Index: source/a68g.c
|
||||
--- source/a68g.c.orig
|
||||
+++ source/a68g.c
|
||||
@@ -899,7 +899,7 @@ Accept various silent extensions.
|
||||
@@ -903,7 +903,7 @@ Accept various silent extensions.
|
||||
/*
|
||||
Compilation on Linux, FreeBSD or NetBSD using gcc
|
||||
*/
|
||||
@ -14,7 +14,7 @@ Index: source/a68g.c
|
||||
#if defined HAVE_TUNING
|
||||
ASSERT (snprintf (options, SNPRINTF_SIZE, "%s %s %s -g", extra_inc, optimisation, HAVE_TUNING) >= 0);
|
||||
#else
|
||||
@@ -1675,7 +1675,7 @@ set_options (OPTION_LIST_T * i, BOOL_T cmd_line)
|
||||
@@ -1679,7 +1679,7 @@ set_options (OPTION_LIST_T * i, BOOL_T cmd_line)
|
||||
a68g_exit (EXIT_SUCCESS);
|
||||
}
|
||||
#endif
|
||||
@ -23,7 +23,7 @@ Index: source/a68g.c
|
||||
if (eq (q, "linux")) {
|
||||
WRITELN (STDOUT_FILENO, "linux required - exiting graciously");
|
||||
a68g_exit (EXIT_SUCCESS);
|
||||
@@ -1828,7 +1828,7 @@ set_options (OPTION_LIST_T * i, BOOL_T cmd_line)
|
||||
@@ -1832,7 +1832,7 @@ set_options (OPTION_LIST_T * i, BOOL_T cmd_line)
|
||||
}
|
||||
/* COMPILE and NOCOMPILE switch on/off compilation */
|
||||
else if (eq (p, "Compile")) {
|
||||
@ -32,7 +32,7 @@ Index: source/a68g.c
|
||||
OPTION_COMPILE (&program) = A68_TRUE;
|
||||
OPTION_OPTIMISE (&program) = A68_TRUE;
|
||||
OPTION_OPT_LEVEL (&program) = 2;
|
||||
@@ -1881,7 +1881,7 @@ set_options (OPTION_LIST_T * i, BOOL_T cmd_line)
|
||||
@@ -1885,7 +1885,7 @@ set_options (OPTION_LIST_T * i, BOOL_T cmd_line)
|
||||
}
|
||||
/* RUN-SCRIPT runs a comiled .sh script */
|
||||
else if (eq (p, "RUN-SCRIPT")) {
|
||||
@ -41,7 +41,7 @@ Index: source/a68g.c
|
||||
FORWARD (i);
|
||||
if (i != NO_OPTION_LIST) {
|
||||
if (!name_set) {
|
||||
@@ -1904,7 +1904,7 @@ set_options (OPTION_LIST_T * i, BOOL_T cmd_line)
|
||||
@@ -1908,7 +1908,7 @@ set_options (OPTION_LIST_T * i, BOOL_T cmd_line)
|
||||
}
|
||||
/* RUN-QUOTE-SCRIPT runs a comiled .sh script */
|
||||
else if (eq (p, "RUN-QUOTE-SCRIPT")) {
|
||||
|
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-source_a68g_h,v 1.1.1.1 2017/06/29 15:56:14 bcallah Exp $
|
||||
$OpenBSD: patch-source_a68g_h,v 1.2 2018/08/14 00:50:17 bcallah Exp $
|
||||
|
||||
Enable compiler on OpenBSD.
|
||||
|
||||
Index: source/a68g.h
|
||||
--- source/a68g.h.orig
|
||||
+++ source/a68g.h
|
||||
@@ -50,7 +50,7 @@ Top level include file.
|
||||
@@ -54,7 +54,7 @@ Top level include file.
|
||||
#undef HAVE_COMPILER
|
||||
#elif ((defined HAVE_LINUX || defined HAVE_MAC_OS_X) && defined HAVE_DL)
|
||||
#define HAVE_COMPILER 1
|
||||
@ -14,7 +14,7 @@ Index: source/a68g.h
|
||||
#define HAVE_COMPILER 1
|
||||
#else
|
||||
#undef HAVE_COMPILER
|
||||
@@ -59,7 +59,7 @@ Top level include file.
|
||||
@@ -63,7 +63,7 @@ Top level include file.
|
||||
/* Can we access the internet? */
|
||||
|
||||
#if (defined HAVE_NETDB_H && defined HAVE_NETINET_IN_H && defined HAVE_SYS_SOCKET_H)
|
||||
|
Loading…
Reference in New Issue
Block a user