Date: Sun, 2 Oct 2011 01:58:47 GMT From: Pedro Giffuni <giffunip@tutopia.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/161218: Update x11-toolkits/swt-devel to version 3.6.2 Message-ID: <201110020158.p921wlIF043372@red.freebsd.org> Resent-Message-ID: <201110020200.p9220LHE025444@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 161218
>Category: ports
>Synopsis: Update x11-toolkits/swt-devel to version 3.6.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 02 02:00:20 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Pedro Giffuni
>Release: 9.0-current (pre BETA1)
>Organization:
>Environment:
$ uname -a
FreeBSD mogwai.giffuni.net 9.0-CURRENT FreeBSD 9.0-CURRENT #6: Sat Apr 30 01:37:57 PDT 2011 root@build9x64.pcbsd.org:/usr/obj/pcbsd-build90/fbsd-source/9.0/sys/PCBSD amd64
>Description:
- Update to not-yet current release.
- Pet portlint using PKGNAMESUFFIX
- Rename BROWSER option to MOZILLA: newer versions have improved support for webkit so the name will become confusing.
- Add License (EPL)
After some time to iron out any issues, I would like this port repocopied to
x11-toolkits/swt (which I maintain).
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN swt-devel.orig/Makefile swt-devel/Makefile
--- swt-devel.orig/Makefile 2011-10-01 17:00:07.000000000 +0000
+++ swt-devel/Makefile 2011-10-01 20:36:37.000000000 +0000
@@ -5,22 +5,24 @@
# $FreeBSD: ports/x11-toolkits/swt-devel/Makefile,v 1.31 2011/07/05 02:51:40 tabthorpe Exp $
#
-PORTNAME= swt-devel
-DISTVERSION= 3.6M5
-PORTREVISION= 2
+PORTNAME= swt
+DISTVERSION= 3.6.2
PORTEPOCH= 1
CATEGORIES= x11-toolkits devel java
MASTER_SITES= ${MASTER_SITE_ECLIPSE}
-MASTER_SITE_SUBDIR= S-${DISTVERSION}-201001291300
+MASTER_SITE_SUBDIR= R-${DISTVERSION}-201102101200
+PKGNAMESUFFIX= -devel
DISTNAME= swt-${DISTVERSION}-${DIST_EXT}
MAINTAINER= ports@FreeBSD.org
COMMENT= Standard Widget Toolkit for Java
+LICENSE= EPL
+
ONLY_FOR_ARCHS= i386 amd64 powerpc
-SWT_VERSION= 3631
-OUTPUT_JAR= swt-devel.jar
+SWT_VERSION= 3659
+OUTPUT_JAR= ${PORTNAME}${PKGNAMESUFFIX}.jar
USE_ZIP= yes
USE_GL= yes
@@ -42,7 +44,7 @@
OPTIONS= CAIRO "Cairo Support" on \
GNOMEVFS "Gnome VFS Support" on \
- BROWSER "Gecko Browser Support" on
+ MOZILLA "Gecko Browser Support" on
.include <bsd.port.pre.mk>
@@ -58,8 +60,8 @@
MAKE_GNOME= make_gnome
.endif
-.if defined(WITH_BROWSER)
-USE_GECKO= libxul
+.if defined(WITH_MOZILLA)
+USE_MOZILLA= libxul
PLIST_FILES+= lib/libswt-xulrunner-gtk-%%BUILD%%.so
MAKE_MOZILLA= make_xulrunner
.endif
diff -ruN swt-devel.orig/distinfo swt-devel/distinfo
--- swt-devel.orig/distinfo 2011-10-01 17:00:07.000000000 +0000
+++ swt-devel/distinfo 2011-10-01 20:00:11.000000000 +0000
@@ -1,6 +1,6 @@
-SHA256 (swt-3.6M5-gtk-linux-x86.zip) = 8e50d0433a8978a0572076a57bbe7b920eadef8231a53c7fcf3b895d401bc7f3
-SIZE (swt-3.6M5-gtk-linux-x86.zip) = 5074140
-SHA256 (swt-3.6M5-gtk-linux-x86_64.zip) = 9e44f033e5c9a6c6d47427f0ade49fd96013676deeff16035ac0a8358d955cf2
-SIZE (swt-3.6M5-gtk-linux-x86_64.zip) = 5356589
-SHA256 (swt-3.6M5-gtk-linux-ppc.zip) = 2a9ea471ae729db0f531ed88f5844a3e6ceb88675a3b92c629950a728695fd2d
-SIZE (swt-3.6M5-gtk-linux-ppc.zip) = 5215613
+SHA256 (swt-3.6.2-gtk-linux-x86_64.zip) = 9459fbee1cab66fae9dabe085d911b6bfee52e41e1a236ac65bf0491fdbdb205
+SIZE (swt-3.6.2-gtk-linux-x86_64.zip) = 5531856
+SHA256 (swt-3.6.2-gtk-linux-x86.zip) = 1f380d8cd5545af90d7814db4824322f56c9cd4bb476febbadc8d54707779543
+SIZE (swt-3.6.2-gtk-linux-x86.zip) = 5236728
+SHA256 (swt-3.6.2-gtk-linux-ppc.zip) = 74b211ed6bc2d364f53c27075f5652622e79450cfbc6451aecd0da60e9e25ffe
+SIZE (swt-3.6.2-gtk-linux-ppc.zip) = 5416141
diff -ruN swt-devel.orig/files/patch-build.sh swt-devel/files/patch-build.sh
--- swt-devel.orig/files/patch-build.sh 2011-10-01 17:00:07.000000000 +0000
+++ swt-devel/files/patch-build.sh 2011-10-01 17:30:11.000000000 +0000
@@ -1,6 +1,6 @@
---- build.sh.orig 2009-10-30 17:04:40.000000000 -0500
-+++ build.sh 2009-12-01 11:28:40.000000000 -0600
-@@ -44,6 +44,9 @@
+--- build.sh.orig 2011-02-10 17:29:10.000000000 +0000
++++ build.sh 2011-10-01 17:29:21.000000000 +0000
+@@ -54,6 +54,9 @@
"FreeBSD")
SWT_OS=freebsd
MAKEFILE=make_freebsd.mak
@@ -10,28 +10,24 @@
;;
*)
SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'`
-@@ -75,10 +78,10 @@
+@@ -92,7 +95,7 @@
esac
-
+ echo "Model is ${MODEL}"
# For 64-bit CPUs, we have a switch
--if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' ]; then
-+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'amd64' ]; then
+-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64' -o ${MODEL} = 's390x' ]; then
++if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64' -o ${MODEL} = 's390x' -o ${MODEL} = 'amd64' ]; then
SWT_PTR_CFLAGS=-DJNI64
if [ -d /lib64 ]; then
-- XLIB64=-L/usr/X11R6/lib64
-+ XLIB64=-L${LOCALBASE}/lib64
- export XLIB64
- fi
- if [ ${MODEL} = 'ppc64' ]; then
-@@ -89,6 +92,7 @@
- export SWT_PTR_CFLAGS
+ XLIB64=-L/usr/X11R6/lib64
+@@ -131,6 +134,7 @@
+ export SWT_LFLAGS SWT_PTR_CFLAGS
fi
+if [ x${MAKE_GNOME} = "xmake_gnome" ]; then
- if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then
+ if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" -a ${MODEL} != "sparc64" ]; then
echo "libgnomeui-2.0 found, compiling SWT program support using GNOME"
MAKE_GNOME=make_gnome
-@@ -96,7 +100,9 @@
+@@ -138,7 +142,9 @@
echo "libgnome-2.0 and libgnomeui-2.0 not found:"
echo " *** SWT Program support for GNOME will not be compiled."
fi
@@ -41,13 +37,13 @@
if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then
echo "Cairo found, compiling SWT support for the cairo graphics library."
MAKE_CAIRO=make_cairo
-@@ -104,30 +110,17 @@
+@@ -146,30 +152,17 @@
echo "Cairo not found:"
echo " *** Advanced graphics support using cairo will not be compiled."
fi
+fi
--if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then
+-if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' ]; then
- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
- MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom`
- MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
@@ -81,4 +77,4 @@
+ echo " *** Mozilla embedding support will not be compiled."
fi
- # Find AWT if available
+ if [ x`pkg-config --exists webkit-1.0 && echo YES` = "xYES" ]; then
diff -ruN swt-devel.orig/files/patch-make_freebsd.mak swt-devel/files/patch-make_freebsd.mak
--- swt-devel.orig/files/patch-make_freebsd.mak 2011-10-01 17:00:07.000000000 +0000
+++ swt-devel/files/patch-make_freebsd.mak 2011-10-01 20:17:55.000000000 +0000
@@ -1,12 +1,5 @@
---- make_freebsd.mak.orig 2009-10-30 17:04:40.000000000 -0500
-+++ make_freebsd.mak 2009-12-01 10:23:19.000000000 -0600
-@@ -1,5 +1,5 @@
- #*******************************************************************************
--# Copyright (c) 2000, 2007 IBM Corporation and others.
-+# Copyright (c) 2000, 2009 IBM Corporation and others.
- # All rights reserved. This program and the accompanying materials
- # are made available under the terms of the Eclipse Public License v1.0
- # which accompanies this distribution, and is available at
+--- make_freebsd.mak.orig 2011-02-10 17:29:10.000000000 +0000
++++ make_freebsd.mak 2011-10-01 20:16:59.000000000 +0000
@@ -9,7 +9,7 @@
# IBM Corporation - initial API and implementation
#*******************************************************************************
@@ -25,22 +18,21 @@
CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
-@@ -58,8 +58,8 @@
+@@ -59,7 +59,8 @@
GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
--GLXCFLAGS =
--GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm
+-GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm
+GLXCFLAGS = -I$(LOCALBASE)/include
-+GLXLIBS = -shared -fPIC -L$(LOCALBASE)/lib -lGL -lGLU -lm
++GLXLIBS = -L$(LOCALBASE)/lib -lGL -lGLU -lm
# Uncomment for Native Stats tool
#NATIVE_STATS = -DNATIVE_STATS
-@@ -78,7 +78,17 @@
+@@ -78,6 +79,17 @@
-I$(JAVA_HOME)/include/freebsd \
${SWT_PTR_CFLAGS}
- MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
--
+ MOZILLALFLAGS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
++
+MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
+ -DNO__1XPCOMGlueStartup \
+ -DNO__1XPCOMGlueLoadXULFunctions \
@@ -51,11 +43,10 @@
+ -DNO__1Call__JJJJJI \
+ -DNO_nsDynamicFunctionLoad
+XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
-+
+
SWT_OBJECTS = swt.o c.o c_stats.o callback.o
CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
- AWT_OBJECTS = swt_awt.o
-@@ -87,7 +97,7 @@
+@@ -87,7 +99,7 @@
ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
@@ -64,7 +55,7 @@
XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
-@@ -95,19 +105,20 @@
+@@ -95,17 +107,18 @@
-DSWT_VERSION=$(SWT_VERSION) \
$(NATIVE_STATS) \
-DFREEBSD -DGTK \
@@ -73,25 +64,22 @@
-I$(JAVA_HOME)/include/freebsd \
-fPIC \
${SWT_PTR_CFLAGS}
- LIBS = -shared -fPIC
+ LFLAGS = -shared -fPIC
-ifndef NO_STRIP
-- AWT_LIBS := $(AWT_LIBS) -s
-- MOZILLALIBS := $(MOZILLALIBS) -s
-- LIBS := $(LIBS) -s
+- AWT_LFLAGS := $(AWT_LFLAGS) -s
+- MOZILLALFLAGS := $(MOZILLALFLAGS) -s
+- LFLAGS := $(LFLAGS) -s
-endif
+.ifndef NO_STRIP
-+AWT_LIBS := $(AWT_LIBS) -s
-+MOZILLALIBS := $(MOZILLALIBS) -s
-+LIBS := $(LIBS) -s
++AWT_LFLAGS := $(AWT_LFLAGS) -s
++MOZILLALFLAGS := $(MOZILLALFLAGS) -s
++LFLAGS := $(LFLAGS) -s
+.endif
--all: make_swt make_atk make_gnome make_glx
-+all: make_swt make_atk make_glx
+ all: make_swt make_atk make_gnome make_glx
- #
- # SWT libs
-@@ -161,7 +172,7 @@
+@@ -161,7 +174,7 @@
#
# AWT lib
#
@@ -99,33 +87,8 @@
+make_awt: $(AWT_LIB)
$(AWT_LIB): $(AWT_OBJECTS)
- $(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
-@@ -203,53 +214,47 @@
- #
- # Mozilla lib
- #
--make_mozilla:$(MOZILLA_LIB)
-+make_mozilla: $(MOZILLA_LIB)
-
- $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
- $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
-
- xpcom.o: xpcom.cpp
-- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
-+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
-
- xpcom_structs.o: xpcom_structs.cpp
-- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
-+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
-
- xpcom_custom.o: xpcom_custom.cpp
-- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
-+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
-
- xpcom_stats.o: xpcom_stats.cpp
-- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
-+ $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
-
+ $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
+@@ -223,33 +236,27 @@
#
# XULRunner lib
#
@@ -133,7 +96,7 @@
+make_xulrunner: $(XULRUNNER_LIB)
$(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
- $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
+ $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
xpcomxul.o: xpcom.cpp
- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
@@ -164,4 +127,4 @@
+make_xpcominit: $(XPCOMINIT_LIB)
$(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
- $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
+ $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110020158.p921wlIF043372>