global: fix gcc2 build and purge old version (#5157)

dev-util/global/global-6.5.7.recipe

@@ -1,71 +0,0 @@
-SUMMARY="A source code tagging system"
-DESCRIPTION="GNU GLOBAL is a source code tagging system that works the same \
-way across diverse environments (emacs, vi, less, bash, web browser, etc). \
-You can locate symbols in source files and move there easily. It is useful \
-for hacking a large project containing many sub-directories, many #ifdef and \
-many main() functions. It is similar to ctags or etags but is different from \
-them at the point of independence of any editor. It runs on a UNIX(POSIX) \
-compatible operating system like GNU and BSD."
-HOMEPAGE="http://www.gnu.org/software/global/"
-COPYRIGHT="2000-2013 Tama Communications Corporation
-	2007-2013 Free Software Foundation, Inc."
-LICENSE="GNU GPL v3"
-REVISION="2"
-SOURCE_URI="http://ftp.gnu.org/pub/gnu/global/global-$portVersion.tar.gz"
-CHECKSUM_SHA256="d9c08fa524f9499b54241cb2d72f8a7df01453b6d5e012a63784ded08e3acd32"
-PATCHES="global-$portVersion.patchset"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
-PROVIDES="
-	global = $portVersion compat >= 6.3
-	cmd:global = $portVersion compat >= 6.3
-	cmd:globash = $portVersion compat >= 6.3
-	cmd:gozilla = $portVersion compat >= 6.3
-	cmd:gtags = $portVersion compat >= 6.3
-	cmd:gtags_cscope = $portVersion compat >= 6.3
-	cmd:htags = $portVersion compat >= 6.3
-	cmd:htags_server = $portVersion compat >= 6.3
-	"
-REQUIRES="
-	haiku
-	cmd:ctags
-	cmd:sort
-	lib:libltdl
-	lib:libncurses
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libncurses
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:autoreconf
-	cmd:ctags
-	cmd:find
-	cmd:gcc
-	cmd:grep
-	cmd:ld
-	cmd:libtool
-	cmd:make
-	cmd:perl
-	cmd:sed
-	cmd:sort
-	"
-
-BUILD()
-{
-	autoreconf -fi
-	runConfigure ./configure \
-		--with-ncurses \
-		--with-exuberant-ctags=${portPackageLinksDir}/cmd~ctags/bin/ctags \
-		--with-posix-sort=${portPackageLinksDir}/cmd~sort/bin/sort
-	make
-}
-
-INSTALL()
-{
-	make install
-}

dev-util/global/global-6.6.3.recipe

@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnu.org/software/global/"
 COPYRIGHT="2000-2013 Tama Communications Corporation
 	2007-2013 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://ftp.gnu.org/pub/gnu/global/global-$portVersion.tar.gz"
 CHECKSUM_SHA256="cbee98ef6c1b064bc5b062d14a6d94dca67289e8374860817057db7688bc651c"
 PATCHES="global-$portVersion.patchset"

dev-util/global/patches/global-6.5.7.patchset

@@ -1,94 +0,0 @@
-From 9221c7a6778a0d6e91180f925998d8511e740d6d Mon Sep 17 00:00:00 2001
-From: Chris Roberts <cpr420@gmail.com>
-Date: Wed, 25 Jun 2014 21:57:57 -0600
-Subject: Haiku fixes
-
-
-diff --git a/configure.ac b/configure.ac
-index c4a1aba..b7bbad2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -57,7 +57,7 @@ LTDL_INIT([recursive])
- dnl Checks for libraries.
- 
- dnl Checks for header files.
--AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h sys/time.h fcntl.h)
-+AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h stdint.h sys/time.h fcntl.h)
- AC_CHECK_HEADERS(sys/resource.h)
- AC_HEADER_DIRENT
- if test ${ac_header_dirent} = no; then
-diff --git a/libdb/db.h b/libdb/db.h
-index 67ab8f3..c648202 100644
---- a/libdb/db.h
-+++ b/libdb/db.h
-@@ -42,6 +42,9 @@
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#ifdef HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
- 
- #include "compat.h"
- 
-diff --git a/libutil/conf.h b/libutil/conf.h
-index 4a3a625..bfd7c73 100644
---- a/libutil/conf.h
-+++ b/libutil/conf.h
-@@ -29,7 +29,11 @@
-  */
- #define GTAGSCONF       "/etc/gtags.conf"
- #define DEBIANCONF      "/etc/gtags/gtags.conf"
-+#ifdef __HAIKU__
-+#define GTAGSRC    "globalrc"
-+#else
- #define GTAGSRC 	".globalrc"
-+#endif
- #ifdef __DJGPP__
- #define DOS_GTAGSRC	"_globalrc"
- #endif
-diff --git a/libutil/env.c b/libutil/env.c
-index d277578..1dfe23e 100644
---- a/libutil/env.c
-+++ b/libutil/env.c
-@@ -32,6 +32,11 @@
- #include <home_etc.h>
- #endif
- 
-+#ifdef __HAIKU__
-+#include <FindDirectory.h>
-+#include <fs_info.h>
-+#endif
-+
- #include "conf.h"
- #include "die.h"
- #include "env.h"
-@@ -74,6 +79,11 @@ get_home_directory(void)
- {
- #ifdef HAVE_HOME_ETC_H
- 	return _HEdir;
-+#elif defined(__HAIKU__)
-+	char buffer[B_PATH_NAME_LENGTH+B_FILE_NAME_LENGTH];
-+	if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, buffer, sizeof(buffer)) != B_OK)
-+		return NULL;
-+	return strdup(buffer);
- #else
- 	return getenv("HOME");
- #endif
-diff --git a/m4/check_curses.m4 b/m4/check_curses.m4
-index 14aaec5..a370ec6 100644
---- a/m4/check_curses.m4
-+++ b/m4/check_curses.m4
-@@ -240,6 +240,9 @@ AC_DEFUN([AC_SEARCH_NCURSES], [
- 
-     AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
- 
-+    AC_NCURSES(/boot/system/develop/headers, ncurses.h, -lncurses, -I/boot/system/develop/headers/, "ncurses in /boot/system")
-+    AC_NCURSES(/boot/home/config/develop/headers, ncurses.h, -lncurses, -I/boot/home/config/develop/headers, "ncurses in /boot/home/config")
-+
-     dnl
-     dnl We couldn't find ncurses, try SysV curses
-     dnl
--- 
-1.8.3.4
-

dev-util/global/patches/global-6.6.3.patchset

@@ -1,14 +1,14 @@
-From 9221c7a6778a0d6e91180f925998d8511e740d6d Mon Sep 17 00:00:00 2001
+From f31ae852ea345c15c165eae72fc97e2ab6ec6d5e Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Wed, 25 Jun 2014 21:57:57 -0600
 Subject: Haiku fixes
 
 
 diff --git a/configure.ac b/configure.ac
-index c4a1aba..b7bbad2 100644
+index ce217c2..16e8dd8 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -57,7 +57,7 @@ LTDL_INIT([recursive])
+@@ -60,7 +60,7 @@ LTDL_INIT([recursive])
  dnl Checks for libraries.
  
  dnl Checks for header files.
@@ -17,11 +17,32 @@ index c4a1aba..b7bbad2 100644
  AC_CHECK_HEADERS(sys/resource.h)
  AC_HEADER_DIRENT
  if test ${ac_header_dirent} = no; then
+diff --git a/gtags-cscope/find.c b/gtags-cscope/find.c
+index 650bbe1..3b950fb 100644
+--- a/gtags-cscope/find.c
++++ b/gtags-cscope/find.c
+@@ -540,6 +540,7 @@ findassign(char *pattern)
+ 	char **argv;
+ 	FILE *ip, *op;
+ 	char *opts[] = {"-d", "-rs", NULL};
++	int i;
+ 	STATIC_STRBUF(sb);
+ 	strbuf_clear(sb);
+ 
+@@ -554,7 +555,7 @@ findassign(char *pattern)
+ 	op = fopen(temp1, "w");
+ 	if (op == NULL)
+ 		return FAILED;
+-	for (int i = 0; opts[i] != NULL; i++) {
++	for (i = 0; opts[i] != NULL; i++) {
+ 		secure_open_args();
+ 		common();
+ 		secure_add_args(opts[i]);
 diff --git a/libdb/db.h b/libdb/db.h
-index 67ab8f3..c648202 100644
+index c13b67e..f4a68f4 100644
 --- a/libdb/db.h
 +++ b/libdb/db.h
-@@ -42,6 +42,9 @@
+@@ -40,6 +40,9 @@
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif
@@ -32,10 +53,10 @@ index 67ab8f3..c648202 100644
  #include "compat.h"
  
 diff --git a/libutil/conf.h b/libutil/conf.h
-index 4a3a625..bfd7c73 100644
+index 5ac4afc..93ceb0e 100644
 --- a/libutil/conf.h
 +++ b/libutil/conf.h
-@@ -29,7 +29,11 @@
+@@ -28,7 +28,11 @@
   */
  #define GTAGSCONF       "/etc/gtags.conf"
  #define DEBIANCONF      "/etc/gtags/gtags.conf"
@@ -48,7 +69,7 @@ index 4a3a625..bfd7c73 100644
  #define DOS_GTAGSRC	"_globalrc"
  #endif
 diff --git a/libutil/env.c b/libutil/env.c
-index d277578..1dfe23e 100644
+index 13148e2..4a83aa5 100644
 --- a/libutil/env.c
 +++ b/libutil/env.c
 @@ -32,6 +32,11 @@
@@ -90,5 +111,5 @@ index 14aaec5..a370ec6 100644
      dnl We couldn't find ncurses, try SysV curses
      dnl
 -- 
-1.8.3.4
+2.27.0