Date: Wed, 17 Feb 1999 15:52:41 -0800 (PST) From: marcel@scc.nl To: freebsd-gnats-submit@freebsd.org Subject: ports/10137: version update of RPM port to version 2.5.5 Message-ID: <19990217235241.651D911292@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 10137 >Category: ports >Synopsis: version update of RPM port to version 2.5.5 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Feb 17 16:00:01 PST 1999 >Closed-Date: >Last-Modified: >Originator: Marcel Moolenaar >Release: 3.1-STABLE >Organization: SCC >Environment: FreeBSD scones.sup.scc.nl 3.1-BETA FreeBSD 3.1-BETA #23: Wed Feb 17 22:30:55 CET 1999 marcel@scones.sup.scc.nl:/usr/src/sys/compile/SCONES i386 >Description: A set of patches against the current port of RPM (version 2.5.1) to upgrade it to install version 2.5.5 of RPM. This port expects the database in /var/lib/rpm by default (as does RPM on Red Hat installations) instead of /var/local/lib/rpm. >How-To-Repeat: n/a >Fix: Files to remove: patches/patch-ae patches/patch-ag patches/patch-ah patches/patch-ai patches/patch-aj Patchset: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/misc/rpm/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- Makefile 1998/12/14 17:02:13 1.17 +++ Makefile 1999/02/11 23:07:18 @@ -1,17 +1,14 @@ # New ports collection makefile for: rpm -# Version required: 2.5.1 +# Version required: 2.5.5 # Date created: 23 January 1997 # Whom: Thomas Gellekum <tg@FreeBSD.ORG> # # $Id: Makefile,v 1.17 1998/12/14 17:02:13 tg Exp $ # -DISTNAME= rpm-2.5.1 +DISTNAME= rpm-2.5.5 CATEGORIES= misc -MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/code/rpm/ \ - ftp://ftp.uni-bayreuth.de/pub/linux/redhat/code/rpm/ \ - ftp://mirror.nucba.ac.jp/mirror/redhat/code/rpm/ \ - ftp://ftp.cdrom.com/pub/linux/redhat/code/rpm/ +MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/ MAINTAINER= tg@FreeBSD.ORG Index: files/md5 =================================================================== RCS file: /home/ncvs/ports/misc/rpm/files/md5,v retrieving revision 1.13 diff -u -r1.13 md5 --- md5 1998/06/02 10:52:56 1.13 +++ md5 1999/02/11 23:16:55 @@ -1 +1 @@ -MD5 (rpm-2.5.1.tar.gz) = 7ad09e9b98bc839a0646c62dd130186e +MD5 (rpm-2.5.5.tar.gz) = 25a830dc96ea9de63e9d718ba8070d11 Index: patches/patch-ac =================================================================== RCS file: /home/ncvs/ports/misc/rpm/patches/patch-ac,v retrieving revision 1.3 diff -u -r1.3 patch-ac --- patch-ac 1997/07/02 12:40:33 1.3 +++ patch-ac 1999/02/11 23:22:49 @@ -1,10 +1,11 @@ ---- 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 - - #include "config.h" -+#include <sys/types.h> - - #if HAVE_FNMATCH_H - #include <fnmatch.h> +*** build/parseScript.c.old Thu Feb 11 23:46:16 1999 +--- build/parseScript.c Thu Feb 11 23:46:50 1999 +*************** +*** 1,6 **** + #include "config.h" + +- #include <malloc.h> + #include <string.h> + + #include "intl.h" +--- 1,5 ---- Index: patches/patch-ad =================================================================== RCS file: /home/ncvs/ports/misc/rpm/patches/patch-ad,v retrieving revision 1.3 diff -u -r1.3 patch-ad --- patch-ad 1997/09/01 09:26:36 1.3 +++ patch-ad 1999/02/11 23:22:57 @@ -1,10 +1,12 @@ ---- lib/rpmrc.c.orig Fri Aug 29 17:49:53 1997 -+++ lib/rpmrc.c Mon Sep 1 11:23:10 1997 -@@ -5,6 +5,7 @@ - # include <alloca.h> - #endif - -+#include <sys/time.h> - #include <ctype.h> - #include <errno.h> - #include <fcntl.h> +*** build/spec.c.old Thu Feb 11 23:46:23 1999 +--- build/spec.c Thu Feb 11 23:46:58 1999 +*************** +*** 1,7 **** + #include "config.h" + + #include <stdlib.h> +- #include <malloc.h> + #include <string.h> + + #include "files.h" +--- 1,6 ---- Index: patches/patch-af =================================================================== RCS file: /home/ncvs/ports/misc/rpm/patches/patch-af,v retrieving revision 1.7 diff -u -r1.7 patch-af --- patch-af 1998/06/08 07:49:00 1.7 +++ patch-af 1999/02/17 23:20:18 @@ -1,30 +1,19 @@ ---- Makefile.in.orig Wed May 27 16:49:34 1998 -+++ Makefile.in Tue Jun 2 11:52:36 1998 -@@ -24,6 +24,7 @@ - RPMBINDIR=$(subst usr/bin,bin,$(BINDIR)) - MANDIR=$(prefix)/man/man8 - LIBDIR=$(libdir) -+DATADIR=$(datadir) - INCDIR=$(prefix)/include/rpm - ETCDIR=$(ROOT)/etc - -@@ -51,7 +52,7 @@ - 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) -@@ -127,8 +128,8 @@ - $(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)/rp mrc -- $(INSTALL_DATA) -m 644 $(srcdir)/rpmpopt $(installprefix)/$(LIBDIR)/rpmp opt -+ $(INSTALL_DATA) -m 644 $(topdir)/lib-rpmrc $(installprefix)/$(DATADIR)/m isc/rpmrc -+ $(INSTALL_DATA) -m 644 $(srcdir)/rpmpopt $(installprefix)/$(DATADIR)/mis c/rpmpopt - (cd lib; $(MAKE) LIBDIR=$(installprefix)/$(LIBDIR) INCDIR=$(installprefi x)/$(INCDIR) install) - for d in $(INSTSUBDIRS); do \ - (cd $$d; $(MAKE) installprefix=$(installprefix) LIBDIR=$(install prefix)/$(LIBDIR) INCDIR=$(installprefix)/$(INCDIR) install) ;\ +*** lib-rpmrc.in.old Tue Oct 6 20:57:15 1998 +--- lib-rpmrc.in Thu Feb 18 00:18:11 1999 +*************** +*** 5,11 **** + # belong in /etc/rpmrc, not here. This file will be replaced + # whenever a new version of RPM is installed. + +! dbpath: @varprefix@/lib/rpm + topdir: @prefix@/src/redhat + tmppath: @tmpdir@ + gzipbin: @GZIPBIN@ +--- 5,11 ---- + # belong in /etc/rpmrc, not here. This file will be replaced + # whenever a new version of RPM is installed. + +! dbpath: /var/lib/rpm + topdir: @prefix@/src/redhat + tmppath: @tmpdir@ + gzipbin: @GZIPBIN@ Index: pkg/PLIST =================================================================== RCS file: /home/ncvs/ports/misc/rpm/pkg/PLIST,v retrieving revision 1.7 diff -u -r1.7 PLIST --- PLIST 1998/08/18 19:04:13 1.7 +++ PLIST 1999/02/17 22:46:37 @@ -1,12 +1,18 @@ bin/gendiff bin/rpm -bin/find-requires -bin/find-provides bin/rpm2cpio include/rpm/rpmlib.h include/rpm/dbindex.h include/rpm/header.h lib/librpm.a -share/misc/rpmrc -share/misc/rpmpopt +@unexec rm %D/lib/rpmrc +@unexec rm %D/lib/rpmpopt +lib/rpm/mkinstalldirs +lib/rpm/find-provides +lib/rpm/find-requires +lib/rpm/rpmrc +lib/rpm/rpmpopt +lib/rpm/freshen.sh +lib/rpm/find-lang.sh @dirrm include/rpm +@dirrm lib/rpm >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990217235241.651D911292>