diff options
| author | marcus <marcus@FreeBSD.org> | 2006-10-14 16:54:54 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2006-10-14 16:54:54 +0800 |
| commit | 0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8 (patch) | |
| tree | 17937489af4c767844fc63b684ae3e7b31948812 /x11-toolkits/swt31 | |
| parent | e959473966b963953d63d5f00fae8751f2decf0f (diff) | |
| download | freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.gz freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.zst freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.zip | |
Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed.
Submitted by: mezz, ahze, pav, and many others
Approved by: portmgr (implicit, kris)
Diffstat (limited to 'x11-toolkits/swt31')
| -rw-r--r-- | x11-toolkits/swt31/Makefile | 15 | ||||
| -rw-r--r-- | x11-toolkits/swt31/files/patch-build.sh | 14 |
2 files changed, 13 insertions, 16 deletions
diff --git a/x11-toolkits/swt31/Makefile b/x11-toolkits/swt31/Makefile index ec635fe73947..cd97ff2f906b 100644 --- a/x11-toolkits/swt31/Makefile +++ b/x11-toolkits/swt31/Makefile @@ -7,6 +7,7 @@ PORTNAME= swt PORTVERSION= 3.1.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits devel java MASTER_SITES= ${MASTER_SITE_ECLIPSE} MASTER_SITE_SUBDIR= R-${PORTVERSION}-200509290840 @@ -51,15 +52,12 @@ DISTNAME= swt-${PORTVERSION}-gtk-linux-x86 .endif .if !defined(WITHOUT_MOZILLA) +USE_GECKO= firefox mozilla seamonkey xulrunner +.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" PLIST_FILES+= lib/libswt-mozilla-gtk-%%BUILD%%.so MAKE_MOZILLA= make_mozilla -.if defined(WITH_MOZILLA) && ${WITH_MOZILLA} != "mozilla" -BROWSER= ${WITH_MOZILLA} -BUILD_DEPENDS+= ${BROWSER}:${PORTSDIR}/www/${BROWSER} -.else -BUILD_DEPENDS+= mozilla:${PORTSDIR}/www/mozilla -BROWSER= mozilla -.endif +BROWSER= ${GECKO} +MAKE_ENV+= GECKO_CONFIG="${GECKO_CONFIG}" .else BROWSER= MAKE_MOZILLA= @@ -78,7 +76,8 @@ MAKE_ENV+= BROWSER="${BROWSER}" \ MAKE_GNOME=${MAKE_GNOME} \ MAKE_MOZILLA=${MAKE_MOZILLA} \ MAKE_CAIRO=${MAKE_CAIRO} \ - MACHINE_ARCH=${MACHINE_ARCH} + MACHINE_ARCH=${MACHINE_ARCH} \ + CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" post-extract: @(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip") diff --git a/x11-toolkits/swt31/files/patch-build.sh b/x11-toolkits/swt31/files/patch-build.sh index 26d351c751f9..9a0767cf0f7c 100644 --- a/x11-toolkits/swt31/files/patch-build.sh +++ b/x11-toolkits/swt31/files/patch-build.sh @@ -1,6 +1,6 @@ ---- build.sh.orig Wed May 4 19:44:42 2005 -+++ build.sh Wed Jan 4 08:43:08 2006 -@@ -100,6 +100,34 @@ +--- build.sh.orig Wed May 4 19:45:04 2005 ++++ build.sh Sat Sep 30 20:54:52 2006 +@@ -100,6 +100,32 @@ ;; esac ;; @@ -9,10 +9,8 @@ + CXX=%%CXX%% + LD=%%CC%% + XTEST_LIB_PATH=$X11BASE/lib -+ GECKO_I=${X11BASE}/include/${BROWSER} -+ GECKO_INCLUDES="-I${GECKO_I} -I${LOCALBASE}/include/nspr -I${GECKO_I}/xpcom -I${GECKO_I}/string -I${GECKO_I}/embed_base -I${GECKO_I}/embedstring" -+ GECKO_L=${X11BASE}/lib/${BROWSER} -+ GECKO_LIBS="-L${GECKO_L} -L${LOCALBASE}/lib -lxpcom -lnspr4 -lplds4 -lplc4 -lgtkembedmoz" ++ GECKO_INCLUDES="`${GECKO_CONFIG} --cflags gtkmozembed` -I${LOCALBASE}/include/nspr" ++ GECKO_LIBS="`${GECKO_CONFIG} --libs gtkmozembed` -L${LOCALBASE}/lib" + case $MODEL in + "amd64") + AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64 @@ -35,7 +33,7 @@ "SunOS") CC=gcc LD=gcc -@@ -126,6 +154,6 @@ +@@ -126,6 +152,6 @@ ;; esac |