freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fixes for internal web browser [1]

Browse Source 
- Fixes for internal web browser on amd64 [2]
- Convert to USE_GECKO [3]

Note: Port defaults to xulrunner as the preffered gecko port because it is
the only port which allows the internal web browser to work but eclipse will
build using other gecko ports (ie. firefox, mozilla, seamonkey) though it
will lack a working internal web browser.  An argument can be made that
xulrunner should be the only available gecko but maybe 5 people have
xulrunner installed and it's another 45 minute mozilla dependency on even my
speedy machine.  The maintainer mentioned working on getting the internal
web browser to work with firefox so I'm leaving well enough alone.  When
eclipse fully works with firefox the USE_GECKO ordering should probably be
revistited.

PR:             105581
Submitted by:   Maintainer [1], Kurt Miller <lists at intricatesoftware.com> [2], me [3]
This commit is contained in:
Tom McLaughlin
2007-01-03 18:13:55 +00:00
parent a98e229fa0
commit 5a821ecb4b
15 changed files with 587 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
java/eclipse/Makefile
View File

@@ -7,7 +7,7 @@
PORTNAME= eclipse
PORTVERSION= 3.2.1
#PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= java devel
MASTER_SITES= ${MASTER_SITE_ECLIPSE}
MASTER_SITE_SUBDIR= R-${PORTVERSION}-200609210945
@@ -27,6 +27,10 @@ USE_GMAKE= yes
USE_ZIP= yes
USE_GCC= 3.4+
.if !defined(WITHOUT_MOZILLA)
USE_GECKO= xulrunner firefox mozilla seamonkey
.endif
USE_JAVA= yes
JAVA_VERSION= 1.5+
JAVA_OS= native
@@ -39,26 +43,6 @@ ECLIPSE_OS= freebsd
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
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
MAKE_CAIRO= make_cairo
.endif
.if defined(WITHOUT_GNOMEVFS)
MAKE_GNOME=
USE_GNOME= gtk20 pkgconfig desktopfileutils
@@ -67,8 +51,23 @@ MAKE_GNOME= make_gnome
USE_GNOME= gtk20 gnomevfs2 libgnome libgnomeui pkgconfig desktopfileutils
.endif
.if defined(WITHOUT_CAIRO)
MAKE_CAIRO=
.else
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
MAKE_CAIRO= make_cairo
.endif
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_MOZILLA)
MAKE_MOZILLA= make_mozilla
BROWSER= ${GECKO}
.else
BROWSER=
MAKE_MOZILLA=
.endif
.if (${ARCH} == "amd64")
ECLIPSE_ARCH= amd64
ECLIPSE_SWT= gtk64
@@ -91,12 +90,25 @@ PLIST_FILES= bin/eclipse share/applications/eclipse.desktop
SWTCAIRO=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library
SWTGTK=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library
SWTMOZ=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT Mozilla
# Manually patch some files with spaces in the path
post-patch:
@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/build.sh" ${FILESDIR}/post-patch-plugins-swt-gtk-build.sh
@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/make_freebsd.mak" ${FILESDIR}/post-patch-plugins-swt-gtk-make_freebsd.mak
@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/os_custom.h" ${FILESDIR}/post-patch-plugins-swt-gtk-os_custom.h
@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/gtk/org/eclipse/swt/browser/Browser.java" ${FILESDIR}/post-patch-plugins-swt-mozilla-Browser.java
@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/org/eclipse/swt/internal/mozilla/XPCOM.java" ${FILESDIR}/post-patch-plugins-swt-mozilla-XPCOM.java
@${PATCH} ${PATCH_DIST_ARGS} "${WRKSRC}/plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties" ${FILESDIR}/post-patch-plugins-swt-mozilla-XPCOM.properties
@${PATCH} ${PATCH_DIST_ARGS} "${WRKSRC}/plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM_PROFILE.properties" ${FILESDIR}/post-patch-plugins-swt-mozilla-XPCOM_PROFILE.properties
@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/library/xpcom.cpp" ${FILESDIR}/post-patch-plugins-swt-mozilla-xpcom.cpp
@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/library/xpcom.h" ${FILESDIR}/post-patch-plugins-swt-mozilla-xpcom.h
@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/library/xpcom_profile.h" ${FILESDIR}/post-patch-plugins-swt-mozilla-xpcom_profile.h
@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/library/xpcom_stats.cpp" ${FILESDIR}/post-patch-plugins-swt-mozilla-xpcom_stats.cpp
@${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/library/xpcom_stats.h" ${FILESDIR}/post-patch-plugins-swt-mozilla-xpcom_stats.h
@${REINPLACE_CMD} -e 's|%%GECKO%%|${GECKO}|g' \
"${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh" \
"${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak"
do-build:
@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
@@ -109,6 +121,7 @@ do-install:
-e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
-e "s+%%PREFIX%%+${PREFIX}+g" \
-e "s+%%X11BASE%%+${X11BASE}+g" \
-e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
-e "s+%%BROWSER%%+${BROWSER}+g" \
-e "s,%%JAVA_VERSION%%,${JAVA_VERSION},g" \
-e "s+%%JAVA_OS%%+${JAVA_OS}+g" \
@@ -118,6 +131,7 @@ do-install:
-e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
-e "s+%%PREFIX%%+${PREFIX}+g" \
${FILESDIR}/eclipse.desktop > ${WRKSRC}/eclipse.desktop.tmp
${MKDIR} ${PREFIX}/share/applications/ || ${TRUE}
${INSTALL_DATA} ${WRKSRC}/eclipse.desktop.tmp ${PREFIX}/share/applications/eclipse.desktop
${INSTALL_PROGRAM} ${WRKSRC}/launchertmp/eclipse ${PREFIX}/eclipse/eclipse
@-update-desktop-database
@@ -127,4 +141,5 @@ do-install:
| ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST}
@echo '@unexec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST}
.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
.include <bsd.port.post.mk>