From owner-freebsd-eclipse@FreeBSD.ORG Mon Jan 23 16:00:27 2006 Return-Path: X-Original-To: freebsd-eclipse@hub.freebsd.org Delivered-To: freebsd-eclipse@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF20E16A41F for ; Mon, 23 Jan 2006 16:00:27 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25CAC440EA for ; Mon, 23 Jan 2006 16:00:27 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k0NG0Q83012029 for ; Mon, 23 Jan 2006 16:00:26 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k0NG0QjW012028; Mon, 23 Jan 2006 16:00:26 GMT (envelope-from gnats) Date: Mon, 23 Jan 2006 16:00:26 GMT Message-Id: <200601231600.k0NG0QjW012028@freefall.freebsd.org> To: freebsd-eclipse@FreeBSD.org From: Mikhail Teterin Cc: Subject: Re: ports/92190: [patch] Enable x11-toolkits/swt31 for amd64 systems X-BeenThere: freebsd-eclipse@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Mikhail Teterin List-Id: "FreeBSD users of eclipse EDI, tools, rich client apps & ports." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jan 2006 16:00:27 -0000 The following reply was made to PR ports/92190; it has been noted by GNATS. From: Mikhail Teterin To: bug-followup@freebsd.org, past@ebs.gr Cc: Subject: Re: ports/92190: [patch] Enable x11-toolkits/swt31 for amd64 systems Date: Mon, 23 Jan 2006 10:58:38 -0500 --Boundary-00=_v0P1DPKiIMVFwCV Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline I tried this patch with the newer 3.1.1 release, and it worked fine. I am now able to run azureus on my FreeBSD/amd64-6.0. Here is the combination patch (no diffs for distinfo, as that needs to be manually crafted anyway). -mi --Boundary-00=_v0P1DPKiIMVFwCV Content-Type: text/x-diff; charset="us-ascii"; name="swt.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="swt.diff" Index: Makefile =================================================================== RCS file: /home/pcvs/ports/x11-toolkits/swt31/Makefile,v retrieving revision 1.2 diff -U2 -r1.2 Makefile --- Makefile 4 Jan 2006 14:31:28 -0000 1.2 +++ Makefile 23 Jan 2006 15:55:58 -0000 @@ -7,17 +7,15 @@ PORTNAME= swt -PORTVERSION= 3.1 +PORTVERSION= 3.1.1 CATEGORIES= x11-toolkits devel java MASTER_SITES= ${MASTER_SITE_ECLIPSE} -MASTER_SITE_SUBDIR= R-${PORTVERSION}-200506271435 +MASTER_SITE_SUBDIR= R-${PORTVERSION}-200509290840 MAINTAINER= freebsd-eclipse@freebsd.org COMMENT= Standard Widget Toolkit for Java -SWT_VERSION= 3138 +SWT_VERSION= 3139 NO_WRKSUBDIR= yes -# Someone with amd64 hardware must finish the amd64 support before it -# is enabled -ONLY_FOR_ARCHS= i386 +ONLY_FOR_ARCHS= i386 amd64 USE_GMAKE= yes USE_ZIP= yes @@ -36,4 +34,22 @@ JAVA_OS= native +.if defined(WITHOUT_GNOMEVFS) +MAKE_GNOME= +USE_GNOME= gtk20 pkgconfig +.else +MAKE_GNOME= make_gnome +USE_GNOME= gtk20 gnomevfs2 libgnome libgnomeui pkgconfig +PLIST_FILES+= lib/libswt-gnome-gtk-%%BUILD%%.so +.endif + +.include + +.if (${ARCH} == "amd64") +DISTNAME= swt-${PORTVERSION}-gtk-linux-x86_64 +WITHOUT_CAIRO= yes +.else +DISTNAME= swt-${PORTVERSION}-gtk-linux-x86 +.endif + .if !defined(WITHOUT_MOZILLA) PLIST_FILES+= lib/libswt-mozilla-gtk-%%BUILD%%.so @@ -59,21 +75,4 @@ .endif -.if defined(WITHOUT_GNOMEVFS) -MAKE_GNOME= -USE_GNOME= gtk20 pkgconfig -.else -MAKE_GNOME= make_gnome -USE_GNOME= gtk20 gnomevfs2 libgnome libgnomeui pkgconfig -PLIST_FILES+= lib/libswt-gnome-gtk-%%BUILD%%.so -.endif - -.include - -.if (${ARCH} == "amd64") -DISTNAME= swt-${PORTVERSION}-gtk-linux-x86_64 -.else -DISTNAME= swt-${PORTVERSION}-gtk-linux-x86 -.endif - MAKE_ENV+= BROWSER="${BROWSER}" \ JAVA_HOME="${JAVA_HOME}" \ --Boundary-00=_v0P1DPKiIMVFwCV--