diff options
author | Yukihiro Nakai <nakai@FreeBSD.org> | 2000-10-17 08:42:03 +0000 |
---|---|---|
committer | Yukihiro Nakai <nakai@FreeBSD.org> | 2000-10-17 08:42:03 +0000 |
commit | 3673ac35bbc6755d792e9577779926e17bf1e605 (patch) | |
tree | e3c4053bd2d4456bef885c8d969a9af4a83fa055 /archivers/rpm/files | |
parent | e70297e106ba80f4d248c47844fd1055ed06a673 (diff) | |
download | ports-3673ac35bbc6755d792e9577779926e17bf1e605.tar.gz ports-3673ac35bbc6755d792e9577779926e17bf1e605.zip |
Notes
Diffstat (limited to 'archivers/rpm/files')
-rw-r--r-- | archivers/rpm/files/patch-av | 11 | ||||
-rw-r--r-- | archivers/rpm/files/patch-aw | 11 | ||||
-rw-r--r-- | archivers/rpm/files/patch-ax | 20 | ||||
-rw-r--r-- | archivers/rpm/files/patch-ay | 49 | ||||
-rw-r--r-- | archivers/rpm/files/patch-ba | 11 | ||||
-rw-r--r-- | archivers/rpm/files/patch-bb | 20 |
6 files changed, 122 insertions, 0 deletions
diff --git a/archivers/rpm/files/patch-av b/archivers/rpm/files/patch-av new file mode 100644 index 000000000000..6b13ae1ad123 --- /dev/null +++ b/archivers/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/archivers/rpm/files/patch-aw b/archivers/rpm/files/patch-aw new file mode 100644 index 000000000000..b85c48e92d53 --- /dev/null +++ b/archivers/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 <file> "), +- _("use <file> instead of /etc/rpmrc and $HOME/.rpmrc")); ++ _("use <file> instead of %%PREFIX%%/etc/rpmrc and $HOME/.rpmrc")); + printHelpLine( " -v ", + _("be a little more verbose")); + printHelpLine( " -vv ", diff --git a/archivers/rpm/files/patch-ax b/archivers/rpm/files/patch-ax new file mode 100644 index 000000000000..d9ffff14843c --- /dev/null +++ b/archivers/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/archivers/rpm/files/patch-ay b/archivers/rpm/files/patch-ay new file mode 100644 index 000000000000..307bb3fff8db --- /dev/null +++ b/archivers/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<filelist>\fP" + Each of the files in the colon separated \fI<filelist>\fP is read + sequentially by \fBrpm\fP for configuration information. +-The default \fI<filelist>\fP is \fB/usr/lib/rpm/rpmrc:/etc/rpmrc:~/.rpmrc\fP. ++The default \fI<filelist>\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<dir>\fP" +@@ -493,17 +493,17 @@ + + For example, to be able to use PGP to sign packages as the user + \fB"John Doe <jdoe@foo.com>"\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 <jdoe@foo.com>\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/archivers/rpm/files/patch-ba b/archivers/rpm/files/patch-ba new file mode 100644 index 000000000000..a41025f75309 --- /dev/null +++ b/archivers/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/archivers/rpm/files/patch-bb b/archivers/rpm/files/patch-bb new file mode 100644 index 000000000000..f94da33da1c3 --- /dev/null +++ b/archivers/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) { |