pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/id-utils welcome to idutils-4.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/65f161521d11
branches: trunk
changeset: 517121:65f161521d11
user: christos <christos%pkgsrc.org@localhost>
date: Fri Aug 04 19:23:39 2006 +0000
description:
welcome to idutils-4.1
diffstat:
devel/id-utils/Makefile | 10 +-
devel/id-utils/PLIST | 12 +-
devel/id-utils/distinfo | 35 ++---
devel/id-utils/patches/patch-aa | 33 ++--
devel/id-utils/patches/patch-ab | 106 +---------------
devel/id-utils/patches/patch-ac | 254 ++-------------------------------------
devel/id-utils/patches/patch-ad | 31 +++-
devel/id-utils/patches/patch-ah | 61 ++++++--
devel/id-utils/patches/patch-ai | 75 +++++-----
devel/id-utils/patches/patch-aj | 85 ++++++++++--
devel/id-utils/patches/patch-ak | 75 +++++-----
devel/id-utils/patches/patch-al | 43 ------
devel/id-utils/patches/patch-am | 30 ----
devel/id-utils/patches/patch-an | 18 --
devel/id-utils/patches/patch-ao | 22 ---
devel/id-utils/patches/patch-ap | 19 --
devel/id-utils/patches/patch-ar | 47 -------
devel/id-utils/patches/patch-as | 13 --
devel/id-utils/patches/patch-at | 23 ---
19 files changed, 277 insertions(+), 715 deletions(-)
diffs (truncated from 1120 to 300 lines):
diff -r 28a5d213b8f3 -r 65f161521d11 devel/id-utils/Makefile
--- a/devel/id-utils/Makefile Fri Aug 04 18:41:35 2006 +0000
+++ b/devel/id-utils/Makefile Fri Aug 04 19:23:39 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.46 2006/04/13 18:23:31 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2006/08/04 19:23:39 christos Exp $
-DISTNAME= id-utils-3.2
-PKGREVISION= 9
+DISTNAME= idutils-4.1
+#PKGREVISION= 0
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNU:=id-utils/}
+MASTER_SITES= ${MASTER_SITE_GNU:=idutils/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.gnu.org/software/idutils/idutils.html
@@ -28,6 +28,6 @@
.include "../../devel/gettext-lib/buildlink3.mk"
post-install:
- ${INSTALL_DATA} ${WRKSRC}/lisp/id-utils.el ${LISPDIR}
+ ${INSTALL_DATA} ${WRKSRC}/lisp/idutils.el ${LISPDIR}
.include "../../mk/bsd.pkg.mk"
diff -r 28a5d213b8f3 -r 65f161521d11 devel/id-utils/PLIST
--- a/devel/id-utils/PLIST Fri Aug 04 18:41:35 2006 +0000
+++ b/devel/id-utils/PLIST Fri Aug 04 19:23:39 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/17 07:07:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/08/04 19:23:39 christos Exp $
bin/aid
bin/defid
bin/eid
@@ -8,8 +8,10 @@
bin/lid
bin/mkid
bin/xtokid
-info/id-utils.info
-share/emacs/site-lisp/id-utils.el
+info/idutils.info
+share/emacs/site-lisp/idutils.el
share/id-lang.map
-share/locale/de/LC_MESSAGES/id-utils.mo
-share/locale/fr/LC_MESSAGES/id-utils.mo
+share/locale/de/LC_MESSAGES/idutils.mo
+share/locale/fr/LC_MESSAGES/idutils.mo
+share/locale/nl/LC_MESSAGES/idutils.mo
+share/locale/pl/LC_MESSAGES/idutils.mo
diff -r 28a5d213b8f3 -r 65f161521d11 devel/id-utils/distinfo
--- a/devel/id-utils/distinfo Fri Aug 04 18:41:35 2006 +0000
+++ b/devel/id-utils/distinfo Fri Aug 04 19:23:39 2006 +0000
@@ -1,21 +1,16 @@
-$NetBSD: distinfo,v 1.15 2006/06/09 22:30:57 dbj Exp $
+$NetBSD: distinfo,v 1.16 2006/08/04 19:23:39 christos Exp $
-SHA1 (id-utils-3.2.tar.gz) = 14d96a2170745883d077fa8c436e4380f28951a5
-RMD160 (id-utils-3.2.tar.gz) = 4dada22d46cf791cf9ed61c69bbcafb0b9b1f99d
-Size (id-utils-3.2.tar.gz) = 388012 bytes
-SHA1 (patch-aa) = 69cdce8f83d043ffabbec7639423e35a46a97175
-SHA1 (patch-ab) = aee2109a3cce77022cf4611542130fadc3842063
-SHA1 (patch-ac) = 67667057c39e7c5df048f22d2291649280c4299a
-SHA1 (patch-ad) = cd13aea19f0ac5dcdc8695ce40b409ecb15b1ec0
-SHA1 (patch-ah) = 962276de4a6582e88e3eea8a6c2f8246c958bea0
-SHA1 (patch-ai) = be9f59a6a2e84338d6df945ba5d10285d3205560
-SHA1 (patch-aj) = 7f2b3f1eaadfc3a71169d16010375eaf0ce96b46
-SHA1 (patch-ak) = c9f017d6ba122ae1dabf10e97dea640e2b10ef76
-SHA1 (patch-al) = fcc31539fd3731797544670fb804904980a6c7ce
-SHA1 (patch-am) = 137ffa727d505975b775c0a877f1ac9af9cf58a7
-SHA1 (patch-an) = 6e300f1c175085fe4190e31a0f3673714b51585b
-SHA1 (patch-ao) = 3fa01e9d9482695a1727a34eb8e3caf4f3572325
-SHA1 (patch-ap) = 8bff727bc838b77ca6bcd859fc38803d0d8ca00c
-SHA1 (patch-ar) = b6249d63e76d77f1ddc29b74c8c896c42ed313f5
-SHA1 (patch-as) = 6c5044fb3b781c7764783109368501f4f13393dd
-SHA1 (patch-at) = f8e7c43b6fa912cc4e902596e160fe453b9d2932
+SHA1 (idutils-4.1.tar.gz) = 3ce5524b2962fc785d44a3ee73d32ebf975d70d1
+RMD160 (idutils-4.1.tar.gz) = 7ddadd6a97e2a096916f9ac20ccffff14cc2a330
+Size (idutils-4.1.tar.gz) = 696756 bytes
+SHA1 (patch-aa) = f957a2af9470e41c1b423b9c753456e68a46405c
+SHA1 (patch-ab) = 96a1ec3d8c49da9538342450df41c7cd17c0d21c
+SHA1 (patch-ac) = 714cc320a02235c7d49b0ea37be60cff36f6a07b
+SHA1 (patch-ad) = 05f6be0337f599736627d5bf372529e36ca22246
+SHA1 (patch-ae) = cdf05fd02278065908bdc16b599b881f6b1112ea
+SHA1 (patch-af) = 223ae437d90f98499b8095254fcca1d2651c11a1
+SHA1 (patch-ag) = d1e3dfcaa905041b12f458b3fc186ebf2fa633a1
+SHA1 (patch-ah) = d60a3738ed5b9b9db01c557b2c6e4922b913a2e7
+SHA1 (patch-ai) = ebf6092918830c95308a4a1b9145314c5fecbd58
+SHA1 (patch-aj) = 6435ee17529ab3782b340f51c7e43390aaae662d
+SHA1 (patch-ak) = c5f56cabfe54bd653874c58d55b1c198526707fb
diff -r 28a5d213b8f3 -r 65f161521d11 devel/id-utils/patches/patch-aa
--- a/devel/id-utils/patches/patch-aa Fri Aug 04 18:41:35 2006 +0000
+++ b/devel/id-utils/patches/patch-aa Fri Aug 04 19:23:39 2006 +0000
@@ -1,16 +1,21 @@
-$NetBSD: patch-aa,v 1.2 1999/08/01 14:37:27 mrg Exp $
+$NetBSD: patch-aa,v 1.3 2006/08/04 19:23:39 christos Exp $
---- src/lid.c.orig Sun Aug 1 02:08:35 1999
-+++ src/lid.c Sun Aug 1 02:09:38 1999
-@@ -563,7 +563,10 @@
- maybe_relative_file_name (file_name, *flinkv++, cw_dlink);
- gid_FILE = fopen (file_name, "r");
- if (gid_FILE == 0)
-- error (0, errno, "can't open `%s'", file_name);
-+ {
-+ error (0, errno, "can't open `%s'", file_name);
-+ continue;
-+ }
+--- libidu/fnprint.c.orig 2005-12-27 00:21:33.000000000 -0500
++++ libidu/fnprint.c 2006-08-03 12:58:44.026747335 -0400
+@@ -19,7 +19,6 @@
+ #include <config.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <alloca.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <pathmax.h>
+@@ -82,7 +81,7 @@
+ struct file_link const *arg;
+ struct file_link const *dlink;
+ int brace_is_open = 0;
+- char *file_name = alloca (sizeof(char) * PATH_MAX);
++ char file_name[sizeof(char) * PATH_MAX];
- line_number = 0;
- while (fgets (&line[1], sizeof (line), gid_FILE))
+ while (*flinkv)
+ {
diff -r 28a5d213b8f3 -r 65f161521d11 devel/id-utils/patches/patch-ab
--- a/devel/id-utils/patches/patch-ab Fri Aug 04 18:41:35 2006 +0000
+++ b/devel/id-utils/patches/patch-ab Fri Aug 04 19:23:39 2006 +0000
@@ -1,99 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2002/02/27 09:07:43 joda Exp $
+$NetBSD: patch-ab,v 1.3 2006/08/04 19:23:39 christos Exp $
---- libidu/walker.c.orig Wed Jul 17 22:43:41 1996
-+++ libidu/walker.c Wed Feb 27 09:57:28 2002
-@@ -33,7 +33,6 @@
- #include "dynvec.h"
- #include "scanners.h"
- #include "pathmax.h"
--#include "xalloca.h"
-
- int walk_dir __P((struct file_link *dir_link));
- struct member_file *get_member_file __P((struct file_link *flink));
-@@ -98,7 +97,7 @@
- dirp = opendir (".");
- if (dirp == 0)
- {
-- char *file_name = ALLOCA (char, PATH_MAX);
-+ char file_name[PATH_MAX];
- absolute_file_name (file_name, dir_link);
- error (0, errno, _("can't read directory `%s' (`.' from `%s')"), file_name, xgetcwd ());
- return 0;
-@@ -116,6 +115,8 @@
- continue;
+--- libidu/idfile.h.orig 2005-11-01 04:18:33.000000000 -0500
++++ libidu/idfile.h 2006-08-03 13:00:35.159831999 -0400
+@@ -147,7 +147,7 @@
- flink = get_link_from_dirent (dirent, dir_link);
-+ if (flink == 0)
-+ break;
- if (!(flink->fl_flags & FL_PRUNE))
- walk_flink (flink, sub_dirs_vec);
- }
-@@ -165,7 +166,7 @@
- if ((old_flags & FL_TYPE_MASK)
- && (old_flags & FL_TYPE_MASK) != (new_flags & FL_TYPE_MASK))
- {
-- char *file_name = ALLOCA (char, PATH_MAX);
-+ char file_name[PATH_MAX];
- absolute_file_name (file_name, flink);
- error (0, 0, _("notice: `%s' was a %s, but is now a %s!"), file_name,
- (FL_IS_FILE (old_flags) ? _("file") : _("directory")),
-@@ -284,8 +285,8 @@
- int alias_ancestry = symlink_ancestry (alias_link);
- if (member->mf_lang_args != alias_member->mf_lang_args)
- {
-- char *file_name = ALLOCA (char, PATH_MAX);
-- char *alias_file_name = ALLOCA (char, PATH_MAX);
-+ char file_name[PATH_MAX];
-+ char alias_file_name[PATH_MAX];
- absolute_file_name (file_name, flink);
- absolute_file_name (alias_file_name, alias_link);
- error (0, 0, _("warning: `%s' and `%s' are the same file, but yield different scans!"),
-@@ -380,7 +381,7 @@
- #if 0
- if (member->mf_lang_args != args)
- {
-- char *file_name = ALLOCA (char, PATH_MAX);
-+ char file_name[PATH_MAX];
- absolute_file_name (file_name, flink);
- error (0, 0, _("notice: scan parameters changed for `%s'"), file_name);
- member->mf_old_index = -1;
-@@ -418,7 +419,7 @@
- {
- if (strchr (args->la_pattern, SLASH_CHAR))
- {
-- char *file_name = ALLOCA (char, PATH_MAX);
-+ char file_name[PATH_MAX];
- absolute_file_name (file_name, flink);
- if (fnmatch (args->la_pattern, file_name, MAYBE_FNM_CASEFOLD | FNM_FILE_NAME) == 0)
- return (args->la_language ? args : 0);
-@@ -622,7 +623,7 @@
- int
- chdir_to_link (struct file_link *dir_link)
- {
-- char *to_dir_name = ALLOCA (char, PATH_MAX);
-+ char to_dir_name[PATH_MAX];
+ #define token_string(buf) (buf)
+ extern unsigned int token_flags (char const *buf);
+-extern unsigned short token_count (char const *buf);
++extern unsigned int token_count (char const *buf);
+ extern unsigned char const *token_hits_addr (char const *buf);
- if (current_dir_link == dir_link)
- return 1;
-@@ -637,7 +638,7 @@
- error (0, errno, _("can't chdir to `%s'"), to_dir_name);
- else
- {
-- char *from_dir_name = ALLOCA (char, PATH_MAX);
-+ char from_dir_name[PATH_MAX];
- absolute_file_name (from_dir_name, current_dir_link);
- error (0, errno, _("can't chdir to `%s' from `%s'"), to_dir_name, from_dir_name);
- }
-@@ -811,8 +812,10 @@
- char *
- maybe_relative_file_name (char *buf_0, struct file_link const *to_link, struct file_link const *from_link)
- {
-- struct file_link const **to_link_vec_0 = ALLOCA (struct file_link const *, PATH_MAX/2);
-- struct file_link const **from_link_vec_0 = ALLOCA (struct file_link const *, PATH_MAX/2);
-+ struct file_link const *to_link_vec_1[PATH_MAX/2];
-+ struct file_link const *from_link_vec_1[PATH_MAX/2];
-+ struct file_link const **to_link_vec_0 = to_link_vec_1;
-+ struct file_link const **from_link_vec_0 = from_link_vec_1;
- struct file_link const **to_link_vec = to_link_vec_0;
- struct file_link const **from_link_vec = from_link_vec_0;
- struct file_link const **from_link_end;
+ #define MAYBE_RETURN_PREFIX_MATCH(arg, str, val) do { \
diff -r 28a5d213b8f3 -r 65f161521d11 devel/id-utils/patches/patch-ac
--- a/devel/id-utils/patches/patch-ac Fri Aug 04 18:41:35 2006 +0000
+++ b/devel/id-utils/patches/patch-ac Fri Aug 04 19:23:39 2006 +0000
@@ -1,241 +1,19 @@
-$NetBSD: patch-ac,v 1.4 2003/01/08 02:36:00 thorpej Exp $
+$NetBSD: patch-ac,v 1.5 2006/08/04 19:23:39 christos Exp $
---- libidu/scanners.c.orig Tue Jan 7 18:24:27 2003
-+++ libidu/scanners.c Tue Jan 7 18:24:29 2003
-@@ -44,6 +44,19 @@
- extern void usage __P((void));
- extern char *program_name;
-
-+static char *id_0;
-+static size_t id_0_len;
-+#define APPEND_CHAR(C) do { \
-+ if(id_0 == NULL || id == id_0 + id_0_len) { \
-+ size_t __pos = id_0 ? id - id_0 : 0; \
-+ id_0 = xrealloc(id_0, id_0_len + BUFSIZ); \
-+ id_0_len += BUFSIZ; \
-+ id = id_0 + __pos; \
-+ } \
-+ *id++ = (C); \
-+ } while(0);
-+
-+
- /****************************************************************************/
-
- struct lang_args **parse_language_map_file __P((char const *file_name, struct lang_args **next_ptr));
-@@ -65,8 +78,14 @@
- struct language languages_0[] =
- {
- { "C", parse_args_c, get_token_c, help_me_c },
-+ { "C++", parse_args_c, get_token_c, help_me_c },
-+ { "cpp", parse_args_c, get_token_c, help_me_c },
-+ { "cc", parse_args_c, get_token_c, help_me_c },
- { "asm", parse_args_asm, get_token_asm, help_me_asm },
-+ { "S", parse_args_asm, get_token_asm, help_me_asm },
-+ { "s", parse_args_asm, get_token_asm, help_me_asm },
- { "text", parse_args_text, get_token_text, help_me_text },
-+ { "make", parse_args_text, get_token_text, help_me_text },
- };
- struct language const *languages_N = &languages_0[cardinalityof (languages_0)];
-
-@@ -482,7 +501,6 @@
- #define ARGS ((struct args_c const *) args)
- static int new_line = 1;
- unsigned short const *rct = &ARGS->ctype[1];
-- char id_0[BUFSIZ];
- char *id = id_0;
- int c;
+--- libidu/idread.c.orig 2005-12-27 00:23:18.000000000 -0500
++++ libidu/idread.c 2006-08-03 12:27:38.779542243 -0400
+@@ -211,12 +211,12 @@
+ #define TOK_COUNT_ADDR(buf) ((unsigned char const *)(TOK_FLAGS_ADDR (buf) + 1))
+ #define TOK_HITS_ADDR(buf) ((unsigned char const *)(TOK_COUNT_ADDR (buf) + 2))
-@@ -501,10 +519,10 @@
- if (!ISID1ST (c))
Home |
Main Index |
Thread Index |
Old Index