From c80d9e1a10ea62829fc25241b2feb46fa691f05f Mon Sep 17 00:00:00 2001 From: grant Date: Sat, 24 Jul 2004 04:43:10 +0000 Subject: 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. --- misc/rpm/Makefile | 9 ++++++--- misc/rpm/distinfo | 8 ++++---- misc/rpm/patches/patch-ac | 11 ++++++++++- misc/rpm/patches/patch-ba | 19 +++++++++++++++---- misc/rpm/patches/patch-bc | 24 ------------------------ misc/rpm/patches/patch-be | 14 ++++++++++++++ 6 files changed, 49 insertions(+), 36 deletions(-) delete mode 100644 misc/rpm/patches/patch-bc create mode 100644 misc/rpm/patches/patch-be (limited to 'misc/rpm') diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile index 670a2333f65..be81c533f4c 100644 --- a/misc/rpm/Makefile +++ b/misc/rpm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.47 2004/04/25 11:46:54 wiz Exp $ +# $NetBSD: Makefile,v 1.48 2004/07/24 04:43:10 grant Exp $ DISTNAME= rpm-2.5.4 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= misc MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/ @@ -15,7 +15,6 @@ CONFLICTS+= rpm2cpio<1.0nb1 USE_BUILDLINK3= yes USE_DB185= yes -USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make GNU_CONFIGURE= yes @@ -23,6 +22,9 @@ USE_PKGINSTALL= yes DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL +# this is needed instead of USE_PKGLOCALEDIR +CONFIGURE_ARGS+= --datadir=${PREFIX}/${PKGLOCALEDIR} + # The rpm databases are kept under ${RPM_DB_PREFIX}/lib/rpm. CONFIGURE_ENV+= varprefix="${RPM_DB_PREFIX}" @@ -38,6 +40,7 @@ pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/include/rpm .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/popt/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bdb.buildlink3.mk" diff --git a/misc/rpm/distinfo b/misc/rpm/distinfo index 8cc044c97b6..a981833b3a9 100644 --- a/misc/rpm/distinfo +++ b/misc/rpm/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.6 2004/02/09 11:56:32 grant Exp $ +$NetBSD: distinfo,v 1.7 2004/07/24 04:43:10 grant Exp $ SHA1 (rpm-2.5.4.tar.gz) = a7fcd67883aec8d5f17483d5efebe7e5f5453462 Size (rpm-2.5.4.tar.gz) = 727849 bytes SHA1 (patch-aa) = 3ee3193cc8e9043017b1f507b606c72acab77ddb SHA1 (patch-ab) = 63635f4f7fd96b4e7a40bfbaffd5673b40db3a13 -SHA1 (patch-ac) = fb2e20b2342738eae701e4b75ac695eca810db41 -SHA1 (patch-ba) = edf6708fe7ef3b0e899473a13fe709d8c561e14b +SHA1 (patch-ac) = ed4545088fc0cc56fd577fbc122a073f12d751aa +SHA1 (patch-ba) = c6a062e733e09eb56144177444188dcaf0cfcb06 SHA1 (patch-bb) = dc0ea2dd366b793003218858ca3d67bc285a2089 -SHA1 (patch-bc) = 95a27125f8e17a5433bab273958d49ec3e0f3376 SHA1 (patch-bd) = 1c9cd4587314ee45bccdf08c6ecaabbe641aaa5d +SHA1 (patch-be) = ed237b47e9f8033e8fdfc4258a1bdd5ebaff469e SHA1 (patch-ca) = 7f4b008eee3b9f1bd3abc49686f70a327376af55 SHA1 (patch-cb) = 30f98037c6a5ba753bc19b20564e177ad1e8c1a9 SHA1 (patch-cc) = d5955ec8b51950aadf930a62743601c2d4a0a127 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@ + -- cgit v1.2.3