summaryrefslogtreecommitdiff
path: root/pkgtools/rpm2pkg
diff options
context:
space:
mode:
authorjoerg <joerg>2009-06-14 22:44:34 +0000
committerjoerg <joerg>2009-06-14 22:44:34 +0000
commit11587cacbe4a71558340e8cbbe3629721b78f78c (patch)
tree0c66d00e99d226053ae1c03b46ee8e422f879ef0 /pkgtools/rpm2pkg
parent73ddfe4e28b2e706fdbd550a6d123c639b9d2d77 (diff)
downloadpkgsrc-11587cacbe4a71558340e8cbbe3629721b78f78c.tar.gz
Drop @dirrm related logic. Bump version.
Diffstat (limited to 'pkgtools/rpm2pkg')
-rw-r--r--pkgtools/rpm2pkg/Makefile4
-rw-r--r--pkgtools/rpm2pkg/files/rpm2pkg.c11
2 files changed, 3 insertions, 12 deletions
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile
index 0c6237ef361..042dad875bc 100644
--- a/pkgtools/rpm2pkg/Makefile
+++ b/pkgtools/rpm2pkg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2009/05/19 08:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2009/06/14 22:44:34 joerg Exp $
-DISTNAME= rpm2pkg-2.2
+DISTNAME= rpm2pkg-2.3
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/rpm2pkg/files/rpm2pkg.c b/pkgtools/rpm2pkg/files/rpm2pkg.c
index 00cf7b26d6a..12cb11b2869 100644
--- a/pkgtools/rpm2pkg/files/rpm2pkg.c
+++ b/pkgtools/rpm2pkg/files/rpm2pkg.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rpm2pkg.c,v 1.7 2009/04/23 21:38:02 tron Exp $ */
+/* $NetBSD: rpm2pkg.c,v 1.8 2009/06/14 22:44:34 joerg Exp $ */
/*-
* Copyright (c) 2004-2009 The NetBSD Foundation, Inc.
@@ -354,13 +354,6 @@ PListEntryMakeDir(PListEntry *Node, FILE *Out)
}
static void
-PListEntryRemoveDir(PListEntry *Node, FILE *Out)
-
-{
- (void)fprintf(Out, "@dirrm %s\n", Node->pe_Name);
-}
-
-static void
ProcessPList(PListEntry *Tree, PListEntryFunc Func, int Order, FILE *Out)
{
@@ -954,8 +947,6 @@ main(int argc, char **argv)
PListFile);
ProcessPList(Links, PListEntryLink, PLIST_ORDER_FORWARD,
PListFile);
- ProcessPList(Dirs, PListEntryRemoveDir, PLIST_ORDER_BACKWARD,
- PListFile);
(void)fclose(PListFile);
}