diff options
| author | tron <tron> | 2006-01-21 20:46:29 +0000 |
|---|---|---|
| committer | tron <tron> | 2006-01-21 20:46:29 +0000 |
| commit | fa6accad328e06de61d4fa8386f91308b00309e0 (patch) | |
| tree | c1dcbd0b2f2d772f4d37cc04d1fa17c823d0ca03 /pkgtools/rpm2pkg | |
| parent | 05afb9543a8abac60e7e1a19abc5b8f9553d721f (diff) | |
| download | pkgsrc-fa6accad328e06de61d4fa8386f91308b00309e0.tar.gz | |
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 (limited to 'pkgtools/rpm2pkg')
| -rw-r--r-- | pkgtools/rpm2pkg/Makefile | 5 | ||||
| -rw-r--r-- | pkgtools/rpm2pkg/files/rpm2pkg.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile index 9974cb3d8b3..9052253ab32 100644 --- a/pkgtools/rpm2pkg/Makefile +++ b/pkgtools/rpm2pkg/Makefile @@ -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 --git a/pkgtools/rpm2pkg/files/rpm2pkg.c b/pkgtools/rpm2pkg/files/rpm2pkg.c index 4230d55e723..b83285d1f34 100644 --- a/pkgtools/rpm2pkg/files/rpm2pkg.c +++ b/pkgtools/rpm2pkg/files/rpm2pkg.c @@ -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 @@ InsertPListEntry(PListEntry **Tree,char *Name) 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) { |