Attachment #72668 for bug #105581

Lines 7-13 Link Here

(-)eclipse/Makefile (-19 / +26 lines)
7		7
8	PORTNAME= eclipse	8	PORTNAME= eclipse
9	PORTVERSION= 3.2.1	9	PORTVERSION= 3.2.1
10	#PORTREVISION= 0	10	PORTREVISION= 1
11	CATEGORIES= java devel	11	CATEGORIES= java devel
12	MASTER_SITES= ${MASTER_SITE_ECLIPSE}	12	MASTER_SITES= ${MASTER_SITE_ECLIPSE}
13	MASTER_SITE_SUBDIR= R-${PORTVERSION}-200609210945	13	MASTER_SITE_SUBDIR= R-${PORTVERSION}-200609210945
Lines 27-32 Link Here
27	USE_ZIP= yes	27	USE_ZIP= yes
28	USE_GCC= 3.4+	28	USE_GCC= 3.4+
29		29
		30	.if !defined(WITHOUT_MOZILLA)
		31	USE_GECKO= firefox mozilla seamonkey xulrunner
		32	.endif
		33
30	USE_JAVA= yes	34	USE_JAVA= yes
31	JAVA_VERSION= 1.5+	35	JAVA_VERSION= 1.5+
32	JAVA_OS= native	36	JAVA_OS= native
Lines 39-73 Link Here
39		43
40	ECLIPSE_WS= gtk	44	ECLIPSE_WS= gtk
41		45
42	.if !defined(WITHOUT_MOZILLA)	46	.if defined(WITHOUT_GNOMEVFS)
43	MAKE_MOZILLA= make_mozilla	47	MAKE_GNOME=
44	.if defined(WITH_MOZILLA) && ${WITH_MOZILLA} != "mozilla"	48	USE_GNOME= gtk20 pkgconfig desktopfileutils
45	BROWSER= ${WITH_MOZILLA}
46	BUILD_DEPENDS+= ${BROWSER}:${PORTSDIR}/www/${BROWSER}
47	.else	49	.else
48	BUILD_DEPENDS+= mozilla:${PORTSDIR}/www/mozilla	50	MAKE_GNOME= make_gnome
49	BROWSER= mozilla	51	USE_GNOME= gtk20 gnomevfs2 libgnome libgnomeui pkgconfig desktopfileutils
50	.endif	52	.endif
		53
		54
		55	.include <bsd.port.pre.mk>
		56
		57	.if !defined(WITHOUT_MOZILLA)
		58	MAKE_MOZILLA= make_mozilla
		59	BROWSER= ${GECKO}
51	.else	60	.else
52	BROWSER=	61	BROWSER=
53	MAKE_MOZILLA=	62	MAKE_MOZILLA=
54	.endif	63	.endif
		64
55	.if defined(WITHOUT_CAIRO)	65	.if defined(WITHOUT_CAIRO)
56	MAKE_CAIRO=	66	MAKE_CAIRO=
57	.else	67	.else
58	LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo	68	LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo
59	MAKE_CAIRO= make_cairo	69	MAKE_CAIRO= make_cairo
60	.endif	70	.endif
61		71
62	.if defined(WITHOUT_GNOMEVFS)
63	MAKE_GNOME=
64	USE_GNOME= gtk20 pkgconfig desktopfileutils
65	.else
66	MAKE_GNOME= make_gnome
67	USE_GNOME= gtk20 gnomevfs2 libgnome libgnomeui pkgconfig desktopfileutils
68	.endif
69
70	.include <bsd.port.pre.mk>
71		72
72	.if (${ARCH} == "amd64")	73	.if (${ARCH} == "amd64")
73	ECLIPSE_ARCH= amd64	74	ECLIPSE_ARCH= amd64
Lines 97-102 Link Here
97	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/build.sh" ${FILESDIR}/post-patch-plugins-swt-gtk-build.sh	98	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/build.sh" ${FILESDIR}/post-patch-plugins-swt-gtk-build.sh
98	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/make_freebsd.mak" ${FILESDIR}/post-patch-plugins-swt-gtk-make_freebsd.mak	99	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/make_freebsd.mak" ${FILESDIR}/post-patch-plugins-swt-gtk-make_freebsd.mak
99	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/os_custom.h" ${FILESDIR}/post-patch-plugins-swt-gtk-os_custom.h	100	@${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/os_custom.h" ${FILESDIR}/post-patch-plugins-swt-gtk-os_custom.h
		101	@${REINPLACE_CMD} -e 's\|%%GECKO%%\|${GECKO}\|g' \
		102	"${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh" \
		103	"${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak"
100		104
101	do-build:	105	do-build:
102	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \	106	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
Lines 109-114 Link Here
109	-e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \	113	-e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
110	-e "s+%%PREFIX%%+${PREFIX}+g" \	114	-e "s+%%PREFIX%%+${PREFIX}+g" \
111	-e "s+%%X11BASE%%+${X11BASE}+g" \	115	-e "s+%%X11BASE%%+${X11BASE}+g" \
		116	-e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
