diff options
Diffstat (limited to '')
| -rw-r--r-- | java/eclipse/Makefile | 27 | ||||
| -rw-r--r-- | java/eclipse/files/eclipse.in | 2 | ||||
| -rw-r--r-- | java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh | 6 |
3 files changed, 17 insertions, 18 deletions
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile index a1304b686824..3c818b7d0b4f 100644 --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -42,19 +42,6 @@ USE_ICONV= yes USE_MOTIF= yes .else ECLIPSE_WS= gtk -.if !defined(WITHOUT_MOZILLA) -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 -.else -BROWSER= -MAKE_MOZILLA= -.endif .if defined(WITHOUT_CAIRO) MAKE_CAIRO= .else @@ -81,6 +68,17 @@ ECLIPSE_ARCH= x86 ECLIPSE_SWT= gtk .endif +.if !defined(WITHOUT_MOZILLA) +MAKE_MOZILLA= make_mozilla +USE_GECKO= firefox mozilla seamonkey xulrunner +.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk" +BROWSER= ${GECKO} +USE_LDCONFIG= yes +.else +BROWSER= +MAKE_MOZILLA= +.endif + MAKE_ENV+= BROWSER=${BROWSER} \ ECLIPSE_ARCH=${ECLIPSE_ARCH} \ ECLIPSE_OS=${ECLIPSE_OS} \ @@ -90,7 +88,8 @@ MAKE_ENV+= BROWSER=${BROWSER} \ MAKE_MOZILLA=${MAKE_MOZILLA} \ MAKE_CAIRO=${MAKE_CAIRO} \ MACHINE_ARCH=${MACHINE_ARCH} \ - MOTIF_HOME=${X11_HOME} + MOTIF_HOME=${X11_HOME} \ + GECKO_CONFIG=${GECKO_CONFIG} PLIST_FILES= bin/eclipse share/applications/eclipse.desktop diff --git a/java/eclipse/files/eclipse.in b/java/eclipse/files/eclipse.in index 251e7a375b20..91873ea14ba1 100644 --- a/java/eclipse/files/eclipse.in +++ b/java/eclipse/files/eclipse.in @@ -10,7 +10,7 @@ DEFAULT_JAVA_HOME=%%PREFIX%% ECLIPSE_HOME=%%ECLIPSE_HOME%% DEFAULT_JAVA_CMD=java -export MOZILLA_FIVE_HOME=%%X11BASE%%/lib/%%BROWSER%% +export MOZILLA_FIVE_HOME=%%LOCALBASE%%/lib/%%BROWSER%% export LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LD_LIBRARY_PATH diff --git a/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh b/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh index c618b3f236be..f1829709a0c9 100644 --- a/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh +++ b/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh @@ -8,10 +8,10 @@ + CC=gcc + LD=gcc + XTEST_LIB_PATH=$X11BASE/lib -+ GECKO_I=${X11BASE}/include/${BROWSER} ++ GECKO_I=`${GECKO_CONFIG} --cflags gtkmozembed` + 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_L=`${GECKO_CONFIG} --libs gtkmozembed` ++ GECKO_LIBS="-L${GECKO_L} -L${LOCALBASE}/lib" + case $MODEL in + "amd64") + AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64 |