the included popt library is broken on some platforms because it assumes

alloca is available without explicitly pulling it in. use the devel/popt
pkg instead and fix PKGLOCALEDIR handling while I'm here.

fixes install on Solaris.

4 files changed, 39 insertions, 29 deletions

diff --git a/misc/rpm/patches/patch-ac b/misc/rpm/patches/patch-ac
index 3d5711e0df8..66e66f0b97b 100644
--- a/misc/rpm/patches/patch-ac
+++ b/misc/rpm/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.9 2004/02/09 11:56:32 grant Exp $
+$NetBSD: patch-ac,v 1.10 2004/07/24 04:43:10 grant Exp $
 
 --- configure.orig	1998-09-29 06:50:23.000000000 +1000
 +++ configure
@@ -36,3 +36,12 @@ $NetBSD: patch-ac,v 1.9 2004/02/09 11:56:32 grant Exp $
  	echo "$ac_t""yes" 1>&6
  else
  	echo "$ac_t""no" 1>&6
+@@ -4065,7 +4062,7 @@ else
+    NBMAKEFILE=
+ fi
+ 
+-subdirs="popt"
++#subdirs="popt"
+ 
+ trap '' 1 2 15
+ cat > confcache <<\EOF
diff --git a/misc/rpm/patches/patch-ba b/misc/rpm/patches/patch-ba
index 2f0f56474ca..8f394ac557d 100644
--- a/misc/rpm/patches/patch-ba
+++ b/misc/rpm/patches/patch-ba
@@ -1,8 +1,19 @@
-$NetBSD: patch-ba,v 1.1 1998/11/05 01:34:02 mycroft Exp $
+$NetBSD: patch-ba,v 1.2 2004/07/24 04:43:10 grant Exp $
 
---- Makefile.in.orig	Sat Sep 12 09:16:32 1998
-+++ Makefile.in	Wed Nov  4 20:08:24 1998
-@@ -124,21 +124,19 @@
+--- Makefile.in.orig	1998-09-12 23:16:32.000000000 +1000
++++ Makefile.in
+@@ -30,8 +30,8 @@ ETCDIR=$(ROOT)/etc
+ 
+ # -----------------------------------------------------------------------
+ 
+-SUBDIRS = popt @MISCDIR@ lib build tools @PO@
+-ALLSUBDIRS = popt misc lib build tools po
++SUBDIRS = @MISCDIR@ lib build tools @PO@
++ALLSUBDIRS = misc lib build tools po
+ INSTSUBDIRS = lib scripts @PO@
+ OTHERSUBDIRS = docs autodeps
+ OBJS = rpm.o query.o install.o verify.o checksig.o ftp.o url.o build.o \
+@@ -124,21 +124,19 @@ install: all
  	[ -d $(installprefix)/$(RPMCONFIGDIR) ] ||  \
  		$(mkinstalldirs) $(installprefix)/$(RPMCONFIGDIR)
  	if [ -x ./rpm ]; then \
diff --git a/misc/rpm/patches/patch-bc b/misc/rpm/patches/patch-bc
deleted file mode 100644
index 9cbc8e963c2..00000000000
--- a/misc/rpm/patches/patch-bc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-bc,v 1.2 2001/07/15 22:38:15 jlam Exp $
-
---- popt/Makefile.in.orig	Sun Sep 27 10:57:03 1998
-+++ popt/Makefile.in
-@@ -16,7 +16,7 @@
- LIBS=$(prefix)/lib
- INCLUDE=$(prefix)/include
- CPP=@CPP@
--LDFLAGS=@LIBS@
-+LDFLAGS=@LDFLAGS@ @LIBS@
- TESTCASES=test1
- 
- VERSION=$(shell awk '/define version/ { print $$3 }' popt.spec)
-@@ -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-be b/misc/rpm/patches/patch-be
new file mode 100644
index 00000000000..e2f69cfd86e
--- /dev/null
+++ b/misc/rpm/patches/patch-be
@@ -0,0 +1,14 @@
+$NetBSD: patch-be,v 1.1 2004/07/24 04:43:10 grant Exp $
+
+--- Makefile.inc.in.orig	1998-09-01 21:22:34.000000000 +1000
++++ Makefile.inc.in
+@@ -17,8 +17,7 @@ RPMNLSDIR=@datadir@/locale
+ RPMNLSPACKAGE=rpm
+ CFLAGS = -I$(topdir) -I$(topsrcdir) @CFLAGS@ @INCPATH@ $(OPTS) \
+ 	  -I$(topsrcdir)/lib -I$(topsrcdir)/misc
+-LDFLAGS = @LDFLAGS@ -L$(topdir)/lib -L$(topdir)/build -L$(topdir)/misc \
+-	  -L$(topdir)/popt
++LDFLAGS = @LDFLAGS@ -L$(topdir)/lib -L$(topdir)/build -L$(topdir)/misc
+ VERSION = 2.5.4
+ CC = @CC@
+