Convert/update idutils to working recipe

2026-04-23 12:10:06 +02:00 · 2013-10-16 16:23:49 -06:00
parent 95d86295a2
commit 55e012c492
4 changed files with 158 additions and 44 deletions
--- a/dev-util/idutils/idutils-20061208.recipe
+++ b/dev-util/idutils/idutils-20061208.recipe
@@ -1,22 +0,0 @@
-DESCRIPTION="Fast, high-capacity, identifier database tool." 
-HOMEPAGE="http://www.gnu.org/software/idutils/" 
-SRC_URI="http://ftp.gnu.org/gnu/idutils/idutils-cvs.tar.gz"
-CHECKSUM_MD5="75cd31c5401c329cdefc272c60c83422"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd idutils-cvs
-	libtoolize --force --copy --install
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd idutils-cvs
-	make install
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="1986-2006 Free Software Foundation, Inc."
--- a/dev-util/idutils/idutils-4.2.recipe
+++ b/dev-util/idutils/idutils-4.2.recipe
@@ -1,22 +0,0 @@
-DESCRIPTION="Fast, high-capacity, identifier database tool." 
-HOMEPAGE="http://www.gnu.org/software/idutils/" 
-SRC_URI="http://ftp.gnu.org/gnu/idutils/idutils-4.2.tar.gz"
-CHECKSUM_MD5="4bbd2cb0d566ab29e41088cc028ad710"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-BUILD()
-{
-	cd idutils-4.2
-	libtoolize --force --copy --install
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd idutils-4.2
-	make install
-}
-LICENSE="GNU GPL v2"
-COPYRIGHT="1986-2006 Free Software Foundation, Inc."
--- a/dev-util/idutils/idutils-4.6.recipe
+++ b/dev-util/idutils/idutils-4.6.recipe
@@ -0,0 +1,68 @@
+SUMMARY="Fast, high-capacity, identifier database tool."
+DESCRIPTION="
+An 'ID database' is a binary file containing a list of file names, a
+list of tokens, and a sparse matrix indicating which tokens appear
+in which files.
+
+With this database and some tools to query it, many text-searching
+tasks become simpler and faster.  For example, you can list all
+files that reference a particular #include' file throughout a huge
+source hierarchy, search for all the memos containing references to a
+project, or automatically invoke an editor on all files containing
+references to some function or variable.  Anyone with a large
+software project to maintain, or a large set of text files to
+organize, can benefit from the ID utilities."
+
+HOMEPAGE="http://www.gnu.org/software/idutils/" 
+SRC_URI="http://ftp.gnu.org/gnu/idutils/idutils-4.6.tar.xz"
+CHECKSUM_MD5="99b572536377fcddb4d38e86a3c215fd"
+REVISION="1"
+LICENSE="GNU GPL v2"
+COPYRIGHT="1986-2012 Free Software Foundation, Inc."
+SOURCE_DIR="$portVersionedName"
+ARCHITECTURES="x86 x86_gcc2"
+
+PATCHES="idutils-4.6.patchset"
+
+PROVIDES="
+	idutils = $portVersion compat >= 4
+	cmd:aid = $portVersion compat >= 4
+	cmd:defid = $portVersion compat >= 4
+	cmd:eid = $portVersion compat >= 4
+	cmd:fid = $portVersion compat >= 4
+	cmd:fnid = $portVersion compat >= 4
+	cmd:gid = $portVersion compat >= 4
+	cmd:lid = $portVersion compat >= 4
+	cmd:mkid = $portVersion compat >= 4
+	cmd:xtokid = $portVersion compat >= 4
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:make
+	cmd:ld
+	cmd:libtool
+	cmd:gawk
+	cmd:grep
+	cmd:perl
+	"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+}
--- a/dev-util/idutils/patches/idutils-4.6.patchset
+++ b/dev-util/idutils/patches/idutils-4.6.patchset
@@ -0,0 +1,90 @@
+From f6f317c96c42f23f161ef1b178c25e5f7de6dd05 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Mon, 14 Oct 2013 19:20:45 -0600
+Subject: Minor gcc2 fixes
+
+
+diff --git a/src/mkid.c b/src/mkid.c
+index 0c882f2..a9a95a4 100644
+--- a/src/mkid.c
+++ b/src/mkid.c
+@@ -212,6 +212,7 @@ main (int argc, char **argv)
+   bool ok;
+   int nfiles;
+   char *files_from = NULL;
+  struct argv_iterator *ai;
+ 
+   set_program_name (argv[0]);
+   heap_initial = get_process_heap();
+@@ -298,7 +299,6 @@ main (int argc, char **argv)
+ 
+   nfiles = argc - optind;
+ 
+-  struct argv_iterator *ai;
+   if (files_from)
+     {
+       /* When using --files0-from=F, you may not specify any files
+@@ -320,9 +320,10 @@ main (int argc, char **argv)
+   else
+     {
+       static char *cwd_only[2];
+      char **files;
+       cwd_only[0] = bad_cast (".");
+       cwd_only[1] = NULL;
+-      char **files = (optind < argc ? argv + optind : cwd_only);
+      files = (optind < argc ? argv + optind : cwd_only);
+       ai = argv_iter_init_argv (files);
+     }
+ 
+@@ -686,6 +687,7 @@ write_id_file (struct idhead *idhp)
+   int tok_size;
+   int max_buf_size = 0;
+   int max_vec_size = 0;
+  off_t off;
+ 
+   if (verbose_flag)
+     printf (_("Sorting tokens...\n"));
+@@ -709,7 +711,7 @@ write_id_file (struct idhead *idhp)
+   /* write out the list of pathnames */
+ 
+   fseek (idhp->idh_FILE, sizeof_idhead (), 0);
+-  off_t off = ftello (idhp->idh_FILE);
+  off = ftello (idhp->idh_FILE);
+   if (UINT32_MAX < off)
+     error (EXIT_FAILURE, 0, _("internal limitation: offset of 2^32 or larger"));
+   idhp->idh_flinks_offset = off;
+diff --git a/src/xtokid.c b/src/xtokid.c
+index a8d8d5a..b3f9ea9 100644
+--- a/src/xtokid.c
+++ b/src/xtokid.c
+@@ -113,6 +113,7 @@ main (int argc, char **argv)
+   bool ok;
+   int nfiles;
+   char *files_from = NULL;
+  struct argv_iterator *ai;
+ 
+   set_program_name (argv[0]);
+ 
+@@ -184,7 +185,6 @@ main (int argc, char **argv)
+ 
+   nfiles = argc - optind;
+ 
+-  struct argv_iterator *ai;
+   if (files_from)
+     {
+       /* When using --files0-from=F, you may not specify any files
+@@ -206,9 +206,10 @@ main (int argc, char **argv)
+   else
+      {
+       static char *cwd_only[2];
+      char **files;
+       cwd_only[0] = bad_cast (".");
+       cwd_only[1] = NULL;
+-      char **files = (optind < argc ? argv + optind : cwd_only);
+      files = (optind < argc ? argv + optind : cwd_only);
+       ai = argv_iter_init_argv (files);
+     }
+ 
+-- 
+1.8.3.4
+