diff options
| author | tron <tron@pkgsrc.org> | 2010-09-08 22:41:39 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2010-09-08 22:41:39 +0000 |
| commit | 5d9ae57df4a057cc7082b87ae2dad138b3e9b70d (patch) | |
| tree | ee54f730ac966203762743c16707bb85a082cd0c /pkgtools/rpm2pkg | |
| parent | d2a998c8febaef92feaa282c1f72fe11f0ce9ab2 (diff) | |
| download | pkgsrc-5d9ae57df4a057cc7082b87ae2dad138b3e9b70d.tar.gz | |
Update "rpm2pkg" package to version 3.1.5:
- Use "@pkgdir" instead of "@exec mkdir ..." to create empty directories.
- Don't add "@dirrm" lines for empty directories as they are now deleted
automatically.
Based on a suggestion by Thomas Klausner in private e-mail.
Diffstat (limited to 'pkgtools/rpm2pkg')
| -rw-r--r-- | pkgtools/rpm2pkg/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/rpm2pkg/files/rpm2pkg.c | 11 |
2 files changed, 5 insertions, 10 deletions
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile index 8fb493ad2c6..2d0c0efa940 100644 --- a/pkgtools/rpm2pkg/Makefile +++ b/pkgtools/rpm2pkg/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.51 2010/09/07 17:32:05 tron Exp $ +# $NetBSD: Makefile,v 1.52 2010/09/08 22:41:39 tron Exp $ -DISTNAME= rpm2pkg-3.1.4 +DISTNAME= rpm2pkg-3.1.5 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/rpm2pkg/files/rpm2pkg.c b/pkgtools/rpm2pkg/files/rpm2pkg.c index 82fd894215f..406e6c6e8b3 100644 --- a/pkgtools/rpm2pkg/files/rpm2pkg.c +++ b/pkgtools/rpm2pkg/files/rpm2pkg.c @@ -1,4 +1,4 @@ -/* $NetBSD: rpm2pkg.c,v 1.16 2010/09/07 17:32:05 tron Exp $ */ +/* $NetBSD: rpm2pkg.c,v 1.17 2010/09/08 22:41:39 tron Exp $ */ /*- * Copyright (c) 2001-2010 The NetBSD Foundation, Inc. @@ -140,7 +140,6 @@ typedef struct PListEntryStruct PListEntry; struct PListEntryStruct { PListEntry *pe_Childs[2]; int pe_DirEmpty; - mode_t pe_DirMode; unsigned long pe_INode; char *pe_Link; char pe_Name[1]; @@ -510,9 +509,7 @@ PListEntryMakeDir(PListEntry *Node, FILE *Out) { if (Node->pe_DirEmpty) { - (void)fprintf(Out, "@exec mkdir -m %o -p %%D/%s\n", - Node->pe_DirMode, Node->pe_Name); - (void)fprintf(Out, "@dirrm %s\n", Node->pe_Name); + (void)fprintf(Out, "@pkgdir %s\n", Node->pe_Name); } } @@ -665,8 +662,7 @@ MakeTargetDir(char *Name, PListEntry **Dirs) } else if (errno != ENOENT) { Result = false; } else if ((Result = (mkdir(Name, S_IRWXU|S_IRWXG|S_IRWXO) == 0))) { - InsertPListEntry(Dirs, Name)->pe_DirMode = - S_IRWXU|S_IRWXG|S_IRWXO; + (void)InsertPListEntry(Dirs, Name); } *Basename = '/'; @@ -996,7 +992,6 @@ main(int argc, char **argv) if (!OldDir) { Dir = InsertPListEntry(&Dirs, Name); Dir->pe_DirEmpty = true; - Dir->pe_DirMode = Mode; } break; } |