diff --git a/dev-lang/algol68g/algol68g-2.8.4.recipe b/dev-lang/algol68g/algol68g-2.8.5.recipe similarity index 75% rename from dev-lang/algol68g/algol68g-2.8.4.recipe rename to dev-lang/algol68g/algol68g-2.8.5.recipe index 8124af4e3..1f48613f8 100644 --- a/dev-lang/algol68g/algol68g-2.8.4.recipe +++ b/dev-lang/algol68g/algol68g-2.8.5.recipe @@ -3,11 +3,13 @@ DESCRIPTION="Algol68G is an implementation of Algol 68 as defined by the \ Revised Report. It ranks among the most complete implementations of the \ language." HOMEPAGE="https://jmvdveer.home.xs4all.nl/en.algol-68-genie.html" -COPYRIGHT="2001-2016 J. Marcel van der Veer" +COPYRIGHT="2001-2018 J. Marcel van der Veer" LICENSE="GNU LGPL v3" REVISION="1" SOURCE_URI="https://jmvdveer.home.xs4all.nl/algol68g-$portVersion.tar.gz" -CHECKSUM_SHA256="5823ccd0c18fe10a368a117cc3924748c4a5d0fe8dff0d9d818ff73c342565f0" +CHECKSUM_SHA256="0f757c64a8342fe38ec501bde68b61d26d051dffd45742ca58b7288a99c7e2d8" +SOURCE_URI_2="http://downloads.sourceforge.net/project/algol68/algol68g/algol68g-2.0.0/a68g-doc.pdf#noarchive" +CHECKSUM_SHA256_2="064b6761207d937aa704d245fc871a072f5a33ea23a346cb136ec8b2078ea321" PATCHES="algol68g-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -30,6 +32,7 @@ REQUIRES=" lib:libgslcblas$secondaryArchSuffix lib:libncurses$secondaryArchSuffix lib:libplot$secondaryArchSuffix + lib:libpq$secondaryArchSuffix " BUILD_REQUIRES=" @@ -38,6 +41,7 @@ BUILD_REQUIRES=" devel:libgslcblas$secondaryArchSuffix devel:libncurses$secondaryArchSuffix devel:libplot$secondaryArchSuffix + devel:libpq$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal @@ -65,9 +69,12 @@ BUILD() INSTALL() { make install + mkdir -p $developDocDir + cp $sourceDir2/a68g-doc.pdf $developDocDir } TEST() { - make check + #make check #test-set not provided + true } diff --git a/dev-lang/algol68g/patches/algol68g-2.8.4.patchset b/dev-lang/algol68g/patches/algol68g-2.8.4.patchset deleted file mode 100644 index 558541a74..000000000 --- a/dev-lang/algol68g/patches/algol68g-2.8.4.patchset +++ /dev/null @@ -1,105 +0,0 @@ -From e7e85ff60df506f485346bd54fbb9a4e61ccd25b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Sun, 12 Aug 2018 11:12:30 +0200 -Subject: Add Haiku to the supported OS list - - -diff --git a/configure.ac b/configure.ac -old mode 100755 -new mode 100644 -index efef996..e09be43 ---- a/configure.ac -+++ b/configure.ac -@@ -128,6 +128,14 @@ case "$host" in - AC_MSG_RESULT([freebsd]) - ;; - # -+# HAIKU. -+# -+*86-*-haiku* | *86_64-*-haiku*) -+ AC_DEFINE(HAVE_HAIKU, 1, [Define this if HAIKU was detected]) -+ AC_DEFINE(HAVE_IEEE_754, 1, [Define this if IEEE_754 compliant]) -+ AC_MSG_RESULT([haiku]) -+ ;; -+# - # NetBSD. - # - *86-*-netbsd* | *86_64-*-netbsd*) -diff --git a/source/a68g.c b/source/a68g.c -old mode 100755 -new mode 100644 -index 090fa14..50308e0 ---- a/source/a68g.c -+++ b/source/a68g.c -@@ -899,7 +899,7 @@ Accept various silent extensions. - /* - Compilation on Linux, FreeBSD or NetBSD using gcc - */ --#if (defined HAVE_LINUX || defined HAVE_FREEBSD || defined HAVE_NETBSD) -+#if (defined HAVE_LINUX || defined HAVE_FREEBSD || defined HAVE_NETBSD || defined HAVE_HAIKU) - #if defined HAVE_TUNING - ASSERT (snprintf (options, SNPRINTF_SIZE, "%s %s %s -g", extra_inc, optimisation, HAVE_TUNING) >= 0); - #else -diff --git a/source/a68g.h b/source/a68g.h -old mode 100755 -new mode 100644 -index 27db0d0..3525bae ---- a/source/a68g.h -+++ b/source/a68g.h -@@ -50,7 +50,7 @@ Top level include file. - #undef HAVE_COMPILER - #elif ((defined HAVE_LINUX || defined HAVE_MAC_OS_X) && defined HAVE_DL) - #define HAVE_COMPILER 1 --#elif (defined HAVE_FREEBSD || defined HAVE_NETBSD) -+#elif (defined HAVE_FREEBSD || defined HAVE_NETBSD || defined HAVE_HAIKU) - #define HAVE_COMPILER 1 - #else - #undef HAVE_COMPILER --- -2.16.4 - - -From 903bbec196946af85b1d5b79525c9d5446f434aa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Sun, 12 Aug 2018 11:21:28 +0200 -Subject: Enable dl on Haiku - - -diff --git a/configure.ac b/configure.ac -index e09be43..e73e515 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -676,6 +676,7 @@ if test "x$enable_compiler" = "xyes"; then - fi - if test "x$enable_compiler" = "xyes"; then - AC_CHECK_LIB([dl], [dlopen]) -+ AC_CHECK_LIB([root], [dlopen]) - AC_DEFINE(HAVE_DL, 1, [Define this if a good DL installation was detected]) - fi - fi --- -2.16.4 - - -From 39df6bd48e8c4e8449609e327d6072e2539a3b4e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Sun, 12 Aug 2018 12:07:34 +0200 -Subject: Enable networking - - -diff --git a/source/a68g.h b/source/a68g.h -index 3525bae..fb12892 100644 ---- a/source/a68g.h -+++ b/source/a68g.h -@@ -59,7 +59,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) --#if (defined HAVE_LINUX || defined HAVE_MAC_OS_X || defined HAVE_FREEBSD || defined HAVE_NETBSD) -+#if (defined HAVE_LINUX || defined HAVE_MAC_OS_X || defined HAVE_FREEBSD || defined HAVE_NETBSD || defined HAVE_HAIKU) - #define HAVE_HTTP - #endif - #endif --- -2.16.4 - diff --git a/dev-lang/algol68g/patches/algol68g-2.8.5.patchset b/dev-lang/algol68g/patches/algol68g-2.8.5.patchset new file mode 100644 index 000000000..939d39057 --- /dev/null +++ b/dev-lang/algol68g/patches/algol68g-2.8.5.patchset @@ -0,0 +1,176 @@ +From 88775bc062b5fdb9ebbd56b72a29f8528d49a18f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sun, 12 Aug 2018 11:12:30 +0200 +Subject: Add Haiku to the supported OS list + + +diff --git a/configure.ac b/configure.ac +old mode 100755 +new mode 100644 +index f71b6ad..7d340a0 +--- a/configure.ac ++++ b/configure.ac +@@ -128,6 +128,14 @@ case "$host" in + AC_MSG_RESULT([freebsd]) + ;; + # ++# HAIKU. ++# ++*86-*-haiku* | *86_64-*-haiku*) ++ AC_DEFINE(HAVE_HAIKU, 1, [Define this if HAIKU was detected]) ++ AC_DEFINE(HAVE_IEEE_754, 1, [Define this if IEEE_754 compliant]) ++ AC_MSG_RESULT([haiku]) ++ ;; ++# + # NetBSD. + # + *86-*-netbsd* | *86_64-*-netbsd*) +diff --git a/source/a68g.c b/source/a68g.c +old mode 100755 +new mode 100644 +index ab23ca1..110db97 +--- a/source/a68g.c ++++ b/source/a68g.c +@@ -903,7 +903,7 @@ Accept various silent extensions. + /* + Compilation on Linux, FreeBSD or NetBSD using gcc + */ +-#if (defined HAVE_LINUX || defined HAVE_FREEBSD || defined HAVE_NETBSD) ++#if (defined HAVE_LINUX || defined HAVE_FREEBSD || defined HAVE_NETBSD || defined HAVE_HAIKU) + #if defined HAVE_TUNING + ASSERT (snprintf (options, SNPRINTF_SIZE, "%s %s %s -g", extra_inc, optimisation, HAVE_TUNING) >= 0); + #else +diff --git a/source/a68g.h b/source/a68g.h +old mode 100755 +new mode 100644 +index d185338..a53daad +--- a/source/a68g.h ++++ b/source/a68g.h +@@ -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 +-#elif (defined HAVE_FREEBSD || defined HAVE_NETBSD) ++#elif (defined HAVE_FREEBSD || defined HAVE_NETBSD || defined HAVE_HAIKU) + #define HAVE_COMPILER 1 + #else + #undef HAVE_COMPILER +-- +2.19.1 + + +From 40c61a9321533b41439b33555bf45daeb11c1743 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Tue, 1 Jan 2019 22:04:56 +0100 +Subject: Enable dl and compiler + + +diff --git a/configure.ac b/configure.ac +index 7d340a0..d509a53 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -82,7 +82,8 @@ AC_DEFUN([A68G_AC_DL], + [AC_CHECK_DECL([$1], [], [enable_compiler=no], [ + #include + ]) +- AC_CHECK_LIB([dl], [$1], [a68g_unexpected=yes], [enable_compiler=no]) ++ AC_CHECK_LIB([dl], [$1], [a68g_unexpected=yes]) ++ AC_CHECK_LIB([root], [$1], [a68g_unexpected=yes], [enable_compiler=no]) + ]) + + # +@@ -676,6 +677,7 @@ if test "x$enable_compiler" = "xyes"; then + fi + if test "x$enable_compiler" = "xyes"; then + AC_CHECK_LIB([dl], [dlopen]) ++ AC_CHECK_LIB([root], [dlopen]) + AC_DEFINE(HAVE_DL, 1, [Define this if a good DL installation was detected]) + fi + fi +-- +2.19.1 + + +From 3b942710ef51294fe906976161aebcaa89d3fd35 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sun, 12 Aug 2018 12:07:34 +0200 +Subject: Enable networking + + +diff --git a/source/a68g.h b/source/a68g.h +index a53daad..85518c5 100644 +--- a/source/a68g.h ++++ b/source/a68g.h +@@ -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) +-#if (defined HAVE_LINUX || defined HAVE_MAC_OS_X || defined HAVE_FREEBSD || defined HAVE_NETBSD) ++#if (defined HAVE_LINUX || defined HAVE_MAC_OS_X || defined HAVE_FREEBSD || defined HAVE_NETBSD || defined HAVE_HAIKU) + #define HAVE_HTTP + #endif + #endif +-- +2.19.1 + + +From 685942ff84dfbaa0703e459f898114fa217bf20a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Tue, 1 Jan 2019 21:28:31 +0100 +Subject: Plotutils patch from AUR + + +diff --git a/source/plotutils.c b/source/plotutils.c +old mode 100755 +new mode 100644 +index 689d43f..4d9cd36 +--- a/source/plotutils.c ++++ b/source/plotutils.c +@@ -1026,7 +1026,7 @@ set_up_device (NODE_T * p, A68_FILE * f) + X_COORD (&DEVICE (f)) = 0; + Y_COORD (&DEVICE (f)) = 0; + return (PLOTTER (&DEVICE (f))); +- } else if (!strcmp (device_type, "gif")) { ++ } else if (!strcmp (device_type, "gif") || !strcmp (device_type, "png")) { + /*------------------------------------+ + | Supported plotter type - pseudo GIF | + +------------------------------------*/ +@@ -1067,7 +1067,7 @@ set_up_device (NODE_T * p, A68_FILE * f) + (void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "BITMAPSIZE", size); + (void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "BG_COLOR", (void *) "black"); + (void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "GIF_ANIMATION", (void *) "no"); +- PLOTTER (&DEVICE (f)) = pl_newpl_r ("gif", NULL, STREAM (&DEVICE (f)), stderr, PLOTTER_PARAMS (&DEVICE (f))); ++ PLOTTER (&DEVICE (f)) = pl_newpl_r (device_type, NULL, STREAM (&DEVICE (f)), stderr, PLOTTER_PARAMS (&DEVICE (f))); + if (PLOTTER (&DEVICE (f)) == NULL) { + diagnostic_node (A68_RUNTIME_ERROR, p, ERROR_DEVICE_CANNOT_OPEN); + exit_genie (p, A68_RUNTIME_ERROR); +-- +2.19.1 + + +From d6cafcf9cd113e20b94ba43f988b06300a4f96b1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Wed, 2 Jan 2019 11:04:16 +0100 +Subject: Config file PATH + + +diff --git a/source/a68g.h b/source/a68g.h +index 85518c5..38f718b 100644 +--- a/source/a68g.h ++++ b/source/a68g.h +@@ -333,7 +333,11 @@ extern int a68g_snprintf (char *, size_t, char *, ...); + /* Constants */ + /*************/ + +-#define A68_DIR ".a68g" ++#ifndef __HAIKU__ ++# define A68_DIR ".a68g" ++#else ++# define A68_DIR "config/settings/a68g" ++#endif + #define A68_FALSE ((BOOL_T) 0) + #define A68_HISTORY_FILE ".a68g.edit.hist" + #define A68_MAX_BITS (UINT_MAX) +-- +2.19.1 +