Index: head/x11-toolkits/swt/Makefile =================================================================== --- head/x11-toolkits/swt/Makefile (revision 382338) +++ head/x11-toolkits/swt/Makefile (revision 382339) @@ -1,91 +1,95 @@ # Created by: Robert C. Noland III # $FreeBSD$ PORTNAME= swt DISTVERSION= 3.5.2 PORTREVISION= 3 CATEGORIES= x11-toolkits devel java #MASTER_SITES= ${MASTER_SITE_ECLIPSE} MASTER_SITES= http://archive.eclipse.org/eclipse/downloads/drops/${MASTER_SITE_SUBDIR}/ MASTER_SITE_SUBDIR= R-${DISTVERSION}-201002111343 DISTNAME= swt-${DISTVERSION}-${DIST_EXT} MAINTAINER= ports@FreeBSD.org COMMENT= Standard Widget Toolkit for Java LICENSE= EPL ONLY_FOR_ARCHS= i386 amd64 CONFLICTS= swt-3.1* SWT_VERSION= 3557 OUTPUT_JAR= swt.jar USE_GL= yes USES= pkgconfig zip:infozip USE_GNOME= gtk20 USE_JAVA= yes JAVA_VERSION= 1.6+ JAVA_OS= native USE_ANT= yes MAKE_ARGS+= -Doutput.jar=${OUTPUT_JAR} MAKEFILE= make_freebsd.mak USE_LDCONFIG= yes PLIST_SUB= BUILD=${SWT_VERSION} PLIST_FILES= %%JAVAJARDIR%%/${OUTPUT_JAR} \ lib/libswt-atk-gtk-%%BUILD%%.so \ lib/libswt-awt-gtk-%%BUILD%%.so \ lib/libswt-gtk-%%BUILD%%.so \ lib/libswt-glx-gtk-%%BUILD%%.so \ lib/libswt-pi-gtk-%%BUILD%%.so NO_WRKSUBDIR= yes OPTIONS_DEFINE= CAIRO GNOMEVFS BROWSER OPTIONS_DEFAULT= CAIRO GNOMEVFS GNOMEVFS_DESC= Gnome VFS Support BROWSER_DESC= Gecko Browser Support .include .if ${PORT_OPTIONS:MCAIRO} LIB_DEPENDS+= libcairo.so:${PORTSDIR}/graphics/cairo PLIST_FILES+= lib/libswt-cairo-gtk-%%BUILD%%.so MAKE_CAIRO= make_cairo .endif .if ${PORT_OPTIONS:MGNOMEVFS} USE_GNOME+= gnomevfs2 libgnome libgnomeui PLIST_FILES+= lib/libswt-gnome-gtk-%%BUILD%%.so MAKE_GNOME= make_gnome .endif .if ${PORT_OPTIONS:MBROWSER} USES= gecko BROKEN= Does not build with newer libxul PLIST_FILES+= lib/libswt-xulrunner-gtk-%%BUILD%%.so MAKE_MOZILLA= make_xulrunner .endif MAKE_ENV+= MAKE_CAIRO=${MAKE_CAIRO} \ MAKE_GNOME=${MAKE_GNOME} \ MAKE_MOZILLA=${MAKE_MOZILLA} \ JAVA_HOME=${JAVA_HOME} .if (${ARCH} == "amd64") DIST_EXT= gtk-linux-x86_64 .else DIST_EXT= gtk-linux-x86 .endif post-extract: @(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip") @${RM} -f ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar +post-patch: + ${SED} -e 's|freebsd|dragonfly|g' ${WRKSRC}/make_freebsd.mak \ + ${WRKSRC}/make_dragonfly.mak + do-install: @${MKDIR} ${STAGEDIR}${JAVAJARDIR} ${INSTALL_LIB} ${WRKSRC}/libswt-*.so ${STAGEDIR}${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/${OUTPUT_JAR} ${STAGEDIR}${JAVAJARDIR}/ .include Index: head/x11-toolkits/swt/files/patch-build.sh =================================================================== --- head/x11-toolkits/swt/files/patch-build.sh (revision 382338) +++ head/x11-toolkits/swt/files/patch-build.sh (revision 382339) @@ -1,82 +1,92 @@ ---- build.sh.orig 2009-06-11 16:10:54.000000000 -0500 -+++ build.sh 2009-12-01 14:42:09.000000000 -0600 -@@ -44,6 +44,9 @@ +--- build.sh.orig 2010-02-12 17:49:56 UTC ++++ build.sh +@@ -41,9 +41,19 @@ case $OS in + MAKE_TYPE=gmake + fi + ;; ++ "DragonFly") ++ SWT_OS=dragonfly ++ MAKEFILE=make_dragonfly.mak ++ if uname -p > /dev/null 2>&1; then ++ MODEL=`uname -p` ++ fi ++ ;; "FreeBSD") SWT_OS=freebsd MAKEFILE=make_freebsd.mak + if uname -p > /dev/null 2>&1; then + MODEL=`uname -p` + fi ;; *) SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'` -@@ -75,15 +78,16 @@ +@@ -75,15 +85,16 @@ case $MODEL in esac # 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 SWT_PTR_CFLAGS=-DJNI64 export SWT_PTR_CFLAGS if [ -d /lib64 ]; then - XLIB64=-L/usr/X11R6/lib64 + XLIB64=-L${LOCALBASE}/lib64 export XLIB64 fi 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 echo "libgnomeui-2.0 found, compiling SWT program support using GNOME" MAKE_GNOME=make_gnome -@@ -91,7 +95,9 @@ +@@ -91,7 +102,9 @@ else echo "libgnome-2.0 and libgnomeui-2.0 not found:" echo " *** SWT Program support for GNOME will not be compiled." fi +fi +if [ x${MAKE_CAIRO} = "xmake_cairo" ]; then 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 -@@ -99,30 +105,17 @@ +@@ -99,30 +112,17 @@ else 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 [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then - MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom` - MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom` - export MOZILLA_INCLUDES - export MOZILLA_LIBS - MAKE_MOZILLA=make_mozilla - elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then - MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom` - MOZILLA_LIBS=`pkg-config --libs firefox-xpcom` - export MOZILLA_INCLUDES - export MOZILLA_LIBS - MAKE_MOZILLA=make_mozilla - elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then - XULRUNNER_INCLUDES=`pkg-config --cflags libxul` - XULRUNNER_LIBS=`pkg-config --libs libxul` - export XULRUNNER_INCLUDES - export XULRUNNER_LIBS - MAKE_MOZILLA=make_xulrunner - else - echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM" - echo " *** Mozilla embedding support will not be compiled." - fi +if [ x${MAKE_MOZILLA} = "xmake_xulrunner" ]; then + echo "Using libxul for gecko support" + XULRUNNER_INCLUDES=`pkg-config --cflags libxul libxul-embedding` + XULRUNNER_LIBS=`pkg-config --libs libxul libxul-embedding` + export XULRUNNER_INCLUDES + export XULRUNNER_LIBS +else + echo "None of the following libraries were found: XULRunner/XPCOM" + echo " *** Mozilla embedding support will not be compiled." fi # Find AWT if available