Date: Mon, 23 Aug 2004 23:04:00 +0200 From: des@des.no (=?iso-8859-1?q?Dag-Erling_Sm=F8rgrav?=) To: Panagiotis Astithas <past@netmode.ntua.gr> Cc: java@FreeBSD.ORG Subject: Re: Eclipse without Mozilla Message-ID: <xzpsmad7ein.fsf@dwp.des.no> In-Reply-To: <412A4483.3030405@netmode.ntua.gr> (Panagiotis Astithas's message of "Mon, 23 Aug 2004 22:24:51 %2B0300") References: <xzpwtzrqm0a.fsf@dwp.des.no> <4129135E.3030808@netmode.ntua.gr> <xzpoel29yue.fsf@dwp.des.no> <20040823080327.GA21194@netmode.ece.ntua.gr> <xzpeklx95xk.fsf@dwp.des.no> <412A4483.3030405@netmode.ntua.gr>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
Panagiotis Astithas <past@netmode.ntua.gr> writes:
> I'd be interested to know whether it works for you, since currently I
> don't have any systems without mozilla, it seems.
I modified the patch to trigger on WITH_MOZILLA =3D=3D firefox instead of
WITH_FIREFOX (there's plenty of precedent for the former, none for the
latter). It's building now, but I suspect it's going to take a long
time. I'll let you know when you're done.
BTW, you might also want to give users the option of building eclipse
with gtk but no mozilla or firefox at all...
DES
--=20
Dag-Erling Sm=F8rgrav - des@des.no
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=eclipse-firefox.diff
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/java/eclipse/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile 28 Jul 2004 17:56:31 -0000 1.23
+++ Makefile 23 Aug 2004 21:01:06 -0000
@@ -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_MOZILLA) && ${WITH_MOZILLA} == "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} \
Index: files/make_gtk.mak
===================================================================
RCS file: /home/pcvs/ports/java/eclipse/files/make_gtk.mak,v
retrieving revision 1.2
diff -u -r1.2 make_gtk.mak
--- files/make_gtk.mak 28 Jul 2004 17:56:31 -0000 1.2
+++ files/make_gtk.mak 23 Aug 2004 16:26:01 -0000
@@ -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
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?xzpsmad7ein.fsf>