From owner-freebsd-emulation@FreeBSD.ORG Wed Feb 16 08:12:37 2005 Return-Path: Delivered-To: freebsd-emulation@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D310C16A4CE for ; Wed, 16 Feb 2005 08:12:37 +0000 (GMT) Received: from dragon.nuxi.com (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F10443D45 for ; Wed, 16 Feb 2005 08:12:37 +0000 (GMT) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1]) by dragon.nuxi.com (8.13.1/8.13.1) with ESMTP id j1G8CaM1034676 for ; Wed, 16 Feb 2005 00:12:37 -0800 (PST) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.13.1/8.13.1/Submit) id j1G8Ca7B034675 for freebsd-emulation@freebsd.org; Wed, 16 Feb 2005 00:12:36 -0800 (PST) (envelope-from obrien) Date: Wed, 16 Feb 2005 00:12:36 -0800 From: "David O'Brien" To: freebsd-emulation@freebsd.org Message-ID: <20050216081236.GA34471@dragon.nuxi.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i X-Operating-System: FreeBSD 6.0-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 Subject: AMD64 patch for 'ports/x11-toolkits/linux-gtk' X-BeenThere: freebsd-emulation@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: obrien@freebsd.org List-Id: Development of Emulators of other operating systems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Feb 2005 08:12:38 -0000 Any have a problem with this patch? 1. fix ordering to better follow Mk/bsd.port.mk guidelines 2. allow "ARCH" to be over-ridable. -- -- David (obrien@FreeBSD.org) Index: Makefile =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/linux-gtk/Makefile,v retrieving revision 1.28 diff -u -r1.28 Makefile --- Makefile 31 Dec 2004 18:24:09 -0000 1.28 +++ Makefile 16 Feb 2005 08:09:19 -0000 @@ -21,10 +21,17 @@ BUILD_DEPENDS+= rpm:${PORTSDIR}/archivers/rpm RUN_DEPENDS?= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs +ONLY_FOR_ARCHS?= i386 alpha amd64 + +.include + +.if (${ARCH} == "amd64") +ARCH= i386 +RPMFLAGS+= --ignorearch +.endif + USE_LINUX_PREFIX= yes USE_LINUX= yes - -ONLY_FOR_ARCHS?= i386 alpha DIST_SUBDIR?= rpm EXTRACT_ONLY= NO_BUILD= yes @@ -66,4 +73,4 @@ ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' \ >> ${PLIST}.new -.include +.include