An alternative Eclipse 3 port

[Jeremy Faulkner]

Panagiotis Astithas wrote:
> Greg Lewis wrote:
> 
>> On Mon, Jun 28, 2004 at 10:23:35PM -0600, Ethan Killian wrote:
>>
>>> Nice job on the Motif port, I got it compiled after I added the 
>>> gcj/libgcj-config.h file to my build path.  I am pretty sure my gcj 
>>> libraries are where they installed to on my FreeBSD 5.2.1 RELENG 
>>> system by default, I don't normally use gcj.  Note, this is JUST for 
>>> the Motif port, the GTK version compiles and works nicely.
>>
>>
>>
>> This is the wrong "fix" and only makes things more broken.
>>
>>
>>> Here is the errors I get:
>>> -----------------------------------------------------------------------
>>> Building FreeBSD version of KDE DLL.
>>> g++ -fno-rtti -c -O -I/usr/local/include -I/usr/X11R6/include 
>>> -I/usr/local/jdk1.4.2/include -I/usr/local/jdk1.4.2/include/bsd 
>>> -I/usr/local/jdk1.4.2/include/freebsd -o kde.o kde.cc
>>> In file included from swt.h:23,
>>>                from kde.cc:21:
>>> /usr/local/include/jni.h:17:31: gcj/libgcj-config.h: No such file or 
>>> directory
>>
>>
>>
>> This is your problem.  No, not that it can't find 
>> gcj/libgcj-config.h.  The
>> problem is that its including the wrong jni.h.  It should be getting it
>> from /usr/local/jdk1.4.2/include/ but instead its getting it from
>> /usr/local/include due to the order of the -I flags in the compilation 
>> line
>> above.  The correct fix is to reorder the -I flags so that the correct
>> jni.h header is found.
> 
> 
> Quite right, I haven't anticipated a gcj installation. I have made the 
> necessary change to the port skeleton and I made a pass for anything 
> similar. Let me know if this works for you.
> 
> Cheers,

LIB_DEPENDS -> GTK is not a run depend of the motif port.
BUILD_DEPENDS -> Mozilla is not a build depend of motif port.

GNOME_VFS should not be compiled with the motif port.

The KDE lib is not required by the motif port. If you want to have the 
KDE bits as well, it should be accessed via a USE_KDE or some such (not 
implemented).

-- 
Jeremy Faulkner				http://www.gldis.ca

-------------- next part --------------
Only in eclipse.mod: .Makefile.swp
diff -ur eclipse/Makefile eclipse.mod/Makefile
--- eclipse/Makefile	Mon Jun 28 12:07:34 2004
+++ eclipse.mod/Makefile	Sun Jul  4 02:18:25 2004
@@ -16,12 +16,9 @@
 DISTNAME=	${PORTNAME}-sourceBuild-srcIncluded-${PORTVERSION}
 DIST_SUBDIR=	eclipse
 
-LIB_DEPENDS=	gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20
 BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant \
-		gmake:${PORTSDIR}/devel/gmake \
-		mozilla:${PORTSDIR}/www/mozilla \
-		pkg-config:${PORTSDIR}/devel/pkgconfig
-
+		gmake:${PORTSDIR}/devel/gmake
+		
 ONLY_FOR_ARCHS=	i386
 USE_ZIP=	yes
 
@@ -44,10 +41,11 @@
 PLIST_SUB+=	MOTIF:=""
 .else
 ECLIPSE_WS=	gtk
+LIB_DEPENDS=	gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20
+BUILD_DEPENDS+= mozilla:${PORTSDIR}/www/mozilla \
+		pkg-config:${PORTSDIR}/devel/pkgconfig
 PLIST_SUB+=	GTK:=""
 PLIST_SUB+=	MOTIF:="@comment "
-.endif
-
 .if defined(WITHOUT_GNOMEVFS)
 MAKE_GNOME=
 USE_GNOME=	gtk20
@@ -56,7 +54,8 @@
 MAKE_GNOME=	make_gnome
 USE_GNOME=	gtk20 gnomevfs2 libgnome libgnomeui
 PLIST_SUB+=	GNOME:=""
-.endif
+.endif # WITHOUT_GNOMEVFS
+.endif # WITH_MOTIF
 
 MAKE_ARGS=	ECLIPSE_BUILD=${ECLIPSE_BUILD} \
 		ECLIPSE_ARCH=${ECLIPSE_ARCH} \
@@ -68,15 +67,4 @@
 SCRIPTS_ENV=	ECLIPSE_WS="${ECLIPSE_WS}"
 
 .include <bsd.port.pre.mk>
-
-# The Motif version builds a KDE/Qt library if kdebase is around
-.if defined(WITH_MOTIF)
-BUILD_KDE=`${PKG_INFO} -xc kdebase | ${GREP} "no packages match"`
-.if empty(${BUILD_KDE})
-PLIST_SUB+=	KDE:=""
-.else
-PLIST_SUB+=	KDE:="@comment *${BUILD_KDE}*"
-.endif
-.endif
-
 .include <bsd.port.post.mk>
Only in eclipse.mod/files: .swt-motif-build.sh.swp
diff -ur eclipse/files/swt-motif-build.sh eclipse.mod/files/swt-motif-build.sh
--- eclipse/files/swt-motif-build.sh	Sun Jun 27 07:34:06 2004
+++ eclipse.mod/files/swt-motif-build.sh	Sat Jul  3 14:08:54 2004
@@ -36,11 +36,6 @@
         else
             echo "Building FreeBSD version of SWT and GNOME DLLs."
             gmake -f make_freebsd.mak ${1} ${2} ${3} ${4}
-            build_kde=`pkg_info -xc kdebase | grep "no packages match"`
-            if [ "$build_kde" = "" ]; then
-                echo "Building FreeBSD version of KDE DLL."
-                gmake -f make_freebsd.mak make_kde
-            fi
         fi
         ;;