From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 12 03:40:12 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 67EE016A4D0 for ; Thu, 12 May 2005 03:40:12 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3809543D5D for ; Thu, 12 May 2005 03:40:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4C3eCj1092398 for ; Thu, 12 May 2005 03:40:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4C3eC5V092397; Thu, 12 May 2005 03:40:12 GMT (envelope-from gnats) Resent-Date: Thu, 12 May 2005 03:40:12 GMT Resent-Message-Id: <200505120340.j4C3eC5V092397@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KOMATSU Shinichiro Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 835C716A4CE for ; Thu, 12 May 2005 03:32:03 +0000 (GMT) Received: from ksta.ms.u-tokyo.ac.jp (ksta.ms.u-tokyo.ac.jp [157.82.17.219]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2086E43D72 for ; Thu, 12 May 2005 03:32:03 +0000 (GMT) (envelope-from koma2@ksta.ms.u-tokyo.ac.jp) Received: by ksta.ms.u-tokyo.ac.jp (Postfix, from userid 1003) id 58BF656508; Thu, 12 May 2005 12:32:02 +0900 (JST) Message-Id: <20050512033202.58BF656508@ksta.ms.u-tokyo.ac.jp> Date: Thu, 12 May 2005 12:32:02 +0900 (JST) From: KOMATSU Shinichiro To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/80922: archivers/rpm: add amd64 related entries to rpmrc X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: KOMATSU Shinichiro List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 May 2005 03:40:12 -0000 >Number: 80922 >Category: ports >Synopsis: archivers/rpm: add amd64 related entries to rpmrc >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu May 12 03:40:11 GMT 2005 >Closed-Date: >Last-Modified: >Originator: KOMATSU Shinichiro >Release: FreeBSD 5.4-RELEASE amd64 >Organization: >Environment: FreeBSD 5.4-RELEASE amd64 >Description: Take amd64 related rpmrc entries from FC3 (rpm-4.3.2-21). This patch makes i386 and amd64 to be "compatible", and i386 rpm can be installed on amd64 without "--ignorearch" rpm option. >How-To-Repeat: >Fix: diff --exclude=CVS --exclude=*.log* -urN rpm.orig/Makefile rpm/Makefile --- rpm.orig/Makefile Mon Jul 26 21:13:46 2004 +++ rpm/Makefile Sat May 7 00:32:39 2005 @@ -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 --exclude=CVS --exclude=*.log* -urN rpm.orig/files/patch-rpmrc.in rpm/files/patch-rpmrc.in --- rpm.orig/files/patch-rpmrc.in Thu Jan 1 09:00:00 1970 +++ rpm/files/patch-rpmrc.in Sat May 7 01:22:17 2005 @@ -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 + >Release-Note: >Audit-Trail: >Unformatted: