From 59e94b4ef7bb901b0f110507a162ddf7963ff561 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Thu, 13 Nov 2014 21:21:57 -0700 Subject: [PATCH] global: update to 6.3 * remove old version --- ...{global-6.2.9.recipe => global-6.3.recipe} | 23 ++++---- ...global-6.2.9.patch => global-6.3.patchset} | 59 +++++++++++-------- 2 files changed, 48 insertions(+), 34 deletions(-) rename dev-util/global/{global-6.2.9.recipe => global-6.3.recipe} (71%) rename dev-util/global/patches/{global-6.2.9.patch => global-6.3.patchset} (55%) diff --git a/dev-util/global/global-6.2.9.recipe b/dev-util/global/global-6.3.recipe similarity index 71% rename from dev-util/global/global-6.2.9.recipe rename to dev-util/global/global-6.3.recipe index 9293a643a..e314fa1c9 100644 --- a/dev-util/global/global-6.2.9.recipe +++ b/dev-util/global/global-6.3.recipe @@ -9,25 +9,26 @@ 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/" -SRC_URI="http://ftp.gnu.org/pub/gnu/global/global-6.2.9.tar.gz" -CHECKSUM_SHA256="d8d831cbd9bac9f51598af316231290cc328e4f18dc29b58a2f2ae0fee44c303" -REVISION="2" +SRC_URI="http://ftp.gnu.org/pub/gnu/global/global-6.3.tar.gz" +CHECKSUM_SHA256="c91c741ebf5a27fcb3a61c93f2ee4b97ba265ecb2f48644751d0d5e133c3f8db" +REVISION="1" LICENSE="GNU GPL v3" COPYRIGHT="2000-2013 Tama Communications Corporation 2007-2013 Free Software Foundation, Inc." ARCHITECTURES="x86 x86_gcc2" -PATCHES="global-6.2.9.patch" +PATCHES="global-6.3.patchset" PROVIDES=" - global = $portVersion compat >= 6.2 - cmd:global = $portVersion compat >= 6.2 - cmd:gtags = $portVersion compat >= 6.2 - cmd:globash = $portVersion compat >= 6.2 - cmd:gozilla = $portVersion compat >= 6.2 - cmd:gtags_cscope = $portVersion compat >= 6.2 - cmd:htags = $portVersion compat >= 6.2 + global = $portVersion compat >= 6.3 + cmd:global = $portVersion compat >= 6.3 + cmd:gtags = $portVersion compat >= 6.3 + cmd:globash = $portVersion compat >= 6.3 + cmd:gozilla = $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=" diff --git a/dev-util/global/patches/global-6.2.9.patch b/dev-util/global/patches/global-6.3.patchset similarity index 55% rename from dev-util/global/patches/global-6.2.9.patch rename to dev-util/global/patches/global-6.3.patchset index 04be1bf5d..7537032a2 100644 --- a/dev-util/global/patches/global-6.2.9.patch +++ b/dev-util/global/patches/global-6.3.patchset @@ -1,6 +1,13 @@ -diff -up global-6.2.9/configure.ac.orig global-6.2.9/configure.ac ---- global-6.2.9/configure.ac.orig 2013-08-26 00:22:17.045350912 -0600 -+++ global-6.2.9/configure.ac 2013-10-16 16:41:31.312475648 -0600 +From 9221c7a6778a0d6e91180f925998d8511e740d6d Mon Sep 17 00:00:00 2001 +From: Chris Roberts +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. @@ -10,9 +17,10 @@ diff -up global-6.2.9/configure.ac.orig global-6.2.9/configure.ac AC_CHECK_HEADERS(sys/resource.h) AC_HEADER_DIRENT if test ${ac_header_dirent} = no; then -diff -up global-6.2.9/libdb/db.h.orig global-6.2.9/libdb/db.h ---- global-6.2.9/libdb/db.h.orig 2013-08-26 00:22:17.003407872 -0600 -+++ global-6.2.9/libdb/db.h 2013-10-16 16:41:31.329252864 -0600 +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 @@ -23,25 +31,26 @@ diff -up global-6.2.9/libdb/db.h.orig global-6.2.9/libdb/db.h #include "compat.h" -diff -up global-6.2.9/libutil/conf.c.orig global-6.2.9/libutil/conf.c -diff -up global-6.2.9/libutil/conf.h.orig global-6.2.9/libutil/conf.h ---- global-6.2.9/libutil/conf.h.orig 2013-08-26 00:22:17.054001664 -0600 -+++ global-6.2.9/libutil/conf.h 2013-10-16 16:41:31.350748672 -0600 -@@ -35,7 +35,11 @@ - - /** for compatibility */ - #define OLD_DEBIANCONF "/etc/gtags/global.conf" +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" ++#define GTAGSRC "globalrc" +#else #define GTAGSRC ".globalrc" +#endif #ifdef __DJGPP__ #define DOS_GTAGSRC "_globalrc" #endif -diff -up global-6.2.9/libutil/env.c.orig global-6.2.9/libutil/env.c ---- global-6.2.9/libutil/env.c.orig 2013-10-16 16:48:01.123731968 -0600 -+++ global-6.2.9/libutil/env.c 2013-10-16 16:50:38.467402752 -0600 +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 #endif @@ -51,10 +60,10 @@ diff -up global-6.2.9/libutil/env.c.orig global-6.2.9/libutil/env.c +#include +#endif + + #include "conf.h" #include "die.h" #include "env.h" - #include "strbuf.h" -@@ -72,6 +77,11 @@ get_home_directory(void) +@@ -74,6 +79,11 @@ get_home_directory(void) { #ifdef HAVE_HOME_ETC_H return _HEdir; @@ -66,9 +75,10 @@ diff -up global-6.2.9/libutil/env.c.orig global-6.2.9/libutil/env.c #else return getenv("HOME"); #endif -diff -up global-6.2.9/m4/check_curses.m4.orig global-6.2.9/m4/check_curses.m4 ---- global-6.2.9/m4/check_curses.m4.orig 2013-08-26 00:22:17.045088768 -0600 -+++ global-6.2.9/m4/check_curses.m4 2013-10-16 16:41:31.338690048 -0600 +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") @@ -79,3 +89,6 @@ diff -up global-6.2.9/m4/check_curses.m4.orig global-6.2.9/m4/check_curses.m4 dnl dnl We couldn't find ncurses, try SysV curses dnl +-- +1.8.3.4 +