Date: Mon, 23 Jan 2006 11:10:20 +0200 From: "\"Panagiotis Astithas\" <Panagiotis Astithas" <past@ebs.gr> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Cc: lioux@FreeBSD.org Subject: ports/92190: [patch] Enable x11-toolkits/swt31 for amd64 systems Message-ID: <1138007420.4374@ajax.ebs.gr> Resent-Message-ID: <200601230920.k0N9K5Kp078941@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92190
>Category: ports
>Synopsis: [patch] Enable x11-toolkits/swt31 for amd64 systems
>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: Mon Jan 23 09:20:05 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Panagiotis Astithas
>Release: FreeBSD 6.0-STABLE i386
>Organization:
EBS Ltd.
>Environment:
System: FreeBSD 6.0-STABLE #6: Thu Jan 19 17:58:44 EET 2006
root@ajax.ebs.gr:/usr/obj/usr/src/sys/AJAX
>Description:
This patch enables the x11-toolkits/swt31 port for amd64 systems,
using the eclipse workaround that disables the cairo library binding.
It was verified to work by Bill Dymek <bdymek at biltmorecomm dot com>.
>How-To-Repeat:
Try to build x11-toolkits/swt31 on amd64.
>Fix:
--- swt31.patch begins here ---
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 Sat Jan 21 18:05:07 2006
@@ -16,9 +16,7 @@
SWT_VERSION= 3138
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 <bsd.port.pre.mk>
+
+.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 <bsd.port.pre.mk>
-
-.if (${ARCH} == "amd64")
-DISTNAME= swt-${PORTVERSION}-gtk-linux-x86_64
-.else
-DISTNAME= swt-${PORTVERSION}-gtk-linux-x86
.endif
MAKE_ENV+= BROWSER="${BROWSER}" \
--- swt31.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1138007420.4374>