[pkgsrc/trunk]: pkgsrc/pkgtools/rpm2pkg Update "rpm2pkg" package to version 2...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7944915778b6
branches:  trunk
changeset: 506768:7944915778b6
user:      tron <tron%pkgsrc.org@localhost>
date:      Sat Jan 21 20:46:29 2006 +0000

description:
Update "rpm2pkg" package to version 2.1.1. Changes since 2.1:
- Fixed GCC 4.x build warning (which would have resulted in an error
  with future GCC versions).
- Depend on newer version of "rpm" package to fix build under Mac OS X.

diffstat:

 pkgtools/rpm2pkg/Makefile        |  5 ++---
 pkgtools/rpm2pkg/files/rpm2pkg.c |  6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (33 lines):

diff -r 1512f8461e11 -r 7944915778b6 pkgtools/rpm2pkg/Makefile
--- a/pkgtools/rpm2pkg/Makefile Sat Jan 21 20:44:08 2006 +0000
+++ b/pkgtools/rpm2pkg/Makefile Sat Jan 21 20:46:29 2006 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:51 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2006/01/21 20:46:29 tron Exp $
 
-DISTNAME=      rpm2pkg-2.1
-PKGREVISION=   1
+DISTNAME=      rpm2pkg-2.1.1
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 1512f8461e11 -r 7944915778b6 pkgtools/rpm2pkg/files/rpm2pkg.c
--- a/pkgtools/rpm2pkg/files/rpm2pkg.c  Sat Jan 21 20:44:08 2006 +0000
+++ b/pkgtools/rpm2pkg/files/rpm2pkg.c  Sat Jan 21 20:46:29 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpm2pkg.c,v 1.5 2004/05/27 10:28:00 tron Exp $ */
+/*     $NetBSD: rpm2pkg.c,v 1.6 2006/01/21 20:46:29 tron Exp $ */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -261,8 +261,8 @@
        PListEntry *Node;
 
        while ((Node = *Tree) != NULL) {
-               Tree = &((strcmp(Name, Node->pe_Name) <0) ?
-                   Node->pe_Left : Node->pe_Right);
+               Tree = (strcmp(Name, Node->pe_Name) <0) ?
+                   &Node->pe_Left : &Node->pe_Right;
        }
 
        if ((Node = calloc(1, sizeof (PListEntry) + strlen(Name))) == NULL) {