Date: Sat, 3 Mar 2007 00:57:00 -0500 (EST) From: Robert Noland <rnoland@2hip.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/109782: [MAINTAINER] x11-toolkits/swt-devel: update to 3.3M5 Message-ID: <200703030557.l235v0qt014002@rnoland-ibm.acs.internap.com> Resent-Message-ID: <200703030600.l2360CY0096196@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 109782
>Category: ports
>Synopsis: [MAINTAINER] x11-toolkits/swt-devel: update to 3.3M5
>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: Sat Mar 03 06:00:11 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Robert Noland
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD rnoland-ibm.2hip.net 7.0-CURRENT FreeBSD 7.0-CURRENT #92: Thu Mar 1 19:28:26 EST
>Description:
- Update to 3.3M5
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- swt-devel-3.3M5.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/swt-devel/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile 10 Jan 2007 20:54:19 -0000 1.2
+++ Makefile 3 Mar 2007 05:55:15 -0000
@@ -6,10 +6,10 @@
#
PORTNAME= swt-devel
-PORTVERSION= 3.3M4
+PORTVERSION= 3.3M5
CATEGORIES= x11-toolkits devel java
MASTER_SITES= ${MASTER_SITE_ECLIPSE}
-MASTER_SITE_SUBDIR= S-${PORTVERSION}-200612141445
+MASTER_SITE_SUBDIR= S-${PORTVERSION}-200702091006
DISTNAME= swt-${PORTVERSION}-${DIST_EXT}
MAINTAINER= rnoland@2hip.net
@@ -17,7 +17,7 @@
ONLY_FOR_ARCHS= i386 amd64
-SWT_VERSION= 3320
+SWT_VERSION= 3325
OUTPUT_JAR= swt-devel.jar
USE_ZIP= yes
@@ -38,7 +38,7 @@
lib/libswt-glx-gtk-%%BUILD%%.so \
lib/libswt-pi-gtk-%%BUILD%%.so
-WRKSRC= ${WRKDIR}/swt-I20061214-1445-${DIST_EXT}
+NO_WRKSUBDIR= yes
OPTIONS= CAIRO "Cairo Support" on \
GNOMEVFS "Gnome VFS Support" on \
@@ -80,7 +80,6 @@
post-extract:
@(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")
@${RM} -f ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar
- @${CP} ${WRKSRC}/make_linux.mak ${WRKSRC}/make_freebsd.mak
post-patch:
@${REINPLACE_CMD} -e 's|mozilla-|${GECKO}-|' \
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/swt-devel/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 10 Jan 2007 20:54:19 -0000 1.3
+++ distinfo 3 Mar 2007 05:55:15 -0000
@@ -1,6 +1,6 @@
-MD5 (swt-3.3M4-gtk-linux-x86.zip) = 50fb0cd84aa2345adbd400a41e7037f2
-SHA256 (swt-3.3M4-gtk-linux-x86.zip) = e69cc8acb90f3f8e6be3967c41dfa359eb201fe92be07a511b0834edc895e610
-SIZE (swt-3.3M4-gtk-linux-x86.zip) = 3007189
-MD5 (swt-3.3M4-gtk-linux-x86_64.zip) = dfed4adfe069c5ac30d36a0dbb78711b
-SHA256 (swt-3.3M4-gtk-linux-x86_64.zip) = 82b923b621f8dc0c3abbd20fd3ec32ea68e3fb4cafe6a2afa2dde9f8e7f5d0db
-SIZE (swt-3.3M4-gtk-linux-x86_64.zip) = 3088585
+MD5 (swt-3.3M5-gtk-linux-x86.zip) = 2c11db4ac77fef91a804a44147c2b242
+SHA256 (swt-3.3M5-gtk-linux-x86.zip) = e3ecd4d7c56d74fe23ae34d16f3eea04494dc8ab5be3e87135e05cbcbffa7643
+SIZE (swt-3.3M5-gtk-linux-x86.zip) = 3186579
+MD5 (swt-3.3M5-gtk-linux-x86_64.zip) = dbd185a321fc2d9e7d6a6a4f21b558ea
+SHA256 (swt-3.3M5-gtk-linux-x86_64.zip) = baf62ba19e7be4838bb7158e22fae3a0648f636976f891506d4e0a0501469d0b
+SIZE (swt-3.3M5-gtk-linux-x86_64.zip) = 3309782
Index: files/patch-build.sh
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/swt-devel/files/patch-build.sh,v
retrieving revision 1.2
diff -u -r1.2 patch-build.sh
--- files/patch-build.sh 10 Jan 2007 20:54:20 -0000 1.2
+++ files/patch-build.sh 3 Mar 2007 05:55:15 -0000
@@ -1,17 +1,6 @@
---- build.sh.orig Mon Nov 21 23:48:16 2005
-+++ build.sh Wed Jan 10 14:36:04 2007
-@@ -31,6 +31,10 @@
- SWT_OS=solaris
- MAKEFILE=make_solaris.mak
- ;;
-+ "FreeBSD")
-+ SWT_OS=freebsd
-+ MAKEFILE=make_freebsd.mak
-+ ;;
- *)
- SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'`
- MAKEFILE=make_linux.mak
-@@ -61,7 +65,7 @@
+--- build.sh.orig Fri Feb 2 17:43:50 2007
++++ build.sh Fri Mar 2 23:12:01 2007
+@@ -65,7 +65,7 @@
esac
# For 64-bit CPUs, we have a switch
@@ -20,7 +9,7 @@
SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64
export SWT_PTR_CFLAGS
if [ -d /lib64 ]; then
-@@ -70,6 +74,7 @@
+@@ -74,6 +74,7 @@
fi
fi
@@ -28,7 +17,7 @@
if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then
echo "libgnomeui-2.0 found, compiling SWT program support using GNOME"
MAKE_GNOME=make_gnome
-@@ -77,7 +82,9 @@
+@@ -81,7 +82,9 @@
echo "libgnome-2.0 and libgnomeui-2.0 not found:"
echo " *** SWT Program support for GNOME will not be compiled."
fi
@@ -38,18 +27,18 @@
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
-@@ -85,7 +92,9 @@
+@@ -89,7 +92,9 @@
echo "Cairo not found:"
echo " *** Advanced graphics support using cairo will not be compiled."
fi
+fi
+if [ x${MAKE_MOZILLA} = "xmake_mozilla" ]; then
- if [ -z "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then
+ if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then
if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
- GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom`
-@@ -97,6 +106,7 @@
- echo "Mozilla/XPCOM libraries not found:"
+ MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom`
+@@ -107,6 +112,7 @@
+ echo "Mozilla/XPCOM or Firefox/XPCOM libraries not found:"
echo " *** Mozilla embedding support will not be compiled."
fi
+fi
Index: files/patch-make_freebsd.mak
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/swt-devel/files/patch-make_freebsd.mak,v
retrieving revision 1.3
diff -u -r1.3 patch-make_freebsd.mak
--- files/patch-make_freebsd.mak 10 Jan 2007 20:54:20 -0000 1.3
+++ files/patch-make_freebsd.mak 3 Mar 2007 05:55:15 -0000
@@ -1,5 +1,5 @@
---- make_freebsd.mak.orig Wed Jan 10 14:36:04 2007
-+++ make_freebsd.mak Wed Jan 10 14:36:04 2007
+--- make_freebsd.mak.orig Thu Jan 25 12:05:38 2007
++++ make_freebsd.mak Sat Mar 3 00:48:48 2007
@@ -9,7 +9,7 @@
# IBM Corporation - initial API and implementation
#*******************************************************************************
@@ -9,7 +9,7 @@
include make_common.mak
-@@ -42,7 +42,7 @@
+@@ -46,7 +46,7 @@
# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
@@ -18,7 +18,7 @@
CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
-@@ -55,7 +55,7 @@
+@@ -59,7 +59,7 @@
GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
GLXCFLAGS =
@@ -27,24 +27,10 @@
# Uncomment for Native Stats tool
#NATIVE_STATS = -DNATIVE_STATS
-@@ -72,7 +72,7 @@
- -fPIC \
- -I. \
- -I$(JAVA_HOME)/include \
-- -I$(JAVA_HOME)/include/linux \
-+ -I$(JAVA_HOME)/include/freebsd \
- ${SWT_PTR_CFLAGS}
- MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
-
-@@ -89,18 +89,19 @@
- CFLAGS = -O -Wall \
- -DSWT_VERSION=$(SWT_VERSION) \
- $(NATIVE_STATS) \
-- -DLINUX -DGTK \
-+ -DFREEBSD -DGTK \
+@@ -97,15 +97,16 @@
+ -DFREEBSD -DGTK \
-I$(JAVA_HOME)/include \
-- -I$(JAVA_HOME)/include/linux \
-+ -I$(JAVA_HOME)/include/freebsd \
+ -I$(JAVA_HOME)/include/freebsd \
+ -I$(X11BASE)/include \
-fPIC \
${SWT_PTR_CFLAGS}
--- swt-devel-3.3M5.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?200703030557.l235v0qt014002>