svn commit: r502804 - in head/java/eclipse: . files scripts

Steve Wills swills at FreeBSD.org
Mon May 27 16:03:36 UTC 2019 

Author: swills
Date: Mon May 27 16:03:34 2019
New Revision: 502804
URL: https://svnweb.freebsd.org/changeset/ports/502804

Log:
  java/eclipse: Fix build when using maven-3.6.1
  
  While here, fix powerpc64 build and remove pkg-plist for dynamic plist
  to cater for multiple ARCH builds.
  
  PR:		238152
  Submitted by:	Jonathan Chen <jonc at chen.org.nz> (maintainer)

Deleted:
  head/java/eclipse/pkg-plist
Modified:
  head/java/eclipse/Makefile   (contents, props changed)
  head/java/eclipse/files/patch-eclipse.pde.build   (contents, props changed)
  head/java/eclipse/files/patch-eclipse.platform.releng   (contents, props changed)
  head/java/eclipse/files/patch-eclipse.platform.swt   (contents, props changed)
  head/java/eclipse/pkg-descr   (contents, props changed)
  head/java/eclipse/scripts/pre-build

Modified: head/java/eclipse/Makefile
==============================================================================
--- head/java/eclipse/Makefile	Mon May 27 15:57:22 2019	(r502803)
+++ head/java/eclipse/Makefile	Mon May 27 16:03:34 2019	(r502804)
@@ -48,7 +48,7 @@ COMMENT=	Eclipse IDE 2019-03
 
 LICENSE=	EPL
 
-ONLY_FOR_ARCHS=	amd64 power64
+ONLY_FOR_ARCHS=	amd64 powerpc64
 
 BUILD_DEPENDS=	git:devel/git-lite \
 		${LOCALBASE}/share/java/maven/bin/mvn:devel/maven
@@ -70,7 +70,7 @@ DESKTOP_ENTRIES="Eclipse" \
 		"${PORTNAME}" \
 		"${PORTNAME}" \
 		"Development;IDE;Java;" \
-		false
+		"false"
 
 SUB_FILES=	${PORTNAME}
 
@@ -91,8 +91,9 @@ do-install:
 	${TAR} -x --directory ${STAGEDIR}${DATADIR}/.. --file ${WRKSRC}/${ECLIPSE_RESULT}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
-# dynamically add timestamped profiles, which should be excluded from pkg-plist
+# generate dynamic plist, to cater for different ARCHS
 post-install:
-	cd ${STAGEDIR}${PREFIX} && ${FIND} -s share/${PORTNAME} -name '*.profile.gz' >> ${TMPPLIST}
+	cd ${STAGEDIR}${PREFIX} && ${FIND} -s bin/${PORTNAME} share/${PORTNAME} -not -type d >> ${TMPPLIST}
+	cd ${STAGEDIR}${PREFIX} && ${FIND} -ds share/${PORTNAME} -type d | ${SED} -e 's,^, at dir ,' >> ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: head/java/eclipse/files/patch-eclipse.pde.build
==============================================================================
--- head/java/eclipse/files/patch-eclipse.pde.build	Mon May 27 15:57:22 2019	(r502803)
+++ head/java/eclipse/files/patch-eclipse.pde.build	Mon May 27 16:03:34 2019	(r502804)
@@ -51,27 +51,3 @@ diff -ru eclipse.pde.build/org.eclipse.pde.build/src_a
  		if ("win32".equalsIgnoreCase(os)) //$NON-NLS-1$
  			return "Windows"; //$NON-NLS-1$
  		if ("macosx".equalsIgnoreCase(os)) //$NON-NLS-1$
-diff -ru eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml
---- eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml	0000-00-00 00:00:00.000000000 +0000
-@@ -19,9 +19,9 @@
- 		</ant>
- 	</target>
- 	
--	<target name="assemble.linux.gtk.x86_64.xml">
-+	<target name="assemble.freebsd.gtk.amd64.xml">
- 		<ant antfile="${assembleScriptName}" >
--			<property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86_64.zip"/>
-+			<property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.amd64.zip"/>
- 		</ant>
- 	</target>
- 		
-diff -ru eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties
---- eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties	0000-00-00 00:00:00.000000000 +0000
-+++ eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties	0000-00-00 00:00:00.000000000 +0000
-@@ -19,4 +19,4 @@
- root.permissions.755=eclipse,*.so*
- 
- root.win32.win32.x86_64=eclipse.exe, eclipsec.exe
--root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
-+root.freebsd.gtk.amd64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm

