. Make eclipse-devel.desktop point to eclipse-devel as it should rather

  than eclipse. [1]
. Use a more consistent naming convention as per other -devel ports. [1]
. Remove trailing blank lines in distinfo to make portlint(1) happier. [1]
. Force eclipse-devel to use one of the jdk* ports rather than the
  diablo-jdk15 port on FreeBSD 7.x and higher as mixing the native
  7.x libraries of eclipse and the native 6.x libraries of diablo-jdk
  is a recipe for trouble. [2]

PR:		119403 [1], 118115 [2]
Submitted by:	Daniel Rucci <rucci@smurfbsd.warganizer.com> [1]

4 files changed, 19 insertions, 9 deletions

diff --git a/java/eclipse-devel/Makefile b/java/eclipse-devel/Makefile
index 3b410de9c76c..2c2d358e6ad0 100644
--- a/java/eclipse-devel/Makefile
+++ b/java/eclipse-devel/Makefile
@@ -5,12 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	eclipse
+PORTNAME=	eclipse-devel
 PORTVERSION=	3.3.1
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_ECLIPSE}
 MASTER_SITE_SUBDIR=	R-${PORTVERSION}-200709211145
-DISTNAME=	${PORTNAME}-sourceBuild-srcIncluded-${PORTVERSION}
+DISTNAME=	eclipse-sourceBuild-srcIncluded-${PORTVERSION}
 DIST_SUBDIR=	eclipse
 
 MAINTAINER=	freebsd-eclipse@FreeBSD.org
@@ -20,8 +21,7 @@ BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant \
 		zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	${EXTRACT_DEPENDS}
 
-ECLIPSE_SUFX=	-devel
-ECLIPSE=	${PORTNAME}${ECLIPSE_SUFX}
+ECLIPSE=	${PORTNAME}
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_GMAKE=	yes
@@ -62,6 +62,10 @@ MAKE_CAIRO=	make_cairo
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 700000
+JAVA_VENDOR=	bsdjava
+.endif
+
 .if !defined(WITHOUT_MOZILLA)
 MAKE_MOZILLA=	make_mozilla
 BROWSER=	${GECKO}
@@ -128,6 +132,15 @@ do-install:
 	  -e "s,%%JAVA_VERSION%%,${JAVA_VERSION},g" \
 	  -e "s+%%JAVA_OS%%+${JAVA_OS}+g" \
 	${FILESDIR}/eclipse.in > ${WRKSRC}/eclipse.tmp
+.if defined(JAVA_VENDOR)
+	${REINPLACE_CMD} \
+	  -e "s+%%JAVA_VENDOR_SPECIFICATION%%+JAVA_VENDOR=\"${JAVA_VENDOR}\"+g" \
+	  ${WRKSRC}/eclipse.tmp
+.else
+	${REINPLACE_CMD} \
+	  -e "s+%%JAVA_VENDOR_SPECIFICATION%%++g" \
+	  ${WRKSRC}/eclipse.tmp
+.endif
 	${INSTALL_SCRIPT} ${WRKSRC}/eclipse.tmp ${PREFIX}/bin/${ECLIPSE}
 	@${SED} \
 	  -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
diff --git a/java/eclipse-devel/distinfo b/java/eclipse-devel/distinfo
index 188ac3a148a6..d37aa65584a2 100644
--- a/java/eclipse-devel/distinfo
+++ b/java/eclipse-devel/distinfo
@@ -1,6 +1,3 @@
 MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.3.1.zip) = 764b585d9a05cd518650e31c32899a29
 SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.3.1.zip) = 6dfc8565e94fe06b4187ca58c2bb2c6441753b062d7570fd973a0b9fa5bebbb9
 SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.3.1.zip) = 94348582
-
-
-
diff --git a/java/eclipse-devel/files/eclipse.desktop b/java/eclipse-devel/files/eclipse.desktop
index 37a3c2b75e31..310996614773 100644
--- a/java/eclipse-devel/files/eclipse.desktop
+++ b/java/eclipse-devel/files/eclipse.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Comment=Eclipse IDE
 Name=Eclipse
-Exec=%%PREFIX%%/bin/eclipse
+Exec=%%PREFIX%%/bin/eclipse-devel
 Encoding=UTF-8
 Terminal=false
 Type=Application
diff --git a/java/eclipse-devel/files/eclipse.in b/java/eclipse-devel/files/eclipse.in
index 3f30044bbe93..6e7b9a3dc712 100644
--- a/java/eclipse-devel/files/eclipse.in
+++ b/java/eclipse-devel/files/eclipse.in
@@ -45,4 +45,4 @@ if [ ! -x "${ECLIPSE_HOME}/eclipse" ]; then
 	exit 1
 fi
 
-JAVA_VERSION="%%JAVA_VERSION%%" JAVA_OS="%%JAVA_OS%%" PATH=${JAVA_HOME}/bin:${PATH} exec "${ECLIPSE_HOME}/eclipse" $@
+JAVA_VERSION="%%JAVA_VERSION%%" JAVA_OS="%%JAVA_OS%%" %%JAVA_VENDOR_SPECIFICATION%% PATH=${JAVA_HOME}/bin:${PATH} exec "${ECLIPSE_HOME}/eclipse" $@