From owner-freebsd-amd64@FreeBSD.ORG  Mon Jan  3 09:13:12 2005
Return-Path: <owner-freebsd-amd64@FreeBSD.ORG>
Delivered-To: freebsd-amd64@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E8DB516A4CE
	for <freebsd-amd64@freebsd.org>; Mon,  3 Jan 2005 09:13:12 +0000 (GMT)
Received: from ares.wolfpond.org (ns1.wolfpond.org [62.212.96.219])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7178E43D1D
	for <freebsd-amd64@freebsd.org>; Mon,  3 Jan 2005 09:13:08 +0000 (GMT)
	(envelope-from ftigeot@wolfpond.org)
Received: from aoi.wolfpond.org (aoi.wolfpond.org
	[IPv6:2001:7a8:24db:1:20c:76ff:feb4:27e1])
	by ares.wolfpond.org (8.13.1/8.13.1) with ESMTP id j039D2UC038710
	for <freebsd-amd64@freebsd.org>; Mon, 3 Jan 2005 10:13:02 +0100 (CET)
	(envelope-from ftigeot@aoi.wolfpond.org)
Received: from aoi.wolfpond.org (localhost [127.0.0.1])
	by aoi.wolfpond.org (8.13.1/8.13.1) with ESMTP id j039Cx7l027802
	for <freebsd-amd64@freebsd.org>; Mon, 3 Jan 2005 10:12:59 +0100 (CET)
	(envelope-from ftigeot@aoi.wolfpond.org)
Received: (from ftigeot@localhost)
	by aoi.wolfpond.org (8.13.1/8.13.1/Submit) id j039CwqL027801
	for freebsd-amd64@freebsd.org; Mon, 3 Jan 2005 10:12:58 +0100 (CET)
	(envelope-from ftigeot)
Date: Mon, 3 Jan 2005 10:12:58 +0100
From: Francois Tigeot <ftigeot@wolfpond.org>
To: freebsd-amd64@freebsd.org
Message-ID: <20050103091258.GA17255@aoi.wolfpond.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="TB36FDmn/VVEgNH/"
Content-Disposition: inline
User-Agent: Mutt/1.4.2.1i
Subject: [patch] Enable java/linux-sun-jdk14 installation with linux_base-8
X-BeenThere: freebsd-amd64@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting FreeBSD to the AMD64 platform <freebsd-amd64.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-amd64>,
	<mailto:freebsd-amd64-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-amd64>
List-Post: <mailto:freebsd-amd64@freebsd.org>
List-Help: <mailto:freebsd-amd64-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-amd64>,
	<mailto:freebsd-amd64-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Jan 2005 09:13:13 -0000


--TB36FDmn/VVEgNH/
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,

With the new linux_base-8 default java/linux-sun-jdk14 does not install out 
of the box.

The attached patch should fix that.

It would be nice if some people could test it before I fill a PR.

-- 
Francois Tigeot

--TB36FDmn/VVEgNH/
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-linux32

--- x11-toolkits/linux-gtk/Makefile.orig	Sat Jan  1 11:50:54 2005
+++ x11-toolkits/linux-gtk/Makefile	Sun Jan  2 09:45:16 2005
@@ -24,7 +24,7 @@
 USE_LINUX_PREFIX=	yes
 USE_LINUX=	yes
 
-ONLY_FOR_ARCHS?=	i386 alpha
+ONLY_FOR_ARCHS?=	i386 alpha amd64
 DIST_SUBDIR?=	rpm
 EXTRACT_ONLY=
 NO_BUILD=	yes
@@ -67,3 +67,9 @@
 		>> ${PLIST}.new
 
 .include <bsd.port.mk>
+
+.if (${ARCH} == "amd64")
+ARCH=	i386
+MACHINE_ARCH=	i386
+RPMFLAGS+= --ignorearch
+.endif
--- textproc/linux-expat/Makefile.orig	Sat Jan  1 11:50:21 2005
+++ textproc/linux-expat/Makefile	Sun Jan  2 09:46:41 2005
@@ -16,7 +16,7 @@
 RUN_DEPENDS=
 
 BASEVERSION=	9
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 PLIST=		${WRKDIR}/plist
 RPM_SET=	expat-1.95.5-2.i386.rpm
 
--- x11-fonts/linux-fontconfig/Makefile.orig	Fri Dec 31 19:24:09 2004
+++ x11-fonts/linux-fontconfig/Makefile	Sun Jan  2 13:06:43 2005
@@ -19,7 +19,7 @@
 
 USE_REINPLACE=	yes
 BASEVERSION=	9
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 PLIST=		${WRKDIR}/plist
 RPM_SET=	fontconfig-2.1-9.i386.rpm
 

--TB36FDmn/VVEgNH/--