Modified: head/java/eclipse/files/patch-eclipse.platform.releng
==============================================================================
--- head/java/eclipse/files/patch-eclipse.platform.releng	Mon May 27 15:57:22 2019	(r502803)
+++ head/java/eclipse/files/patch-eclipse.platform.releng	Mon May 27 16:03:34 2019	(r502804)
@@ -69,3 +69,16 @@ diff -ru eclipse.platform.releng/features/org.eclipse.
                  <plugin id="org.eclipse.core.resources.win32.x86_64"/>
                </excludes>
              </configuration>
+diff -ru eclipse.platform.releng/pom.xml eclipse.platform.releng/pom.xml
+--- eclipse.platform.releng/pom.xml	0000-00-00 00:00:00.000000000 +0000
++++ eclipse.platform.releng/pom.xml	0000-00-00 00:00:00.000000000 +0000
+@@ -66,7 +66,9 @@
+     <module>features/org.eclipse.releng.tools</module>
+     <module>features/org.eclipse.sdk</module>
+     <module>features/org.eclipse.sdk.examples-feature</module>
++<!--
+     <module>features/org.eclipse.sdk.tests</module>
++-->
+     <module>features/org.eclipse.test-feature</module>
+   </modules>
+ 

Modified: head/java/eclipse/files/patch-eclipse.platform.swt
==============================================================================
--- head/java/eclipse/files/patch-eclipse.platform.swt	Mon May 27 15:57:22 2019	(r502803)
+++ head/java/eclipse/files/patch-eclipse.platform.swt	Mon May 27 16:03:34 2019	(r502804)
@@ -74,16 +74,33 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/
  	*)
  		SWT_ARCH=$MODEL
  		AWT_ARCH=$MODEL
-@@ -194,7 +192,7 @@
+@@ -118,6 +116,16 @@
+ esac
  
+ case $SWT_OS.$SWT_ARCH in
++	"freebsd.ppc64")
++		if [ "${CC}" = "" ]; then
++			export CC=gcc
++		fi
++		if [ "${JAVA_HOME}" = "" ]; then
++			DYNAMIC_JAVA_HOME=`readlink -f /usr/local/bin/java | sed "s:jre/::" | sed "s:bin/java::"`
++			JAVA_HOME = $DYNAMIC_JAVA_HOME
++			export JAVA_HOME
++		fi
++		;;
+ 	"linux.x86")
+ 		if [ "${CC}" = "" ]; then
+ 			export CC=gcc
+@@ -194,7 +202,7 @@
  
+ 
  # For 64-bit CPUs, we have a switch
 -if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
 +if [ ${MODEL} = 'amd64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'powerpc64' ]; then
  	SWT_PTR_CFLAGS=-DJNI64
  	if [ -d /lib64 ]; then
  		XLIB64=-L/usr/X11R6/lib64
-@@ -205,6 +203,11 @@
+@@ -205,6 +213,11 @@
  		XLIB64="${XLIB64} -L/usr/lib64"
  		SWT_LFLAGS=-m64
  		export SWT_LFLAGS
@@ -95,7 +112,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/
  	fi
  	export SWT_PTR_CFLAGS
  fi
-@@ -364,4 +367,4 @@
+@@ -364,4 +377,4 @@
  elif [ "${GTK_VERSION}" = "3.0" -o "${GTK_VERSION}" = "" ]; then
  	export GTK_VERSION="3.0"
  	func_build_gtk3 "$@"

Modified: head/java/eclipse/pkg-descr
==============================================================================
--- head/java/eclipse/pkg-descr	Mon May 27 15:57:22 2019	(r502803)
+++ head/java/eclipse/pkg-descr	Mon May 27 16:03:34 2019	(r502804)
@@ -5,4 +5,4 @@ development tools. The Eclipse Platform allows tool bu
 independently develop tools that integrate with other people's tools
 so seamlessly you can't tell where one tool ends and another starts.
 
-WWW: https://www.eclipse.org/
+WWW: http://www.eclipse.org/

Modified: head/java/eclipse/scripts/pre-build
==============================================================================
--- head/java/eclipse/scripts/pre-build	Mon May 27 15:57:22 2019	(r502803)
+++ head/java/eclipse/scripts/pre-build	Mon May 27 16:03:34 2019	(r502804)
@@ -9,11 +9,9 @@ ARCHS="amd64 powerpc64"
 # Create dummy repo for jgit
 if [ ! -d .git ]
 then
-	echo 'in pre-build doing git-init'
 	mkdir ${WRKDIR}/githome
 	(
 		export HOME=${WRKDIR}/githome
-		echo "home:" $HOME
 		git config --global user.email "eclipse at freebsd.org"
 		git config --global user.name "Eclipse"
 		git init

More information about the svn-ports-all mailing list