From owner-freebsd-eclipse@FreeBSD.ORG Tue Jan 24 14:00:17 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 BB5F916A41F for ; Tue, 24 Jan 2006 14:00:17 +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 26FF143D4C for ; Tue, 24 Jan 2006 14:00:17 +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 k0OE0HM1074085 for ; Tue, 24 Jan 2006 14:00:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k0OE0HVY074084; Tue, 24 Jan 2006 14:00:17 GMT (envelope-from gnats) Date: Tue, 24 Jan 2006 14:00:17 GMT Message-Id: <200601241400.k0OE0HVY074084@freefall.freebsd.org> To: freebsd-eclipse@FreeBSD.org From: Panagiotis Astithas 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: Panagiotis Astithas 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: Tue, 24 Jan 2006 14:00:17 -0000 The following reply was made to PR ports/92190; it has been noted by GNATS. From: Panagiotis Astithas To: Mikhail Teterin Cc: bug-followup@freebsd.org Subject: Re: ports/92190: [patch] Enable x11-toolkits/swt31 for amd64 systems Date: Tue, 24 Jan 2006 15:53:46 +0200 This is a multi-part message in MIME format. --------------050001000301070006050801 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Mikhail Teterin wrote: > 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). Thanks! For the benefit of the committer I have attached the combined diff with all of our changes plus the updated distinfo. --------------050001000301070006050801 Content-Type: text/x-patch; name="swt31.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="swt31.patch" diff -ruN /usr/ports/x11-toolkits/swt31/Makefile swt31/Makefile --- /usr/ports/x11-toolkits/swt31/Makefile Wed Jan 4 16:31:28 2006 +++ swt31/Makefile Tue Jan 24 14:57:50 2006 @@ -6,19 +6,17 @@ # 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 MAKEFILE= make_freebsd.mak @@ -35,6 +33,24 @@ JAVA_VERSION= 1.4+ 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 MAKE_MOZILLA= make_mozilla @@ -56,23 +72,6 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo MAKE_CAIRO= make_cairo PLIST_FILES+= lib/libswt-cairo-gtk-%%BUILD%%.so -.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}" \ diff -ruN /usr/ports/x11-toolkits/swt31/distinfo swt31/distinfo --- /usr/ports/x11-toolkits/swt31/distinfo Wed Jan 4 11:39:36 2006 +++ swt31/distinfo Tue Jan 24 15:51:16 2006 @@ -1,6 +1,6 @@ -MD5 (swt-3.1-gtk-linux-x86_64.zip) = 37907f265059d9853911fc9538743280 -SHA256 (swt-3.1-gtk-linux-x86_64.zip) = 5314bd993327ea6e6646a437dde034d574d2e4c66e96ca6a12815fca807458ce -SIZE (swt-3.1-gtk-linux-x86_64.zip) = 2702033 -MD5 (swt-3.1-gtk-linux-x86.zip) = a7d5f5f593e423f9aec7713c548f3817 -SHA256 (swt-3.1-gtk-linux-x86.zip) = 9a12c6e0377836c277e0268b94d66b8f1a6dd46c5a51720353ec209a2956c25f -SIZE (swt-3.1-gtk-linux-x86.zip) = 2643472 +MD5 (swt-3.1.1-gtk-linux-x86_64.zip) = 32569ed25c68a2d71cd191a9c3ef46c2 +SHA256 (swt-3.1.1-gtk-linux-x86_64.zip) = 3821fb83054238da8637a51b47ac8d9d287b88964c0bf1b2ca6b208fbc4971ca +SIZE (swt-3.1.1-gtk-linux-x86_64.zip) = 2714829 +MD5 (swt-3.1.1-gtk-linux-x86.zip) = 23dfe5a4a566439c5f526d9ea3b3db1c +SHA256 (swt-3.1.1-gtk-linux-x86.zip) = ebe6df227bd72e1a028db72205c1ece0995d5f49746e4590ee1f8892fc1eb361 +SIZE (swt-3.1.1-gtk-linux-x86.zip) = 2655822 --------------050001000301070006050801--