2.5.4

17 files changed, 97 insertions, 288 deletions

diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index d6a66c1e09c..833519012cb 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 1998/08/20 15:17:15 tsarna Exp $
+# $NetBSD: Makefile,v 1.16 1998/11/05 01:34:01 mycroft Exp $
 #
 
-DISTNAME=	rpm-2.5.1
+DISTNAME=	rpm-2.5.4
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/ \
 		ftp://ftp.gwdg.de/pub/linux/redhat/code/rpm/
@@ -9,9 +9,10 @@ MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/ \
 MAINTAINER=	mycroft@netbsd.org
 HOMEPAGE=	http://www.rpm.org/
 
-CONFLICTS=	rpm-2.4.12
+CONFLICTS=	rpm-2.4.12 rpm-2.5.1
 
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 
 pre-install:
 	${MKDIR} ${PREFIX}/include/rpm
diff --git a/misc/rpm/files/md5 b/misc/rpm/files/md5
index 255e63a2505..8e3381901ca 100644
--- a/misc/rpm/files/md5
+++ b/misc/rpm/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 1998/08/07 13:25:08 agc Exp $
+$NetBSD: md5,v 1.7 1998/11/05 01:34:01 mycroft Exp $
 
-MD5 (rpm-2.5.1.tar.gz) = 7ad09e9b98bc839a0646c62dd130186e
+MD5 (rpm-2.5.4.tar.gz) = d5f29162ada83b217b497063582af902
diff --git a/misc/rpm/patches/patch-aa b/misc/rpm/patches/patch-aa
deleted file mode 100644
index 346f326e611..00000000000
--- a/misc/rpm/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.4 1998/08/07 11:10:28 agc Exp $
-
---- build/Makefile.in.orig	Wed May 27 16:49:37 1998
-+++ build/Makefile.in	Wed Jul 29 12:46:55 1998
-@@ -15,7 +15,7 @@
- 
- # -----------------------------------------------------------------------
- 
--include ../Makefile.inc
-+.include "../Makefile.inc"
- 
- TARGET=everything
- 
-@@ -44,6 +44,6 @@
- 	$(CPP) $(CFLAGS) -MM $(srcdir)/*.c | \
- 	    sed s+$$topdir_path+$(top_srcdir)+g > .depend
- 
--ifeq (.depend,$(wildcard .depend))
--include .depend
--endif
-+.if exists(.depend)
-+.include ".depend"
-+.endif
diff --git a/misc/rpm/patches/patch-ab b/misc/rpm/patches/patch-ab
deleted file mode 100644
index cc13edc36e0..00000000000
--- a/misc/rpm/patches/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.6 1998/08/07 11:10:28 agc Exp $
-
---- lib/Makefile.in.orig	Wed May 27 16:49:38 1998
-+++ lib/Makefile.in	Wed Jul 29 12:46:56 1998
-@@ -23,7 +23,7 @@
- 
- # -----------------------------------------------------------------------
- 
--include ../Makefile.inc
-+.include "../Makefile.inc"
- 
- TARGET=allprogs
- 
-@@ -41,7 +41,8 @@
- 
- $(PROGS): $(LIBRPM)
- 
--$(LIBRPM): $(LIBRPM)($(LIBOBJECTS) $(TAGTABLE))
-+$(LIBRPM): $(LIBOBJECTS) $(TAGTABLE)
-+	$(AR) r $@ $(LIBOBJECTS) $(TAGTABLE)
- 	$(RANLIB) $@
- 
- tagtable.c: rpmlib.h 
-@@ -74,6 +75,6 @@
- 	    $(CPP) $(CFLAGS) -MM $(SOURCES) | \
- 		sed s+$$topdir_path+$(top_srcdir)+g > .depend
- 
--ifeq (.depend,$(wildcard .depend))
--include .depend
--endif
-+.if exists(.depend)
-+.include ".depend"
-+.endif
diff --git a/misc/rpm/patches/patch-ac b/misc/rpm/patches/patch-ac
deleted file mode 100644
index a58229785a8..00000000000
--- a/misc/rpm/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.6 1998/08/07 11:10:28 agc Exp $
-
---- misc/Makefile.in.orig	Wed May 27 16:49:41 1998
-+++ misc/Makefile.in	Wed Jul 29 12:46:56 1998
-@@ -2,7 +2,7 @@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- 
--include ../Makefile.inc
-+.include "../Makefile.inc"
- 
- LIBOBJECTS = @MISCOBJS@ 
- LIBMISC = libmisc.a
-@@ -32,6 +32,6 @@
- 	    $(CPP) $(CFLAGS) -MM $(srcdir)/*.c | \
- 		sed s+$$topdir_path+$(top_srcdir)+g > .depend
- 
--ifeq (.depend,$(wildcard .depend))
--include .depend
--endif
-+.if exists(.depend)
-+.include ".depend"
-+.endif
diff --git a/misc/rpm/patches/patch-ad b/misc/rpm/patches/patch-ad
deleted file mode 100644
index 304fc85a0e3..00000000000
--- a/misc/rpm/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.3 1998/10/08 10:38:06 agc Exp $
-
---- po/Makefile.in.orig	Wed May 27 16:49:42 1998
-+++ po/Makefile.in	Wed Jul 29 12:46:56 1998
-@@ -1,7 +1,7 @@
- srcdir = @srcdir@
- VPATH = $(srcdir)
- 
--include ../Makefile.inc
-+.include "../Makefile.inc"
- 
- INSTALL= @INSTALL@
- INSTALL_PROGRAM= @INSTALL_PROGRAM@
-@@ -67,5 +67,6 @@
- 	    $(INSTALL) -m 644 $$n $(installprefix)/$(RPMNLSDIR)/$$l/LC_MESSAGES/rpm.mo; \
- 	done
- 
--%.mo: %.po
-+.SUFFIXES: .po .mo
-+.po.mo:
- 	msgfmt -o $@ $<
diff --git a/misc/rpm/patches/patch-ae b/misc/rpm/patches/patch-ae
deleted file mode 100644
index 798d437f398..00000000000
--- a/misc/rpm/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.3 1998/08/07 11:10:29 agc Exp $
-
---- Makefile.inc.in.orig	Wed May 27 10:49:34 1998
-+++ Makefile.inc.in	Sat Jul  4 06:07:15 1998
-@@ -4,6 +4,7 @@
- prefix= @prefix@
- exec_prefix = @exec_prefix@
- libdir= @libdir@
-+datadir= @datadir@
- 
- AR = ar
- RANLIB = @RANLIB@
diff --git a/misc/rpm/patches/patch-af b/misc/rpm/patches/patch-af
deleted file mode 100644
index a415b89fc49..00000000000
--- a/misc/rpm/patches/patch-af
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.7 1998/10/13 14:28:01 agc Exp $
-
---- tools/Makefile.in.orig	Wed May 27 16:49:44 1998
-+++ tools/Makefile.in	Wed Jul 29 12:46:56 1998
-@@ -2,10 +2,10 @@
- VPATH = @srcdir@
- top_srcdir = @top_srcdir@
- 
--include ../Makefile.inc
-+.include "../Makefile.inc"
- 
- PROGS = rpmlead rpmheader rpmarchive rpmsignature dump dumpdb
--LOADLIBES = @LIBS@ @LIBMISC@ @LIBINTL@
-+LDLIBS = @LIBS@ -lrpm @LIBMISC@ @LIBINTL@
- 
- TARGET=everything
- 
-@@ -26,6 +26,6 @@
- 
- $(PROGS): ../lib/librpm.a
- 
--ifeq (.depend,$(wildcard .depend))
--include .depend
--endif
-+.if exists(.depend)
-+.include ".depend"
-+.endif
diff --git a/misc/rpm/patches/patch-ag b/misc/rpm/patches/patch-ag
deleted file mode 100644
index 19916dc09fe..00000000000
--- a/misc/rpm/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 11:10:31 agc Exp $
-
---- configure.in.orig	Wed May 27 10:49:34 1998
-+++ configure.in	Sat Jul  4 06:17:37 1998
-@@ -17,7 +17,7 @@
- 
- AC_CANONICAL_SYSTEM
- 
--RPMCONFIGDIR='$(libdir)'
-+RPMCONFIGDIR='$(datadir)/misc'
- 
- dnl Checks for programs.
- AC_PROG_CC
diff --git a/misc/rpm/patches/patch-ah b/misc/rpm/patches/patch-ah
deleted file mode 100644
index a7fd3725853..00000000000
--- a/misc/rpm/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.3 1998/08/07 11:10:31 agc Exp $
-
---- configure.orig	Wed May 27 10:50:18 1998
-+++ configure	Sat Jul  4 06:17:46 1998
-@@ -640,7 +640,7 @@
-   program_prefix=${target_alias}-
- 
- 
--RPMCONFIGDIR='$(libdir)'
-+RPMCONFIGDIR='$(datadir)/misc'
- 
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
diff --git a/misc/rpm/patches/patch-ai b/misc/rpm/patches/patch-ai
deleted file mode 100644
index 62928fcae76..00000000000
--- a/misc/rpm/patches/patch-ai
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ai,v 1.2 1998/08/07 11:10:32 agc Exp $
-
---- popt/Makefile.in.orig	Wed May 27 16:49:44 1998
-+++ popt/Makefile.in	Wed Jul 29 12:46:56 1998
-@@ -24,17 +24,16 @@
- 
- CFLAGS = @CFLAGS@ @DEFS@ $(OPTS)
- 
--ifeq ($(RANLIB),)
--RANLIB=ranlib
--endif
-+RANLIB ?= ranlib
- 
--ifeq (.depend-done,$(wildcard .depend-done))
-+.if exists(.depend-done)
- TARGET=allprogs
--else
-+.else
- TARGET=@TARGET@
--endif
-+.endif
- 
--$(LIBPOPT): $(LIBPOPT)($(LIBOBJECTS))
-+$(LIBPOPT): $(LIBOBJECTS)
-+	$(AR) r $@ $(LIBOBJECTS)
- 	$(RANLIB) $@
- 
- distclean: clean
-@@ -67,6 +66,6 @@
- 	@rm -rf /tmp/popt-$(VERSION)
- 	@echo "The archive is in popt-$(VERSION).tar.gz"
- 
--ifeq (.depend,$(wildcard .depend))
--include .depend
--endif
-+.if exists(.depend)
-+.include ".depend"
-+.endif
diff --git a/misc/rpm/patches/patch-aj b/misc/rpm/patches/patch-aj
deleted file mode 100644
index 38feb8cf35f..00000000000
--- a/misc/rpm/patches/patch-aj
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-aj,v 1.2 1998/08/07 11:10:32 agc Exp $
-
---- Makefile.in.orig	Wed May 27 16:49:34 1998
-+++ Makefile.in	Wed Jul 29 14:20:47 1998
-@@ -21,9 +21,10 @@
- ### These are variables meant to be exported
- 
- BINDIR=$(prefix)/bin
--RPMBINDIR=$(subst usr/bin,bin,$(BINDIR))
-+RPMBINDIR=$(BINDIR)
- MANDIR=$(prefix)/man/man8
- LIBDIR=$(libdir)
-+DATADIR=$(datadir)
- INCDIR=$(prefix)/include/rpm
- ETCDIR=$(ROOT)/etc
- 
-@@ -42,16 +43,16 @@
- 
- SOURCES = $(subst .o,.c,$(OBJS))
- 
--ifeq (.depend-done,$(wildcard .depend-done))
-+.if exists(.depend-done)
- TARGET=everything
--else
-+.else
- TARGET=@TARGET@
--endif
-+.endif
- 
- all: $(TARGET)
- 
- rpm: lib/librpm.a build/librpmbuild.a @MISCPATH@ $(OBJS) 
--	$(CC) -o rpm $(LDFLAGS_STATIC) $(OBJS) $(LDFLAGS) $(LOADLIBES) $(LIBS) \
-+	$(CC) -o rpm $(OBJS) $(LDFLAGS) $(LOADLIBES) $(LIBS) \
- 		$(LIBEFENCE)
- 
- rpm.shared: lib/librpm.a build/librpmbuild.a $(OBJS)
-@@ -115,20 +116,20 @@
- 	[ -d $(installprefix)/$(LIBDIR) ] || mkdir -p $(installprefix)/$(LIBDIR)
- 	[ -d $(installprefix)/$(INCDIR) ] || mkdir -p $(installprefix)/$(INCDIR)
- 	[ -d $(installprefix)/$(RPMCONFIGDIR) ] ||  \
--		mkdir -p $(installprefix)/$(INCDIR)
-+		mkdir -p $(installprefix)/$(RPMCONFIGDIR)
- 	if [ -x ./rpm ]; then \
- 	    $(INSTALL_PROGRAM) -s -m 755 rpm $(installprefix)/$(RPMBINDIR); \
- 	else \
- 	    $(INSTALL_PROGRAM) -s -m 755 rpm.shared $(installprefix)/$(RPMBINDIR)/rpm; \
- 	fi
--	$(INSTALL_PROGRAM) -m 755 $(srcdir)/gendiff $(installprefix)/$(BINDIR)
--	$(INSTALL_PROGRAM) -m 755 $(topdir)/find-provides.sh $(installprefix)/$(BINDIR)/find-provides
--	$(INSTALL_PROGRAM) -m 755 $(topdir)/find-requires.sh $(installprefix)/$(BINDIR)/find-requires
-+	$(INSTALL_PROGRAM:N-s) -m 755 $(srcdir)/gendiff $(installprefix)/$(BINDIR)
-+	$(INSTALL_PROGRAM:N-s) -m 755 $(topdir)/find-provides.sh $(installprefix)/$(BINDIR)/find-provides
-+	$(INSTALL_PROGRAM:N-s) -m 755 $(topdir)/find-requires.sh $(installprefix)/$(BINDIR)/find-requires
- 	$(INSTALL_PROGRAM) -s -m 755 rpm2cpio $(installprefix)/$(BINDIR)
- 	$(INSTALL_DATA) -m 644 $(srcdir)/rpm.8 $(installprefix)/$(MANDIR)
- 	$(INSTALL_DATA) -m 644 $(srcdir)/rpm2cpio.8 $(installprefix)/$(MANDIR)
--	$(INSTALL_DATA) -m 644 $(topdir)/lib-rpmrc $(installprefix)/$(LIBDIR)/rpmrc
--	$(INSTALL_DATA) -m 644 $(srcdir)/rpmpopt $(installprefix)/$(LIBDIR)/rpmpopt
-+	$(INSTALL_DATA) -m 644 $(topdir)/lib-rpmrc $(installprefix)/$(RPMCONFIGDIR)/rpmrc
-+	$(INSTALL_DATA) -m 644 $(srcdir)/rpmpopt $(installprefix)/$(RPMCONFIGDIR)/rpmpopt
- 	(cd lib; $(MAKE) LIBDIR=$(installprefix)/$(LIBDIR) INCDIR=$(installprefix)/$(INCDIR) install)
- 	for d in $(INSTSUBDIRS); do \
- 		(cd $$d; $(MAKE) installprefix=$(installprefix) LIBDIR=$(installprefix)/$(LIBDIR) INCDIR=$(installprefix)/$(INCDIR) install) ;\
-@@ -205,6 +206,6 @@
- 	@echo " "
- 	@echo "The final archive is ./rpm-$(VERSION).tar.gz."
- 
--ifeq (.depend,$(wildcard .depend))
--include .depend
--endif
-+.if exists(.depend)
-+.include ".depend"
-+.endif
diff --git a/misc/rpm/patches/patch-ba b/misc/rpm/patches/patch-ba
new file mode 100644
index 00000000000..2f0f56474ca
--- /dev/null
+++ b/misc/rpm/patches/patch-ba
@@ -0,0 +1,37 @@
+$NetBSD: patch-ba,v 1.1 1998/11/05 01:34:02 mycroft Exp $
+
+--- Makefile.in.orig	Sat Sep 12 09:16:32 1998
++++ Makefile.in	Wed Nov  4 20:08:24 1998
+@@ -124,21 +124,19 @@
+ 	[ -d $(installprefix)/$(RPMCONFIGDIR) ] ||  \
+ 		$(mkinstalldirs) $(installprefix)/$(RPMCONFIGDIR)
+ 	if [ -x ./rpm ]; then \
+-	    $(INSTALL_PROGRAM) -s -m 755 rpm $(installprefix)/$(RPMBINDIR); \
++	    $(BSD_INSTALL_PROGRAM) rpm $(installprefix)/$(RPMBINDIR); \
+ 	else \
+-	    $(INSTALL_PROGRAM) -s -m 755 rpm.shared $(installprefix)/$(RPMBINDIR)/rpm; \
++	    $(BSD_INSTALL_PROGRAM) rpm.shared $(installprefix)/$(RPMBINDIR)/rpm; \
+ 	fi
+-	$(INSTALL_PROGRAM) -m 755 $(srcdir)/gendiff $(installprefix)/$(BINDIR)
+-	$(INSTALL_PROGRAM) -m 755 $(topdir)/mkinstalldirs $(installprefix)/$(RPMCONFIGDIR)/mkinstalldirs
+-	$(INSTALL_PROGRAM) -m 755 $(topdir)/find-provides.sh $(installprefix)/$(RPMCONFIGDIR)/find-provides
+-	$(INSTALL_PROGRAM) -m 755 $(topdir)/find-requires.sh $(installprefix)/$(RPMCONFIGDIR)/find-requires
+-	$(INSTALL_PROGRAM) -s -m 755 rpm2cpio $(installprefix)/$(BINDIR)
+-	$(INSTALL_DATA) -m 644 $(srcdir)/rpm.8 $(installprefix)/$(MANDIR)
+-	$(INSTALL_DATA) -m 644 $(srcdir)/rpm2cpio.8 $(installprefix)/$(MANDIR)
+-	$(INSTALL_DATA) -m 644 $(topdir)/lib-rpmrc $(installprefix)/$(RPMCONFIGDIR)/rpmrc
+-	$(INSTALL_DATA) -m 644 $(srcdir)/rpmpopt $(installprefix)/$(RPMCONFIGDIR)/rpmpopt
+-	ln -sf $(RPMCONFIGDIR)/rpmrc $(installprefix)/$(LIBDIR)/rpmrc
+-	ln -sf $(RPMCONFIGDIR)/rpmpopt $(installprefix)/$(LIBDIR)/rpmpopt
++	$(BSD_INSTALL_SCRIPT) $(srcdir)/gendiff $(installprefix)/$(BINDIR)
++	$(BSD_INSTALL_SCRIPT) $(topdir)/mkinstalldirs $(installprefix)/$(RPMCONFIGDIR)/mkinstalldirs
++	$(BSD_INSTALL_SCRIPT) $(topdir)/find-provides.sh $(installprefix)/$(RPMCONFIGDIR)/find-provides
++	$(BSD_INSTALL_SCRIPT) $(topdir)/find-requires.sh $(installprefix)/$(RPMCONFIGDIR)/find-requires
++	$(BSD_INSTALL_PROGRAM) rpm2cpio $(installprefix)/$(BINDIR)
++	$(BSD_INSTALL_MAN) $(srcdir)/rpm.8 $(installprefix)/$(MANDIR)
++	$(BSD_INSTALL_MAN) $(srcdir)/rpm2cpio.8 $(installprefix)/$(MANDIR)
++	$(BSD_INSTALL_DATA) $(topdir)/lib-rpmrc $(installprefix)/$(RPMCONFIGDIR)/rpmrc
++	$(BSD_INSTALL_DATA) $(srcdir)/rpmpopt $(installprefix)/$(RPMCONFIGDIR)/rpmpopt
+ 	(cd lib; $(MAKE) LIBDIR=$(installprefix)/$(LIBDIR) INCDIR=$(installprefix)/$(INCDIR) install)
+ 	for d in $(INSTSUBDIRS); do \
+ 		(cd $$d; $(MAKE) installprefix=$(installprefix) LIBDIR=$(installprefix)/$(LIBDIR) INCDIR=$(installprefix)/$(INCDIR) install) ;\
diff --git a/misc/rpm/patches/patch-bb b/misc/rpm/patches/patch-bb
new file mode 100644
index 00000000000..69a5954e6a5
--- /dev/null
+++ b/misc/rpm/patches/patch-bb
@@ -0,0 +1,19 @@
+$NetBSD: patch-bb,v 1.1 1998/11/05 01:34:02 mycroft Exp $
+
+--- lib/Makefile.in.orig	Tue Aug 11 12:09:18 1998
++++ lib/Makefile.in	Wed Nov  4 20:11:23 1998
+@@ -55,10 +55,10 @@
+ 	echo 'const int rpmTagTableSize = sizeof(rpmTagTable) / sizeof(struct headerTagTableEntry) - 1;' >> tagtable.c
+ 
+ install:
+-	$(INSTALL_DATA) -m 644 $(srcdir)/rpmlib.h $(INCDIR)
+-	$(INSTALL_DATA) -m 644 $(srcdir)/dbindex.h $(INCDIR)
+-	$(INSTALL_DATA) -m 644 $(srcdir)/header.h $(INCDIR)
+-	$(INSTALL_DATA) -m 644 librpm.a $(LIBDIR)
++	$(BSD_INSTALL_DATA) $(srcdir)/rpmlib.h $(INCDIR)
++	$(BSD_INSTALL_DATA) $(srcdir)/dbindex.h $(INCDIR)
++	$(BSD_INSTALL_DATA) $(srcdir)/header.h $(INCDIR)
++	$(BSD_INSTALL_DATA) librpm.a $(LIBDIR)
+ 
+ distclean: clean
+ 	rm -f Makefile	
diff --git a/misc/rpm/patches/patch-bc b/misc/rpm/patches/patch-bc
new file mode 100644
index 00000000000..b1bad830c20
--- /dev/null
+++ b/misc/rpm/patches/patch-bc
@@ -0,0 +1,15 @@
+$NetBSD: patch-bc,v 1.1 1998/11/05 01:34:02 mycroft Exp $
+
+--- popt/Makefile.in.orig	Sun Sep 27 10:57:03 1998
++++ popt/Makefile.in	Wed Nov  4 20:11:39 1998
+@@ -63,8 +63,8 @@
+ install:
+ 	mkdir -p $(PREFIX)/$(INCLUDE)
+ 	mkdir -p $(PREFIX)/$(LIBS)
+-	$(INSTALL_DATA) -m 644 popt.h $(PREFIX)/$(INCLUDE)/popt.h
+-	$(INSTALL_DATA) -m 644 $(LIBPOPT) $(PREFIX)/$(LIBS)/$(LIBPOPT)
++	$(BSD_INSTALL_DATA) popt.h $(PREFIX)/$(INCLUDE)/popt.h
++	$(BSD_INSTALL_DATA) $(LIBPOPT) $(PREFIX)/$(LIBS)/$(LIBPOPT)
+ 
+ archive:
+ 	cvs tag -F $(CVSTAG) .
diff --git a/misc/rpm/patches/patch-bd b/misc/rpm/patches/patch-bd
new file mode 100644
index 00000000000..950f1e05b30
--- /dev/null
+++ b/misc/rpm/patches/patch-bd
@@ -0,0 +1,11 @@
+$NetBSD: patch-bd,v 1.1 1998/11/05 01:34:02 mycroft Exp $
+
+--- scripts/Makefile.in.orig	Thu Jul 30 10:19:58 1998
++++ scripts/Makefile.in	Wed Nov  4 20:11:58 1998
+@@ -12,5 +12,5 @@
+ 
+ install:
+ 	for n in $(SCRIPTS); do \
+-	    $(INSTALL_DATA) -m 755 $$n $(installprefix)/$(RPMCONFIGDIR); \
++	    $(BSD_INSTALL_SCRIPT) $$n $(installprefix)/$(RPMCONFIGDIR); \
+ 	done
diff --git a/misc/rpm/pkg/PLIST b/misc/rpm/pkg/PLIST
index 2d07ff992ee..d6d4ebb8c30 100644
--- a/misc/rpm/pkg/PLIST
+++ b/misc/rpm/pkg/PLIST
@@ -1,15 +1,18 @@
-@comment $NetBSD: PLIST,v 1.5 1998/08/10 15:45:08 tv Exp $
+@comment $NetBSD: PLIST,v 1.6 1998/11/05 01:34:02 mycroft Exp $
 bin/gendiff
 bin/rpm
-bin/find-requires
-bin/find-provides
 bin/rpm2cpio
-include/rpm/rpmlib.h
 include/rpm/dbindex.h
 include/rpm/header.h
+include/rpm/rpmlib.h
 lib/librpm.a
+lib/rpm/find-provides
+lib/rpm/find-requires
+lib/rpm/freshen.sh
+lib/rpm/mkinstalldirs
+lib/rpm/rpmpopt
+lib/rpm/rpmrc
 man/man8/rpm.8
 man/man8/rpm2cpio.8
-share/misc/rpmrc
-share/misc/rpmpopt
+@dirrm lib/rpm
 @dirrm include/rpm