[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/lib Sync with 20050529 in s...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/44302ebd0693
branches:  trunk
changeset: 494761:44302ebd0693
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sun May 29 19:20:53 2005 +0000

description:
Sync with 20050529 in src/.

If a pattern does not have any suffix, assume that it matches both
".tbz" and ".tgz".  This allows to install binary package dependencies
that are not exact matches, but satisfy requirements.

diffstat:

 pkgtools/pkg_install/files/lib/str.c     |  6 +++---
 pkgtools/pkg_install/files/lib/version.h |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 3a801880f2ed -r 44302ebd0693 pkgtools/pkg_install/files/lib/str.c
--- a/pkgtools/pkg_install/files/lib/str.c      Sun May 29 17:20:54 2005 +0000
+++ b/pkgtools/pkg_install/files/lib/str.c      Sun May 29 19:20:53 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: str.c,v 1.10 2004/12/29 12:16:56 agc Exp $     */
+/*     $NetBSD: str.c,v 1.11 2005/05/29 19:20:53 minskim Exp $ */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "Id: str.c,v 1.5 1997/10/08 07:48:21 charnier Exp";
 #else
-__RCSID("$NetBSD: str.c,v 1.10 2004/12/29 12:16:56 agc Exp $");
+__RCSID("$NetBSD: str.c,v 1.11 2005/05/29 19:20:53 minskim Exp $");
 #endif
 #endif
 
@@ -485,7 +485,7 @@
                 * each is a different pattern class (e.g. dewey and
                 * character class (.t[bg]z)) */
                if (pmatch(tmp_pattern, tmp_file)
-                   && pmatch(pat_sfx, file_sfx)) {
+                   && (pat_sfx[0] == '\0' || pmatch(pat_sfx, file_sfx))) {
                        if (match) {
                                match(dp->d_name, data);
                                /* return value ignored for now */
diff -r 3a801880f2ed -r 44302ebd0693 pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Sun May 29 17:20:54 2005 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Sun May 29 19:20:53 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.43 2005/05/28 02:50:46 dmcmahill Exp $   */
+/*     $NetBSD: version.h,v 1.44 2005/05/29 19:20:53 minskim Exp $     */
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -33,6 +33,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION "20050527"
+#define PKGTOOLS_VERSION "20050529"
 
 #endif /* _INST_LIB_VERSION_H_ */