diff options
| author | Patrick Li <pat@FreeBSD.org> | 2005-05-27 22:02:06 +0000 |
|---|---|---|
| committer | Patrick Li <pat@FreeBSD.org> | 2005-05-27 22:02:06 +0000 |
| commit | 562aedf3940fb635eec59fa894d2856417439a3c (patch) | |
| tree | 925b7ded4feca9b45d9b2080140d301279efe8b5 /archivers | |
| parent | 3f9322712a9781e51c0c4cca36b85318a164413d (diff) | |
- sync rpmrc with FC3 only to make i386 and amd64 archs
compatible (no --ignorearch necessary)
- bump PORTREVISION
PR: ports/80922
Submitted by: KOMATSU Shinichiro <koma2@lovepeers.org>
Notes
Notes:
svn path=/head/; revision=136301
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/rpm/Makefile | 2 | ||||
| -rw-r--r-- | archivers/rpm/files/patch-rpmrc.in | 45 |
2 files changed, 46 insertions, 1 deletions
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile index 4ed45e4059f0..c256738247ce 100644 --- a/archivers/rpm/Makefile +++ b/archivers/rpm/Makefile @@ -7,7 +7,7 @@ PORTNAME= rpm PORTVERSION= 3.0.6 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= archivers MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ diff --git a/archivers/rpm/files/patch-rpmrc.in b/archivers/rpm/files/patch-rpmrc.in new file mode 100644 index 000000000000..2d23fa99418b --- /dev/null +++ b/archivers/rpm/files/patch-rpmrc.in @@ -0,0 +1,45 @@ +--- rpmrc.in.orig Thu Sep 14 02:55:15 2000 ++++ rpmrc.in Sat May 7 01:21:44 2005 +@@ -53,6 +53,10 @@ + arch_canon: i586: i586 1 + arch_canon: i486: i486 1 + arch_canon: i386: i386 1 ++arch_canon: x86_64: x86_64 1 ++arch_canon: amd64: amd64 1 ++arch_canon: ia32e: ia32e 1 ++ + arch_canon: alpha: alpha 2 + arch_canon: alphaev5: alphaev5 2 + arch_canon: alphaev56: alphaev56 2 +@@ -161,6 +165,10 @@ + buildarchtranslate: milan: m68kmint + buildarchtranslate: hades: m68kmint + ++buildarchtranslate: x86_64: x86_64 ++buildarchtranslate: amd64: x86_64 ++buildarchtranslate: ia32e: x86_64 ++ + ############################################################# + # Architecture compatibility + +@@ -223,6 +231,10 @@ + + arch_compat: ia64: noarch + ++arch_compat: x86_64: amd64 athlon noarch ++arch_compat: amd64: x86_64 athlon noarch ++arch_compat: ia32e: x86_64 athlon noarch ++ + os_compat: IRIX64: IRIX + os_compat: solaris2.7: solaris2.3 solaris2.4 solaris2.5 solaris2.6 + os_compat: solaris2.6: solaris2.3 solaris2.4 solaris2.5 +@@ -288,6 +300,9 @@ + + buildarch_compat: ia64: noarch + buildarch_compat: s390: noarch ++buildarch_compat: x86_64: noarch ++buildarch_compat: amd64: x86_64 ++buildarch_compat: ia32e: x86_64 + + macrofiles: @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros + |