On 04/28/11 07:17, Sebastian Chmielewski wrote:
On Wed, 27 Apr 2011 18:24:12 +0200
Thomas Gellekum<thomas.gelle...@gmx.de> wrote:
Moin,
I have attached a patch to upgrade the eclipse port to 3.6.2. Seems to
work for me on 8-stable/amd64, but this is a port with a tricky build
process, so I may have easily overlooked something. So, please test, and
send feedback to the list. Thanks.
tg
Build failed for me with following error:
Ok, next try. Sorry for the inconvenience.
tg
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/java/eclipse/Makefile,v
retrieving revision 1.75
diff -u -r1.75 Makefile
--- Makefile 18 Dec 2010 10:38:46 -0000 1.75
+++ Makefile 27 Apr 2011 13:58:52 -0000
@@ -6,8 +6,8 @@
#
PORTNAME= eclipse
-PORTVERSION= 3.6.1
-PORTREVISION= 1
+PORTVERSION= 3.6.2
+#PORTREVISION= 1
CATEGORIES= java devel
MASTER_SITES=
http://download.eclipse.org/technology/linuxtools/eclipse-build/3.6.x_Helios/:1
\
http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/:2
\
@@ -61,11 +61,11 @@
com.jcraft.jsch_0.1.41.v200903070017.jar \
javax.servlet_2.5.0.v200910301333.jar \
javax.servlet.jsp_2.0.0.v200806031607.jar \
- org.apache.commons.codec_1.3.0.v20080530-1600.jar \
- org.apache.commons.el_1.0.0.v200806031608.jar \
+ org.apache.commons.codec_1.3.0.v20100518-1140.jar \
+ org.apache.commons.el_1.0.0.v201004212143.jar \
org.apache.commons.httpclient_3.1.0.v201005080502.jar \
org.apache.commons.logging_1.0.4.v201005080501.jar \
- org.apache.jasper_5.5.17.v200903231320.jar \
+ org.apache.jasper_5.5.17.v201004212143.jar \
org.apache.lucene_1.9.1.v20100518-1140.jar \
org.apache.lucene.analysis_1.9.1.v20100518-1140.jar \
org.mortbay.jetty.util_6.1.23.v201004211559.jar \
@@ -147,6 +148,11 @@
@${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${JUNIT3_SRCFILE} -d
${WRKDIR}/junit
@${CP} ${WRKDIR}/junit/junit${JUNIT3_VERSION}/junit.jar
${BUILD_WRKSRC}/bundles/
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${JUNIT4_SRCFILE}
${BUILD_WRKSRC}/bundles/junit4.jar
+
+ @${MV}
${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.codec_1.3.0.v20080530-1600.jar
${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.codec_1.3.0.v20100518-1140.jar
+ @${MV}
${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.el_1.0.0.v200806031608.jar
${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.el_1.0.0.v201004212143.jar
+ @${MV}
${BUILD_WRKSRC}/dependencyManifests/org.apache.jasper_5.5.17.v200903231320.jar
${BUILD_WRKSRC}/dependencyManifests/org.apache.jasper_5.5.17.v201004212143.jar
+
.if defined(WITH_TESTS)
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_TEST_SRCFILE} ${BUILD_WRKSRC}
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_TEST_SCRIPTFILE}
${BUILD_WRKSRC}
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/java/eclipse/distinfo,v
retrieving revision 1.20
diff -u -r1.20 distinfo
--- distinfo 20 Mar 2011 12:49:40 -0000 1.20
+++ distinfo 27 Apr 2011 14:25:26 -0000
@@ -1,7 +1,7 @@
SHA256 (eclipse/eclipse-build-0.6.1.tar.bz2) =
66b6344fe55523b1e2243bd37f9ad14aeff0fd7f0f44669a89cada9146e5b46e
SIZE (eclipse/eclipse-build-0.6.1.tar.bz2) = 295425
-SHA256 (eclipse/eclipse-3.6.1-src.tar.bz2) =
588f90209a75c8359e86deed5a48f5b3bff69e5d7e1856119e8a740c17646250
-SIZE (eclipse/eclipse-3.6.1-src.tar.bz2) = 62707872
+SHA256 (eclipse/eclipse-3.6.2-src.tar.bz2) =
b72951cc75eba57c7d849210de38f69858ac4699eb3a69d4261a80d125f70d45
+SIZE (eclipse/eclipse-3.6.2-src.tar.bz2) = 62525869
SHA256 (eclipse/apache-ant-1.7.1-bin.tar.bz2) =
24e54c9d90b81d1b7342695a8285a969393fd883e99ffbbc04203c106d9c2f97
SIZE (eclipse/apache-ant-1.7.1-bin.tar.bz2) = 7641928
SHA256 (eclipse/junit3.8.2.zip) =
aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a
@@ -10,22 +10,22 @@
SIZE (eclipse/junit-4.8.2.jar) = 237344
SHA256 (eclipse/com.ibm.icu_4.2.1.v20100412.jar) =
78150e19c1084d4ad085de156332f6985872d1da9d7b2e22b2c0360ecdc3b974
SIZE (eclipse/com.ibm.icu_4.2.1.v20100412.jar) = 6451214
-SHA256 (eclipse/com.jcraft.jsch_0.1.41.v200903070017.jar) =
ee8af42d01fbdd07a70762483b9eeda5dc8f23b386e04a6aa034b06df75c9396
-SIZE (eclipse/com.jcraft.jsch_0.1.41.v200903070017.jar) = 225576
+SHA256 (eclipse/com.jcraft.jsch_0.1.41.v200903070017.jar) =
c326b74ab30b83138daba0baf0565e22da842199c43d80ec448a3db5d2af411b
+SIZE (eclipse/com.jcraft.jsch_0.1.41.v200903070017.jar) = 226756
SHA256 (eclipse/javax.servlet_2.5.0.v200910301333.jar) =
27c684a06d3832578e2b0bfbd183d973ad5662cfee5cf116791091b74e0297ee
SIZE (eclipse/javax.servlet_2.5.0.v200910301333.jar) = 118873
-SHA256 (eclipse/javax.servlet.jsp_2.0.0.v200806031607.jar) =
7129d8eb8759eae6169cb494d2ee031bb75a3dab68bc789d92d8a34f2f8a873e
-SIZE (eclipse/javax.servlet.jsp_2.0.0.v200806031607.jar) = 62707
-SHA256 (eclipse/org.apache.commons.codec_1.3.0.v20080530-1600.jar) =
7bab3987cad2567c9baffef27667d3c20b4f12857dba2fbf0573524902ad05b0
-SIZE (eclipse/org.apache.commons.codec_1.3.0.v20080530-1600.jar) = 53772
-SHA256 (eclipse/org.apache.commons.el_1.0.0.v200806031608.jar) =
0d8b55ca35e851ce3d1e5beeb0e4c32ab0630d4d21b3ce324ef0ac0a45e3ad37
-SIZE (eclipse/org.apache.commons.el_1.0.0.v200806031608.jar) = 127481
+SHA256 (eclipse/javax.servlet.jsp_2.0.0.v200806031607.jar) =
e04390c80f329ac8f751eefb4d086ee829bf4d5dd2533bc4b3fa1dcf993b21d3
+SIZE (eclipse/javax.servlet.jsp_2.0.0.v200806031607.jar) = 63889
+SHA256 (eclipse/org.apache.commons.codec_1.3.0.v20100518-1140.jar) =
8bc57d43356859ed740132e0e70cc302ca8a43a972109ef50130822e9eea10ce
+SIZE (eclipse/org.apache.commons.codec_1.3.0.v20100518-1140.jar) = 55003
+SHA256 (eclipse/org.apache.commons.el_1.0.0.v201004212143.jar) =
48a48228121cb80af2bb569342ffd5658b1fe12b6fba9cc0201b5173d59b5b3a
+SIZE (eclipse/org.apache.commons.el_1.0.0.v201004212143.jar) = 128694
SHA256 (eclipse/org.apache.commons.httpclient_3.1.0.v201005080502.jar) =
0f215df922704e121e8504d9c34e60a40729d43badd90576e4c83446203cf77e
SIZE (eclipse/org.apache.commons.httpclient_3.1.0.v201005080502.jar) = 321329
SHA256 (eclipse/org.apache.commons.logging_1.0.4.v201005080501.jar) =
5f0c8730284da1752cca07de023eca14bdd50e99f7262239b17db8eaf7b40a71
SIZE (eclipse/org.apache.commons.logging_1.0.4.v201005080501.jar) = 45398
-SHA256 (eclipse/org.apache.jasper_5.5.17.v200903231320.jar) =
0e440bffabde8db6ad20dee3075ad0a7a7699867be4f5e4b755fd1e56a93fb03
-SIZE (eclipse/org.apache.jasper_5.5.17.v200903231320.jar) = 1721330
+SHA256 (eclipse/org.apache.jasper_5.5.17.v201004212143.jar) =
0ef32286ae64b938013bf1fbd60b227284b296fbe9543344d928a11a4d4c6bfb
+SIZE (eclipse/org.apache.jasper_5.5.17.v201004212143.jar) = 1722559
SHA256 (eclipse/org.apache.lucene_1.9.1.v20100518-1140.jar) =
2bab6a2feaabaf8db9c04db16fec03435e37fe201294aead06096884e210ad7b
SIZE (eclipse/org.apache.lucene_1.9.1.v20100518-1140.jar) = 445306
SHA256 (eclipse/org.apache.lucene.analysis_1.9.1.v20100518-1140.jar) =
bc55013ceb92b3f911217a9d913e89a72172af90895cec55a069bf047b0cac28
@@ -34,8 +34,8 @@
SIZE (eclipse/org.mortbay.jetty.util_6.1.23.v201004211559.jar) = 192846
SHA256 (eclipse/org.mortbay.jetty.server_6.1.23.v201004211559.jar) =
17bcd3edc28a4808a13558077507da6ed5fe88cc8c216d00d87da88683d3d94d
SIZE (eclipse/org.mortbay.jetty.server_6.1.23.v201004211559.jar) = 557434
-SHA256 (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) =
211c869941f7151fe7d3ecaae31b53d128a2d97684ed4ce455d2ca4ea3a0abeb
-SIZE (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) = 26650
+SHA256 (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) =
db7f2cd14b9e263d791631960a0cd5a9ff4c8257939b551a5b86dd2ac6d23345
+SIZE (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) = 27828
SHA256 (eclipse/org.objectweb.asm_3.2.0.v200909071300.jar) =
3b30b0b87d9d517829eb6227c45657c767f3ec90019cb99d26638f5c4a07a15d
SIZE (eclipse/org.objectweb.asm_3.2.0.v200909071300.jar) = 229434
SHA256 (eclipse/org.sat4j.core_2.2.0.v20100429.jar) =
4c3c8b6c3b05576fd1adba3c1ce04e6ea88dd1d9615163411baa76f269c750aa
Index: files/freebsd-support.patch
===================================================================
RCS file: /home/ncvs/ports/java/eclipse/files/freebsd-support.patch,v
retrieving revision 1.3
diff -u -r1.3 freebsd-support.patch
--- files/freebsd-support.patch 13 Dec 2010 21:05:04 -0000 1.3
+++ files/freebsd-support.patch 27 Apr 2011 14:00:38 -0000
@@ -2998,7 +2998,7 @@
@@ -114,7 +116,13 @@
fi
- if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then
+ if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} !=
'sparc64' ]; then
- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
+ if [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
+ XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
@@ -3232,7 +3232,7 @@
+Bundle-Name: %fragmentName
+Bundle-Vendor: %providerName
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86; singleton:=true
-+Bundle-Version: 3.6.1.qualifier
++Bundle-Version: 3.6.2.qualifier
+Bundle-ManifestVersion: 2
+Bundle-Localization: fragment
+Export-Package:
@@ -5055,7 +5055,7 @@
+ <property name="swt.arch" value="x86" />
+
+ <!-- These properties are used by eclipse when exporting as Deployable
plugin and fragments -->
-+ <property name="version.suffix" value="3.6.1" />
++ <property name="version.suffix" value="3.6.2" />
+
+ <import file="../org.eclipse.swt/buildFragment.xml"/>
+</project>
@@ -5113,7 +5113,7 @@
+Bundle-Name: %fragmentName
+Bundle-Vendor: %providerName
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86_64; singleton:=true
-+Bundle-Version: 3.5.0.qualifier
++Bundle-Version: 3.6.2.qualifier
+Bundle-ManifestVersion: 2
+Bundle-Localization: fragment
+Export-Package:
@@ -6936,7 +6936,7 @@
+ <property name="swt.arch" value="x86_64" />
+
+ <!-- These properties are used by eclipse when exporting as Deployable
plugin and fragments -->
-+ <property name="version.suffix" value="3.6.1" />
++ <property name="version.suffix" value="3.6.2" />
+
+ <import file="../org.eclipse.swt/buildFragment.xml"/>
+</project>
@@ -7504,19 +7504,19 @@
+}
--- build/eclipse-3.6.1-src/pluginVersions.properties~ Fri Oct 1 17:18:03 2010
+++ build/eclipse-3.6.1-src/pluginVersions.properties Wed Oct 20 20:19:42 2010
-@@ -33,6 +33,7 @@
- org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=R36x_v20100810
+@@ -34,6 +34,7 @@
+ org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=R36x_v20101019_1345
org.eclipse.equinox.http,0.0.0=v20100503
- org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3655c
-+org.eclipse.swt.gtk.freebsd.x86_64,0.0.0=v3655c
- org.eclipse.swt.photon.qnx.x86,0.0.0=v3655c
+ org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3659b
++org.eclipse.swt.gtk.freebsd.x86_64,0.0.0=v3659b
+ org.eclipse.swt.photon.qnx.x86,0.0.0=v3659b
org.eclipse.equinox.p2.ui.admin,0.0.0=v20100503
org.eclipse.equinox.weaving.caching.j9,0.0.0=v20100503
-@@ -244,6 +245,7 @@
- org.eclipse.swt.examples,0.0.0=v3655c
+@@ -245,6 +246,7 @@
+ org.eclipse.swt.examples,0.0.0=v3659b
org.eclipse.cvs,0.0.0=v20100414
- org.eclipse.swt.gtk.linux.x86,0.0.0=v3655c
-+org.eclipse.swt.gtk.freebsd.x86,0.0.0=v3655c
+ org.eclipse.swt.gtk.linux.x86,0.0.0=v3659b
++org.eclipse.swt.gtk.freebsd.x86,0.0.0=v3659b
org.eclipse.equinox.log,0.0.0=v20100503
org.eclipse.equinox.jmx.client,0.0.0=v20100503
org.eclipse.ui.win32,0.0.0=I20100509-0800
Index: files/patch-eclipse-build
===================================================================
RCS file: /home/ncvs/ports/java/eclipse/files/patch-eclipse-build,v
retrieving revision 1.3
diff -u -r1.3 patch-eclipse-build
--- files/patch-eclipse-build 13 Dec 2010 21:05:04 -0000 1.3
+++ files/patch-eclipse-build 27 Apr 2011 13:57:40 -0000
@@ -241,7 +241,7 @@
buildTag=vM20100211-1343
-label=3.6.0
-bootclasspath=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
-+label=3.6.1
++label=3.6.2
+bootclasspath=%%BOOTCLASSPATH%%
#build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
@@ -309,3 +309,20 @@
+Exec=%%PORTNAME%%
Terminal=false
Categories=Development;IDE;Java;
+--- eclipse-build-0.6.1/dependencies.properties.orig 2010-08-11
22:29:29.000000000 +0200
++++ eclipse-build-0.6.1/dependencies.properties 2011-04-28
09:23:04.000000000 +0200
+@@ -2,11 +2,11 @@
+ com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar
+
javax.servlet_2.5.0.v200910301333.jar=/usr/share/java/tomcat6-servlet-2.5-api.jar:/usr/share/java/servlet-api-2.5.jar
+
javax.servlet.jsp_2.0.0.v200806031607.jar=/usr/share/java/tomcat5-jsp-2.0-api.jar:/usr/share/java/jsp-api-2.0.jar
+-org.apache.commons.codec_1.3.0.v20080530-1600.jar=/usr/share/java/commons-codec.jar
+-org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar
++org.apache.commons.codec_1.3.0.v20100518-1140.jar=/usr/share/java/commons-codec.jar
++org.apache.commons.el_1.0.0.v201004212143.jar=/usr/share/java/commons-el.jar
+
org.apache.commons.httpclient_3.1.0.v201005080502.jar=/usr/share/java/commons-httpclient.jar
+
org.apache.commons.logging_1.0.4.v201005080501.jar=/usr/share/java/commons-logging.jar
+-org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper-5.5.26.jar
++org.apache.jasper_5.5.17.v201004212143.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper-5.5.26.jar
+
org.apache.lucene_1.9.1.v20100518-1140.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
+
org.apache.lucene.analysis_1.9.1.v20100518-1140.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
+
org.mortbay.jetty.util_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
_______________________________________________
freebsd-eclipse@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-eclipse
To unsubscribe, send any mail to "freebsd-eclipse-unsubscr...@freebsd.org"
