Eclipse without Mozilla

[Panagiotis Astithas]

On Mon, Aug 23, 2004 at 08:02:01AM +0200, Dag-Erling Sm?rgrav wrote:
> Panagiotis Astithas <past at netmode.ntua.gr> writes:
> > Dag-Erling Sm?rgrav wrote:
> > > Is it in any way possible to build Eclipse with gtk but without
> > > Mozilla, or to substitute Firefox for Mozilla?
> > Not in the current version of the port, unfortunately. But I worked up
> > a patch for this.
> 
> The patch was horribly mangled by your MUA.  Please resend it as an
> attachment of type text/plain or text/x-patch.
> 
> DES
> -- 
> Dag-Erling Sm?rgrav - des at des.no

Darn. Hope it gets through this time.
-------------- next part --------------
diff -ru /usr/ports/java/eclipse/Makefile eclipse/Makefile
--- /usr/ports/java/eclipse/Makefile	Sun Aug  8 14:53:32 2004
+++ eclipse/Makefile	Sun Aug 22 23:52:58 2004
@@ -43,9 +43,17 @@
 PLIST_SUB+=	MOTIF:=""
 .else
 ECLIPSE_WS=	gtk
-BUILD_DEPENDS+=	mozilla:${PORTSDIR}/www/mozilla
 PLIST_SUB+=	GTK:=""
 PLIST_SUB+=	MOTIF:="@comment "
+.if defined(WITH_FIREFOX)
+BUILD_DEPENDS+=	firefox:${PORTSDIR}/www/firefox
+BROWSER=	firefox
+BROWSER_VER=	0.9.3
+.else
+BUILD_DEPENDS+=	mozilla:${PORTSDIR}/www/mozilla
+BROWSER=	mozilla
+BROWSER_VER=
+.endif
 .endif
 
 .if defined(WITHOUT_GNOMEVFS)
@@ -58,7 +66,9 @@
 PLIST_SUB+=	GNOME:=""
 .endif
 
-MAKE_ARGS=	ECLIPSE_BUILD=${ECLIPSE_BUILD} \
+MAKE_ARGS=	BROWSER=${BROWSER} \
+		BROWSER_VER=${BROWSER_VER} \
+		ECLIPSE_BUILD=${ECLIPSE_BUILD} \
 		ECLIPSE_ARCH=${ECLIPSE_ARCH} \
 		ECLIPSE_OS=${ECLIPSE_OS} \
 		ECLIPSE_WS=${ECLIPSE_WS} \
diff -ru /usr/ports/java/eclipse/files/make_gtk.mak eclipse/files/make_gtk.mak
--- /usr/ports/java/eclipse/files/make_gtk.mak	Sun Aug  8 14:53:32 2004
+++ eclipse/files/make_gtk.mak	Mon Aug 23 00:22:55 2004
@@ -54,6 +54,7 @@
 GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
 GNOMELIBS = `pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
 
+ifeq ($(BROWSER),mozilla)
 MOZILLACFLAGS = -O \
 	-fno-rtti	\
 	-Wall	\
@@ -61,14 +62,33 @@
 	-I$(JAVA_HOME)/include	\
 	-I$(JAVA_HOME)/include/bsd	\
 	-I$(JAVA_HOME)/include/freebsd \
-	-include $(MOZILLA_HOME)/include/mozilla/mozilla-config.h \
-	-I$(MOZILLA_HOME)/include/mozilla \
-	-I$(MOZILLA_HOME)/include/mozilla/xpcom \
-	-I$(MOZILLA_HOME)/include/mozilla/string \
-	-I$(MOZILLA_HOME)/include/mozilla/nspr \
-	-I$(MOZILLA_HOME)/include/mozilla/embed_base \
-	-I$(MOZILLA_HOME)/include/mozilla/gfx
-MOZILLALIBS = -L$(MOZILLA_HOME)/lib/mozilla -lgtkembedmoz -lxpcom
+	-include $(MOZILLA_HOME)/include/$(BROWSER)/mozilla-config.h \
+	-I$(MOZILLA_HOME)/include/$(BROWSER) \
+	-I$(MOZILLA_HOME)/include/$(BROWSER)/xpcom \
+	-I$(MOZILLA_HOME)/include/$(BROWSER)/string \
+	-I$(MOZILLA_HOME)/include/$(BROWSER)/nspr \
+	-I$(MOZILLA_HOME)/include/$(BROWSER)/embed_base \
+	-I$(MOZILLA_HOME)/include/$(BROWSER)/gfx
+else
+MOZILLACFLAGS = -O \
+	-fno-rtti	\
+	-Wall	\
+	-I./ \
+	-I$(JAVA_HOME)/include	\
+	-I$(JAVA_HOME)/include/bsd	\
+	-I$(JAVA_HOME)/include/freebsd \
+	-include $(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/mozilla-config.h \
+	-I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER) \
+	-I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/xpcom \
+	-I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/string \
+	-I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/nspr \
+	-I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/embed_base \
+	-I$(MOZILLA_HOME)/lib/$(BROWSER)/include/$(BROWSER)-$(BROWSER_VER)/gfx
+endif
+
+MOZILLALIBS = -L$(MOZILLA_HOME)/lib/$(BROWSER) \
+	-L$(MOZILLA_HOME)/lib/$(BROWSER)/lib/$(BROWSER)-$(BROWSER_VER) \
+	-lgtkembedmoz -lxpcom
 MOZILLALDFLAGS = -s
 
 SWT_OBJECTS		= swt.o callback.o