summaryrefslogtreecommitdiff
path: root/misc/rpm/patches/patch-ba
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2004-07-24 04:43:10 +0000
committergrant <grant@pkgsrc.org>2004-07-24 04:43:10 +0000
commitb64a4ec172641e90a0b262560b4def031f78946d (patch)
tree385cdf0d085c319232f3573d7a622e843dc1832e /misc/rpm/patches/patch-ba
parentdfe438e74bb229174f2d7bf8ef7dfb182fd05d86 (diff)
downloadpkgsrc-b64a4ec172641e90a0b262560b4def031f78946d.tar.gz
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.
Diffstat (limited to 'misc/rpm/patches/patch-ba')
-rw-r--r--misc/rpm/patches/patch-ba19
1 files changed, 15 insertions, 4 deletions
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 \