112	-e "s+%%BROWSER%%+${BROWSER}+g" \	117	-e "s+%%BROWSER%%+${BROWSER}+g" \
113	-e "s,%%JAVA_VERSION%%,${JAVA_VERSION},g" \	118	-e "s,%%JAVA_VERSION%%,${JAVA_VERSION},g" \
114	-e "s+%%JAVA_OS%%+${JAVA_OS}+g" \	119	-e "s+%%JAVA_OS%%+${JAVA_OS}+g" \
Lines 118-123 Link Here
118	-e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \	123	-e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
119	-e "s+%%PREFIX%%+${PREFIX}+g" \	124	-e "s+%%PREFIX%%+${PREFIX}+g" \
120	${FILESDIR}/eclipse.desktop > ${WRKSRC}/eclipse.desktop.tmp	125	${FILESDIR}/eclipse.desktop > ${WRKSRC}/eclipse.desktop.tmp
		126	${MKDIR} ${PREFIX}/share/applications/ \|\| ${TRUE}
121	${INSTALL_DATA} ${WRKSRC}/eclipse.desktop.tmp ${PREFIX}/share/applications/eclipse.desktop	127	${INSTALL_DATA} ${WRKSRC}/eclipse.desktop.tmp ${PREFIX}/share/applications/eclipse.desktop
122	${INSTALL_PROGRAM} ${WRKSRC}/launchertmp/eclipse ${PREFIX}/eclipse/eclipse	128	${INSTALL_PROGRAM} ${WRKSRC}/launchertmp/eclipse ${PREFIX}/eclipse/eclipse
123	@-update-desktop-database	129	@-update-desktop-database
Lines 127-130 Link Here
127	\| ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST}	133	\| ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST}
128	@echo '@unexec ${PREFIX}/bin/update-desktop-database > /dev/null \|\| /usr/bin/true' >> ${TMPPLIST}	134	@echo '@unexec ${PREFIX}/bin/update-desktop-database > /dev/null \|\| /usr/bin/true' >> ${TMPPLIST}
129		135
		136	.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
130	.include <bsd.port.post.mk>	137	.include <bsd.port.post.mk>

Lines 10-17 Link Here

(-)eclipse/files/eclipse.in (-2 / +3 lines)
10	DEFAULT_JAVA_HOME=%%PREFIX%%	10	DEFAULT_JAVA_HOME=%%PREFIX%%
11	ECLIPSE_HOME=%%ECLIPSE_HOME%%	11	ECLIPSE_HOME=%%ECLIPSE_HOME%%
12	DEFAULT_JAVA_CMD=java	12	DEFAULT_JAVA_CMD=java
13	MOZILLA_FIVE_HOME=%%LOCALBASE%%/include/%%BROWSER%%	13	#MOZILLA_FIVE_HOME=%%LOCALBASE%%/lib/%%BROWSER%%
14	export MOZILLA_FIVE_HOME	14	#LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
		15	#export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
15		16
16	#-----------------------------------------------------------------------------	17	#-----------------------------------------------------------------------------
17	# Determine configuration settings	18	# Determine configuration settings

Lines 68-76 Link Here

(-)eclipse/files/post-patch-plugins-swt-gtk-build.sh (-3 / +3 lines)
68	- echo " *** Mozilla embedding support will not be compiled."	68	- echo " *** Mozilla embedding support will not be compiled."
69	+if [ ${MAKE_MOZILLA} != "" ]; then	69	+if [ ${MAKE_MOZILLA} != "" ]; then
70	+ if [ -z "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then	70	+ if [ -z "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then
71	+ if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then	71	+ if [ x`pkg-config --exists %%GECKO%%-xpcom && echo YES` = "xYES" ]; then
72	+ GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom`	72	+ GECKO_INCLUDES=`pkg-config --cflags %%GECKO%%-xpcom`
73	+ GECKO_LIBS=`pkg-config --libs mozilla-xpcom`	73	+ GECKO_LIBS=`pkg-config --libs %%GECKO%%-xpcom`
74	+ export GECKO_INCLUDES	74	+ export GECKO_INCLUDES
75	+ export GECKO_LIBS	75	+ export GECKO_LIBS
76	+ MAKE_MOZILLA=make_mozilla	76	+ MAKE_MOZILLA=make_mozilla

Lines 4-12 Link Here

(-)eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak (-3 / +3 lines)
4	-I. \	4	-I. \
5	-I$(JAVA_HOME)/include \	5	-I$(JAVA_HOME)/include \
6	-I$(JAVA_HOME)/include/freebsd \	6	-I$(JAVA_HOME)/include/freebsd \
7	+ -I$(LOCALBASE)/include/mozilla \	7	+ -I$(LOCALBASE)/include/%%GECKO%% \
8	+ -I$(LOCALBASE)/include/mozilla/profdirserviceprovider \	8	+ -I$(LOCALBASE)/include/%%GECKO%%/profdirserviceprovider \
9	+ -I$(LOCALBASE)/include/mozilla/string \	9	+ -I$(LOCALBASE)/include/%%GECKO%%/string \
10	+ -I$(LOCALBASE)/include/nspr \	10	+ -I$(LOCALBASE)/include/nspr \
11	${SWT_PTR_CFLAGS}	11	${SWT_PTR_CFLAGS}
12	MOZILLALIBS = -shared -s -Wl,--version-script=mozilla_exports -Bsymbolic	12	MOZILLALIBS = -shared -s -Wl,--version-script=mozilla_exports -Bsymbolic

Return to bug 105581