Update "rpm2pkg" package to version 3.2.2:

- Remove unused CheckSymLinks() function to fix build problems under
  DragonFly BSD.

This fixes PR pkg/44862 by Francois Tigeot.

2 files changed, 3 insertions, 49 deletions

diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile
index fde227b149c..6a69f47c147 100644
--- a/pkgtools/rpm2pkg/Makefile
+++ b/pkgtools/rpm2pkg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2011/01/19 16:23:02 tron Exp $
+# $NetBSD: Makefile,v 1.58 2011/04/12 22:12:41 tron Exp $
 
-DISTNAME=	rpm2pkg-3.2.1
+DISTNAME=	rpm2pkg-3.2.2
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/rpm2pkg/files/rpm2pkg.c b/pkgtools/rpm2pkg/files/rpm2pkg.c
index 7402a12d460..0ebd76ff4c4 100644
--- a/pkgtools/rpm2pkg/files/rpm2pkg.c
+++ b/pkgtools/rpm2pkg/files/rpm2pkg.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpm2pkg.c,v 1.20 2011/01/12 00:26:33 tron Exp $	*/
+/*	$NetBSD: rpm2pkg.c,v 1.21 2011/04/12 22:12:42 tron Exp $	*/
 
 /*-
  * Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
@@ -345,52 +345,6 @@ WriteFile(FileHandle *in, char *name, mode_t mode, unsigned long length,
 	return false;
 }
 
-static void
-CheckSymLinks(PListEntry **Links, PListEntry **Files, PListEntry **Dirs)
-{
-	PListEntry	*Link;
-
-	while ((Link = *Links) != NULL) {
-		struct stat	Stat;
-		PListEntry	*Ptr;
-		char		*Basename;
-
-		if (Link->pe_Left != NULL)
-			CheckSymLinks(&Link->pe_Left, Files, Dirs);
-
-		if ((stat(Link->pe_Name, &Stat) < 0) ||
-		    !S_ISREG(Stat.st_mode)) {
-			Links = &Link->pe_Right;
-			continue;
-		}
-
-		(void)PListInsert(Files, Link->pe_Name);
-		if ((Basename = strrchr(Link->pe_Name, '/')) != NULL) {
-			*Basename = '\0';
-			if ((Ptr = PListFind(*Dirs, Link->pe_Name)) != NULL)
-				Ptr->pe_DirEmpty = false;
-		}
-
-		if (Link->pe_Right == NULL) {
-			*Links = Link->pe_Left;
-			free(Link);
-			break;
-		}
-
-		*Links = Link->pe_Right;
-		Ptr = Link->pe_Left;
-		free(Link);
-
-		if (Ptr == NULL)
-			continue;
-
-		Link = *Links;
-		while (Link->pe_Left != NULL)
-			Link = Link->pe_Left;
-		Link->pe_Left = Ptr;
-	}
-}
-
 static bool
 CheckPrefix(const char *prefix, char *name)
 {