diff options
Diffstat (limited to 'x11-toolkits/swt-devel')
| -rw-r--r-- | x11-toolkits/swt-devel/Makefile | 10 | ||||
| -rw-r--r-- | x11-toolkits/swt-devel/distinfo | 12 | ||||
| -rw-r--r-- | x11-toolkits/swt-devel/files/patch-build.sh | 15 | ||||
| -rw-r--r-- | x11-toolkits/swt-devel/files/patch-make_freebsd.mak | 43 | ||||
| -rw-r--r-- | x11-toolkits/swt-devel/files/patch-xpcom_profile.h | 11 |
5 files changed, 36 insertions, 55 deletions
diff --git a/x11-toolkits/swt-devel/Makefile b/x11-toolkits/swt-devel/Makefile index 21b3245ed994..52f069e98722 100644 --- a/x11-toolkits/swt-devel/Makefile +++ b/x11-toolkits/swt-devel/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: swt32 +# New ports collection makefile for: swt-devel # Date created: 2006-11-16 # Whom: Robert C. Noland III <rnoland@2hip.net> # @@ -6,10 +6,10 @@ # PORTNAME= swt-devel -PORTVERSION= 3.3M3 +PORTVERSION= 3.3M4 CATEGORIES= x11-toolkits devel java MASTER_SITES= ${MASTER_SITE_ECLIPSE} -MASTER_SITE_SUBDIR= S-${PORTVERSION}-200611021715 +MASTER_SITE_SUBDIR= S-${PORTVERSION}-200612141445 DISTNAME= swt-${PORTVERSION}-${DIST_EXT} MAINTAINER= rnoland@2hip.net @@ -17,7 +17,7 @@ COMMENT= Standard Widget Toolkit for Java ONLY_FOR_ARCHS= i386 amd64 -SWT_VERSION= 3314 +SWT_VERSION= 3320 OUTPUT_JAR= swt-devel.jar USE_ZIP= yes @@ -38,7 +38,7 @@ PLIST_FILES= %%JAVAJARDIR%%/${OUTPUT_JAR} \ lib/libswt-glx-gtk-%%BUILD%%.so \ lib/libswt-pi-gtk-%%BUILD%%.so -WRKSRC= ${WRKDIR}/swt-I20061102-1715-${DIST_EXT} +WRKSRC= ${WRKDIR}/swt-I20061214-1445-${DIST_EXT} OPTIONS= CAIRO "Cairo Support" on \ GNOMEVFS "Gnome VFS Support" on \ diff --git a/x11-toolkits/swt-devel/distinfo b/x11-toolkits/swt-devel/distinfo index 56f1fb904fc1..9b6e09b06cb2 100644 --- a/x11-toolkits/swt-devel/distinfo +++ b/x11-toolkits/swt-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (swt-3.3M3-gtk-linux-x86.zip) = 040511bfaac89f5c269b84bbfff363f4 -SHA256 (swt-3.3M3-gtk-linux-x86.zip) = 33da4be193492fa84bbf6bd54c2d64348a8776f9d805c1ac960611ac967f733a -SIZE (swt-3.3M3-gtk-linux-x86.zip) = 3218970 -MD5 (swt-3.3M3-gtk-linux-x86_64.zip) = c01ca2a3908a82fc996149ed3183a0ae -SHA256 (swt-3.3M3-gtk-linux-x86_64.zip) = fa7555eb30331d745c1cee7a3509be30591362d2eb59f8863e2d65d361fff282 -SIZE (swt-3.3M3-gtk-linux-x86_64.zip) = 3121593 +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 diff --git a/x11-toolkits/swt-devel/files/patch-build.sh b/x11-toolkits/swt-devel/files/patch-build.sh index 07d0e596eae1..79d04b543aa5 100644 --- a/x11-toolkits/swt-devel/files/patch-build.sh +++ b/x11-toolkits/swt-devel/files/patch-build.sh @@ -1,5 +1,5 @@ --- build.sh.orig Mon Nov 21 23:48:16 2005 -+++ build.sh Fri Dec 1 16:34:03 2006 ++++ build.sh Wed Jan 10 14:36:04 2007 @@ -31,6 +31,10 @@ SWT_OS=solaris MAKEFILE=make_solaris.mak @@ -48,18 +48,11 @@ if [ -z "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom` -@@ -98,6 +107,7 @@ +@@ -97,6 +106,7 @@ + echo "Mozilla/XPCOM libraries not found:" echo " *** Mozilla embedding support will not be compiled." fi - fi +fi + fi # Find AWT if available - if [ -z "${AWT_LIB_PATH}" ]; then -@@ -126,5 +136,5 @@ - if [ "x${1}" = "xclean" ]; then - make -f $MAKEFILE clean - else -- make -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} -+ make -f $MAKEFILE all ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} - fi diff --git a/x11-toolkits/swt-devel/files/patch-make_freebsd.mak b/x11-toolkits/swt-devel/files/patch-make_freebsd.mak index 8cb796eac237..d7fe76dd8298 100644 --- a/x11-toolkits/swt-devel/files/patch-make_freebsd.mak +++ b/x11-toolkits/swt-devel/files/patch-make_freebsd.mak @@ -1,5 +1,5 @@ ---- make_freebsd.mak.orig Fri Dec 1 14:43:20 2006 -+++ make_freebsd.mak Fri Dec 1 14:43:20 2006 +--- make_freebsd.mak.orig Wed Jan 10 14:36:04 2007 ++++ make_freebsd.mak Wed Jan 10 14:36:04 2007 @@ -9,7 +9,7 @@ # IBM Corporation - initial API and implementation #******************************************************************************* @@ -9,7 +9,7 @@ include make_common.mak -@@ -48,7 +48,7 @@ +@@ -42,7 +42,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 -@@ -61,7 +61,7 @@ +@@ -55,7 +55,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,16 +27,16 @@ # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS -@@ -78,7 +78,7 @@ +@@ -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 -s -Wl,--version-script=mozilla_exports -Bsymbolic + MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic -@@ -98,15 +98,16 @@ +@@ -89,18 +89,19 @@ CFLAGS = -O -Wall \ -DSWT_VERSION=$(SWT_VERSION) \ $(NATIVE_STATS) \ @@ -44,23 +44,22 @@ + -DFREEBSD -DGTK \ -I$(JAVA_HOME)/include \ - -I$(JAVA_HOME)/include/linux \ -- -fPIC \ + -I$(JAVA_HOME)/include/freebsd \ -+ -fpic -fPIC \ -+ -I$(X11BASE)/include \ ++ -I$(X11BASE)/include \ + -fPIC \ ${SWT_PTR_CFLAGS} --LIBS = -shared -fPIC -s -+LIBS = -shared -fPIC -fpic -s + LIBS = -shared -fPIC +-ifndef NO_STRIP +- AWT_LIBS := $(AWT_LIBS) -s +- MOZILLALIBS := $(MOZILLALIBS) -s +- LIBS := $(LIBS) -s +-endif ++.ifndef NO_STRIP ++AWT_LIBS := $(AWT_LIBS) -s ++MOZILLALIBS := $(MOZILLALIBS) -s ++LIBS := $(LIBS) -s ++.endif --all: make_swt make_atk make_gnome make_glx -+all: make_swt make_atk $(MAKE_GNOME) make_awt $(MAKE_MOZILLA) $(MAKE_CAIRO) make_glx + all: make_swt make_atk make_gnome make_glx - # - # SWT libs -@@ -264,4 +265,4 @@ - # Clean - # - clean: -- rm -f *.o *.so -+ rm -f *.o *.so *.jar diff --git a/x11-toolkits/swt-devel/files/patch-xpcom_profile.h b/x11-toolkits/swt-devel/files/patch-xpcom_profile.h deleted file mode 100644 index fbd5fc768718..000000000000 --- a/x11-toolkits/swt-devel/files/patch-xpcom_profile.h +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom_profile.h.orig Wed Nov 15 17:47:13 2006 -+++ xpcom_profile.h Wed Nov 15 17:41:25 2006 -@@ -32,7 +32,7 @@ - #define NDEBUG - - #include "nsCOMPtr.h" --#include "nsProfileDirServiceProvider.h" -+#include "profdirserviceprovider/nsProfileDirServiceProvider.h" - #include "xpcom_stats.h" - - #endif /* INC_xpcom_profile_H */ |