Update for 2.4.10, from FreeBSD

5 files changed, 11 insertions, 38 deletions

diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index fb288fe5295..c586f5133cb 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 1997/10/27 01:06:12 hubertf Exp $
 # New ports collection makefile for:	rpm
-# Version required:	2.4.8
+# Version required:	2.4.10
 # Date created:		23 January 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
+# $NetBSD: Makefile,v 1.4 1997/12/17 10:15:55 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/09/23 07:07:32 tg Exp
 #
 
-DISTNAME=	rpm-2.4.8
+DISTNAME=	rpm-2.4.10
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.redhat.com/pub/redhat/code/rpm/ \
 		ftp://ftp.gwdg.de/pub/linux/redhat/code/rpm/
diff --git a/misc/rpm/files/md5 b/misc/rpm/files/md5
index 1e722dce935..d7110205dbe 100644
--- a/misc/rpm/files/md5
+++ b/misc/rpm/files/md5
@@ -1 +1 @@
-MD5 (rpm-2.4.8.tar.gz) = eb114f60306d12fc03190d1146ac6224
+MD5 (rpm-2.4.10.tar.gz) = 8f76cdeb73c10c71cdfb0ce59967d07c
diff --git a/misc/rpm/patches/patch-ac b/misc/rpm/patches/patch-ac
index d69ee744133..d1ea9e9e6a1 100644
--- a/misc/rpm/patches/patch-ac
+++ b/misc/rpm/patches/patch-ac
@@ -1,5 +1,5 @@
---- misc/miscfn.h.orig	Fri Oct 10 23:29:41 1997
-+++ misc/miscfn.h	Sun Oct 26 04:19:51 1997
+--- misc/miscfn.h.orig	Fri Jun 27 23:55:33 1997
++++ misc/miscfn.h	Wed Jul  2 14:31:14 1997
 @@ -2,6 +2,7 @@
  #define H_MISCFN
  
@@ -8,21 +8,3 @@
  
  #if HAVE_FNMATCH_H
  #include <fnmatch.h>
-@@ -35,13 +36,17 @@
- char *realpath(const char *path, char resolved_path []);
- #endif
- 
-+#if 0
- #if NEED_TIMEZONE
- #include <sys/stdtypes.h>
- extern time_t timezone;
- #endif
-+#endif
- 
- #if NEED_MYREALLOC
-+#if 0
- #include <sys/stdtypes.h>
-+#endif
- #define realloc(ptr,size) myrealloc(ptr,size)
- extern void *myrealloc(void *, size_t);
- #endif
diff --git a/misc/rpm/patches/patch-af b/misc/rpm/patches/patch-af
index ba753cfe2fd..63339da7dff 100644
--- a/misc/rpm/patches/patch-af
+++ b/misc/rpm/patches/patch-af
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri Oct 10 23:29:38 1997
-+++ Makefile.in	Sun Oct 26 04:17:26 1997
+--- Makefile.in.orig	Fri Oct 31 20:37:13 1997
++++ Makefile.in	Thu Nov 20 13:16:39 1997
 @@ -25,6 +25,7 @@
  RPMBINDIR=$(subst usr/bin,bin,$(BINDIR))
  MANDIR=$(prefix)/man/man8
@@ -8,19 +8,10 @@
  INCDIR=$(prefix)/include/rpm
  ETCDIR=$(ROOT)/etc
  
-@@ -35,7 +36,7 @@
- OTHERSUBDIRS = docs autodeps
- OBJS = rpm.o query.o install.o verify.o checksig.o ftp.o url.o @GETTEXTSTUB@
- PROGS = @RPM@ rpm2cpio
--LIBS = @LIBS@ @LIBINTL@ @LIBDL@
-+LIBS = @LIBS@ @LIBINTL@ @LIBDL@ -lcompat
- LOADLIBES = -lbuild popt/libpopt.a $(topdir)/lib/librpm.a -lmisc 
- 
- SOURCES = $(subst .o,.c,$(OBJS))
 @@ -49,7 +50,7 @@
  all: $(TARGET)
  
- rpm: lib/librpm.a build/libbuild.a misc/libmisc.a $(OBJS) 
+ rpm: lib/librpm.a build/libbuild.a @MISCPATH@ $(OBJS) 
 -	$(CC) -o rpm -static $(LDFLAGS) $(OBJS) $(LOADLIBES) $(LIBS) \
 +	$(CC) -o rpm $(LDFLAGS) $(OBJS) $(LOADLIBES) $(LIBS) \
  		$(LIBEFENCE)
diff --git a/misc/rpm/pkg/PLIST b/misc/rpm/pkg/PLIST
index ff9cc87b2fd..242b8e17a5b 100644
--- a/misc/rpm/pkg/PLIST
+++ b/misc/rpm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1997/11/06 10:02:49 agc Exp $
+@comment $NetBSD: PLIST,v 1.4 1997/12/17 10:16:01 hubertf Exp $
 bin/gendiff
 bin/rpm
 bin/find-requires
@@ -7,9 +7,9 @@ bin/rpm2cpio
 include/rpm/rpmlib.h
 include/rpm/dbindex.h
 include/rpm/header.h
-@dirrm include/rpm
 lib/librpm.a
 man/man8/rpm.8.gz
 man/man8/rpm2cpio.8.gz
 share/misc/rpmrc
 share/misc/rpmpopt
+@dirrm include/rpm