1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-29 05:38:00 +00:00

- 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>
This commit is contained in:
Patrick Li 2005-05-27 22:02:06 +00:00
parent 3f9322712a
commit 562aedf394
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=136301
2 changed files with 46 additions and 1 deletions

View File

@ -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/

View File

@ -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