From 3673ac35bbc6755d792e9577779926e17bf1e605 Mon Sep 17 00:00:00 2001 From: Yukihiro Nakai Date: Tue, 17 Oct 2000 08:42:03 +0000 Subject: Update to 3.0.6 PR: misc/21801 Submitted by: KATO Tsuguru --- misc/rpm/Makefile | 28 +++++++++--- misc/rpm/distinfo | 2 +- misc/rpm/files/patch-av | 11 +++++ misc/rpm/files/patch-aw | 11 +++++ misc/rpm/files/patch-ax | 20 +++++++++ misc/rpm/files/patch-ay | 49 +++++++++++++++++++++ misc/rpm/files/patch-ba | 11 +++++ misc/rpm/files/patch-bb | 20 +++++++++ misc/rpm/pkg-plist | 114 ++++++++++++++++++++++++++++++++++++++++++------ 9 files changed, 246 insertions(+), 20 deletions(-) create mode 100644 misc/rpm/files/patch-av create mode 100644 misc/rpm/files/patch-aw create mode 100644 misc/rpm/files/patch-ax create mode 100644 misc/rpm/files/patch-ay create mode 100644 misc/rpm/files/patch-ba create mode 100644 misc/rpm/files/patch-bb (limited to 'misc') diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile index 5f997fcab36b..09b274afdc9b 100644 --- a/misc/rpm/Makefile +++ b/misc/rpm/Makefile @@ -6,19 +6,35 @@ # PORTNAME= rpm -PORTVERSION= 2.5.6 +PORTVERSION= 3.0.6 CATEGORIES= misc -MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/ +MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ MAINTAINER= nakai@FreeBSD.org +LIB_DEPENDS= bz2.1:${PORTSDIR}/archivers/bzip2 \ + intl.1:${PORTSDIR}/devel/gettext + USE_GMAKE= yes -USE_AUTOCONF= yes -CONFIGURE_ARGS= --disable-nls +USE_AUTOMAKE= yes +USE_LIBTOOL= yes +CONFIGURE_ARGS= --with-glob +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" +INSTALL_SHLIB= yes + +MANLANG= "" ja pl ru +MAN1= gendiff.1 +MAN3= popt.3 MAN8= rpm.8 rpm2cpio.8 -pre-configure: - @(cd ${WRKSRC}/popt && ${AUTOCONF}) +post-configure: + ( WRKSRC=${WRKSRC}/popt make do-configure ) + +post-patch: +.for file in rpm.c doc/rpm.8 lib/macro.c lib/rpmrc.c + @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file} +.endfor .include diff --git a/misc/rpm/distinfo b/misc/rpm/distinfo index c95aa14fbf95..bdc4be2dcb73 100644 --- a/misc/rpm/distinfo +++ b/misc/rpm/distinfo @@ -1 +1 @@ -MD5 (rpm-2.5.6.tar.gz) = 6676a957718f498d76554d5c42ff3519 +MD5 (rpm-3.0.6.tar.gz) = 71961a796fbb04d2cf22a37337b63da8 diff --git a/misc/rpm/files/patch-av b/misc/rpm/files/patch-av new file mode 100644 index 000000000000..6b13ae1ad123 --- /dev/null +++ b/misc/rpm/files/patch-av @@ -0,0 +1,11 @@ +--- aclocal.m4.orig Thu Sep 14 04:41:44 2000 ++++ aclocal.m4 Wed Oct 4 04:45:55 2000 +@@ -738,7 +738,7 @@ + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo +- DATADIRNAME=lib]) ++ DATADIRNAME=share]) + INSTOBJEXT=.mo + fi + fi diff --git a/misc/rpm/files/patch-aw b/misc/rpm/files/patch-aw new file mode 100644 index 000000000000..b85c48e92d53 --- /dev/null +++ b/misc/rpm/files/patch-aw @@ -0,0 +1,11 @@ +--- rpm.c.orig Thu Sep 14 02:15:44 2000 ++++ rpm.c Thu Oct 5 00:37:37 2000 +@@ -313,7 +313,7 @@ + _("print the version of rpm being used")); + puts( _(" all modes support the following arguments:")); + printHelpLine(_(" --rcfile "), +- _("use instead of /etc/rpmrc and $HOME/.rpmrc")); ++ _("use instead of %%PREFIX%%/etc/rpmrc and $HOME/.rpmrc")); + printHelpLine( " -v ", + _("be a little more verbose")); + printHelpLine( " -vv ", diff --git a/misc/rpm/files/patch-ax b/misc/rpm/files/patch-ax new file mode 100644 index 000000000000..d9ffff14843c --- /dev/null +++ b/misc/rpm/files/patch-ax @@ -0,0 +1,20 @@ +--- macros.in.orig Thu Oct 5 13:31:06 2000 ++++ macros.in Thu Oct 5 13:31:25 2000 +@@ -104,7 +104,7 @@ + # will be used if the per-platform macro file does not exist.. + # + %_arch @RPMCANONARCH@ +-%_vendor @RPMCANONVENDOR@ ++%_vendor freebsd + %_os @RPMCANONOS@ + %_target_platform %{_target_cpu}-%{_vendor}-%{_target_os} + # +@@ -145,7 +145,7 @@ + %_host @host@ + %_host_alias @host_alias@ + %_host_cpu @host_cpu@ +-%_host_vendor @host_vendor@ ++%_host_vendor unknown + %_host_os @host_os@ + %_target %{_host} + %_target_alias %{_host_alias} diff --git a/misc/rpm/files/patch-ay b/misc/rpm/files/patch-ay new file mode 100644 index 000000000000..307bb3fff8db --- /dev/null +++ b/misc/rpm/files/patch-ay @@ -0,0 +1,49 @@ +--- doc/rpm.8.orig Wed Aug 30 05:27:18 2000 ++++ doc/rpm.8 Wed Oct 4 22:46:12 2000 +@@ -86,7 +86,7 @@ + .IP "\fB\-\-rcfile \fI\fP" + Each of the files in the colon separated \fI\fP is read + sequentially by \fBrpm\fP for configuration information. +-The default \fI\fP is \fB/usr/lib/rpm/rpmrc:/etc/rpmrc:~/.rpmrc\fP. ++The default \fI\fP is \fB%%PREFIX%%/lib/rpm/rpmrc:%%PREFIX%%/etc/rpmrc:~/.rpmrc\fP. + Only the first file in the list must exist, and tildes will be expanded to + the value of \fB$HOME\fP. + .IP "\fB\-\-root \fI\fP" +@@ -493,17 +493,17 @@ + + For example, to be able to use PGP to sign packages as the user + \fB"John Doe "\fP from the key rings located in +-\fB/etc/rpm/.pgp\fP using the executable \fB/usr/bin/pgp\fP you would include ++\fB%%PREFIX%%/etc/rpm/.pgp\fP using the executable \fB%%PREFIX%%/bin/pgp\fP you would include + + .I "\fB%_signature pgp\fP" + +-.I "\fB%_pgp_path /etc/rpm/.pgp\fP" ++.I "\fB%_pgp_path %%PREFIX%%/etc/rpm/.pgp\fP" + + .I "\fB%_pgp_name John Doe \fP" + +-.I "\fB%_pgpbin /usr/bin/pgp\fP" ++.I "\fB%_pgpbin %%PREFIX%%/bin/pgp\fP" + +-in a macro configuration file. Use \fB/etc/rpm/macros\fP for per-system ++in a macro configuration file. Use \fB%%PREIFX%%/etc/rpm/macros\fP for per-system + configuration and \fB~/.rpmmacros\fP for per-user configuration. + + .SH REBUILD DATABASE OPTIONS +@@ -575,11 +575,11 @@ + + .SH FILES + .nf +-/usr/lib/rpm/rpmrc +-/etc/rpmrc ++%%PREFIX%%/lib/rpm/rpmrc ++%%PREIFX%%/etc/rpmrc + ~/.rpmrc +-/usr/lib/rpm/macros +-/etc/rpm/macros ++%%PREFIX%%/lib/rpm/macros ++%%PREFIX%%/etc/rpm/macros + ~/.rpmmacros + /var/lib/rpm/conflictsindex.rpm + /var/lib/rpm/fileindex.rpm diff --git a/misc/rpm/files/patch-ba b/misc/rpm/files/patch-ba new file mode 100644 index 000000000000..a41025f75309 --- /dev/null +++ b/misc/rpm/files/patch-ba @@ -0,0 +1,11 @@ +--- lib/macro.c.orig Mon Jul 10 00:35:57 2000 ++++ lib/macro.c Wed Oct 4 23:04:43 2000 +@@ -1608,7 +1608,7 @@ + + #if defined(EVAL_MACROS) + +-char *macrofiles = "/usr/lib/rpm/macros:/etc/rpm/macros:~/.rpmmacros"; ++char *macrofiles = "%%PREFIX%%/lib/rpm/macros:%%PREFIX%%/etc/rpm/macros:~/.rpmmacros"; + + int + main(int argc, char *argv[]) diff --git a/misc/rpm/files/patch-bb b/misc/rpm/files/patch-bb new file mode 100644 index 000000000000..f94da33da1c3 --- /dev/null +++ b/misc/rpm/files/patch-bb @@ -0,0 +1,20 @@ +--- lib/rpmrc.c.orig Thu Sep 14 02:29:18 2000 ++++ lib/rpmrc.c Wed Oct 4 23:03:36 2000 +@@ -13,7 +13,7 @@ + + #include "misc.h" + +-static const char *defrcfiles = LIBRPMRC_FILENAME ":/etc/rpmrc:~/.rpmrc"; ++static const char *defrcfiles = LIBRPMRC_FILENAME ":%%PREFIX%%/etc/rpmrc:~/.rpmrc"; + + struct machCacheEntry { + const char * name; +@@ -858,7 +858,7 @@ + /* we are on ncr-sysv4 */ + char *prelid = NULL; + FD_t fd; +- fd = Fopen("/etc/.relid", "r.fdio"); ++ fd = Fopen("%%PREFIX%%/etc/.relid", "r.fdio"); + if (!Ferror(fd)) { + chptr = (char *) xcalloc(1, 256); + if (chptr != NULL) { diff --git a/misc/rpm/pkg-plist b/misc/rpm/pkg-plist index dacb62f93fb9..1fe0d1d9abbb 100644 --- a/misc/rpm/pkg-plist +++ b/misc/rpm/pkg-plist @@ -1,20 +1,108 @@ bin/gendiff bin/rpm bin/rpm2cpio -include/rpm/rpmlib.h +include/popt.h include/rpm/dbindex.h include/rpm/header.h +include/rpm/misc.h +include/rpm/rpmbuild.h +include/rpm/rpmio.h +include/rpm/rpmlib.h +include/rpm/rpmmacro.h +include/rpm/rpmspec.h +include/rpm/rpmurl.h +include/rpm/stringbuf.h lib/librpm.a -@unexec rm %D/etc/rpmrc -@unexec rm %D/etc/rpmpopt -etc/rpm/mkinstalldirs -etc/rpm/find-provides -etc/rpm/find-requires -etc/rpm/rpmrc -etc/rpm/rpmpopt -etc/rpm/freshen.sh -etc/rpm/find-lang.sh -@exec ln -sf %D/etc/rpm/rpmrc %D/etc/rpmrc -@exec ln -sf %D/etc/rpm/rpmpopt %D/etc/rpmpopt +lib/librpm.so +lib/librpm.so.0 +lib/librpmbuild.a +lib/librpmbuild.so +lib/librpmbuild.so.0 +lib/libpopt.a +lib/libpopt.la +lib/libpopt.so +lib/libpopt.so.0 +lib/rpm/brp-compress +lib/rpm/brp-redhat +lib/rpm/brp-sparc64-linux +lib/rpm/brp-strip +lib/rpm/brp-strip-comment-note +lib/rpm/check-prereqs +lib/rpm/config.guess +lib/rpm/config.sub +lib/rpm/convertrpmrc.sh +lib/rpm/cpanflute +lib/rpm/find-lang.sh +lib/rpm/find-prov.pl +lib/rpm/find-provides +lib/rpm/find-provides.perl +lib/rpm/find-req.pl +lib/rpm/find-requires +lib/rpm/find-requires.perl +lib/rpm/get_magic.pl +lib/rpm/getpo.sh +lib/rpm/http.req +lib/rpm/macros +lib/rpm/magic.prov +lib/rpm/magic.req +lib/rpm/mkinstalldirs +lib/rpm/perl.prov +lib/rpm/perl.req +lib/rpm/rpmdiff +lib/rpm/rpmdiff.cgi +lib/rpm/rpmgettext +lib/rpm/rpmpopt +lib/rpm/rpmputtext +lib/rpm/rpmrc +lib/rpm/u_pkg.sh +lib/rpm/vpkg-provides.sh +lib/rpm/vpkg-provides2.sh +lib/rpmpopt +lib/rpmrc +share/locale/cs/LC_MESSAGES/rpm.mo +share/locale/de/LC_MESSAGES/rpm.mo +share/locale/fi/LC_MESSAGES/rpm.mo +share/locale/fr/LC_MESSAGES/rpm.mo +share/locale/ja/LC_MESSAGES/rpm.mo +share/locale/pl/LC_MESSAGES/rpm.mo +share/locale/pt_BR/LC_MESSAGES/rpm.mo +share/locale/ro/LC_MESSAGES/popt.mo +share/locale/ru/LC_MESSAGES/rpm.mo +share/locale/sk/LC_MESSAGES/popt.mo +share/locale/sk/LC_MESSAGES/rpm.mo +share/locale/sl/LC_MESSAGES/rpm.mo +share/locale/sr/LC_MESSAGES/rpm.mo +share/locale/sv/LC_MESSAGES/rpm.mo +share/locale/tr/LC_MESSAGES/rpm.mo +@dirrm lib/rpm @dirrm include/rpm -@dirrm etc/rpm +@unexec rmdir %D/src/redhat/SRPMS 2>/dev/null || true +@unexec rmdir %D/src/redhat/SPECS 2>/dev/null || true +@unexec rmdir %D/src/redhat/SOURCES 2>/dev/null || true +@unexec rmdir %D/src/redhat/RPMS/noarch 2>/dev/null || true +@unexec rmdir %D/src/redhat/RPMS/athlon 2>/dev/null || true +@unexec rmdir %D/src/redhat/RPMS/i686 2>/dev/null || true +@unexec rmdir %D/src/redhat/RPMS/i586 2>/dev/null || true +@unexec rmdir %D/src/redhat/RPMS/i486 2>/dev/null || true +@unexec rmdir %D/src/redhat/RPMS/i386 2>/dev/null || true +@unexec rmdir %D/src/redhat/RPMS 2>/dev/null || true +@unexec rmdir %D/src/redhat/BUILD 2>/dev/null || true +@unexec rmdir %D/src/redhat 2>/dev/null || true +@unexec rmdir %D/src 2>/dev/null || true +@unexec rmdir /var/lib/rpm 2>/dev/null || true +@unexec rmdir /var/lib 2>/dev/null || true +@exec mkdir -p /var/lib +@exec mkdir -p /var/lib/rpm +@exec mkdir -p %D/src +@exec mkdir -p %D/src/redhat +@exec mkdir -p %D/src/redhat/BUILD +@exec mkdir -p %D/src/redhat/RPMS +@exec mkdir -p %D/src/redhat/RPMS/athlon +@exec mkdir -p %D/src/redhat/RPMS/i386 +@exec mkdir -p %D/src/redhat/RPMS/i486 +@exec mkdir -p %D/src/redhat/RPMS/i586 +@exec mkdir -p %D/src/redhat/RPMS/i686 +@exec mkdir -p %D/src/redhat/RPMS/noarch +@exec mkdir -p %D/src/redhat/SOURCES +@exec mkdir -p %D/src/redhat/SPECS +@exec mkdir -p %D/src/redhat/SRPMS -- cgit v1.2.3