Update to 1.3 release.

This commit is contained in:
Alex Dupre 2008-10-14 16:17:29 +00:00
parent 9cb8a6d230
commit 05fed8bce9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=221584
4 changed files with 44 additions and 9 deletions

View File

@ -6,14 +6,15 @@
#
PORTNAME= xstream
PORTVERSION= 1.2
PORTREVISION= 2
PORTVERSION= 1.3
CATEGORIES= textproc java
MASTER_SITES= http://dist.codehaus.org/xstream/distributions/
MASTER_SITES= http://repository.codehaus.org/com/thoughtworks/xstream/xstream-distribution/${PORTVERSION}/
DISTNAME= ${PORTNAME}-distribution-${PORTVERSION}-src
MAINTAINER= ale@FreeBSD.org
COMMENT= A simple library to serialize Java objects to XML
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
USE_ZIP= yes
USE_JAVA= yes
USE_ANT= yes
@ -28,14 +29,14 @@ ALL_TARGET+= javadoc
do-install:
@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
@${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar ${JAVAJARDIR}/${PORTNAME}.jar
@${INSTALL_DATA} ${WRKSRC}/target/${PORTNAME}-SNAPSHOT.jar ${JAVAJARDIR}/${PORTNAME}.jar
@${ECHO_MSG} " [ DONE ]"
.if !defined(NOPORTDOCS)
@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
@${MKDIR} ${DOCSDIR}
@cd ${WRKSRC}/ && ${FIND} javadoc \
@cd ${WRKSRC}/target/ && ${FIND} javadoc \
| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
@${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
@${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/../,} ${DOCSDIR}/
@${ECHO_MSG} " [ DONE ]"
.endif

View File

@ -1,3 +1,3 @@
MD5 (xstream-1.2.zip) = 488fd2742f2d9f2b8bfe9acd8bccd097
SHA256 (xstream-1.2.zip) = 7536d9b1f2bf1c1b235d1a1114dbdae08a8ed5953b1fe7a2c760bf807770e26d
SIZE (xstream-1.2.zip) = 5488349
MD5 (xstream-distribution-1.3-src.zip) = 8d2caf93c3078760c6baa8c26765ec4b
SHA256 (xstream-distribution-1.3-src.zip) = fe09248421d8b153880b127b08083a7852f40dbafa6b0e2a9fa8920bf5abaa35
SIZE (xstream-distribution-1.3-src.zip) = 7403424

View File

@ -0,0 +1,12 @@
--- build.xml.orig 2008-10-14 17:50:58.000000000 +0200
+++ build.xml 2008-10-14 17:51:26.000000000 +0200
@@ -146,9 +146,6 @@
<jar jarfile="${build.dir}/xstream-${version}.jar">
<fileset dir="${java.build.dir}"/>
</jar>
- <jar jarfile="${build.dir}/xstream-benchmark-${version}.jar">
- <fileset dir="${benchmark.build.dir}"/>
- </jar>
<antcall target="jdk-check"/>
</target>

View File

@ -0,0 +1,22 @@
--- src/java/com/thoughtworks/xstream/core/JVM.java.orig 2008-10-14 17:40:37.000000000 +0200
+++ src/java/com/thoughtworks/xstream/core/JVM.java 2008-10-14 17:47:39.000000000 +0200
@@ -67,6 +67,10 @@ public class JVM {
return vendor.indexOf("Sun") != -1;
}
+ private static boolean isDiablo() {
+ return vendor.indexOf("The FreeBSD Foundation") != -1;
+ }
+
private static boolean isApple() {
return vendor.indexOf("Apple") != -1;
}
@@ -178,7 +182,7 @@ public class JVM {
}
private boolean canUseSun14ReflectionProvider() {
- return (isSun() || isApple() || isHPUX() || isIBM() || isBlackdown() || isBEAWithUnsafeSupport() || isHitachi() || isSAP()) && is14() && loadClass("sun.misc.Unsafe") != null;
+ return (isSun() || isDiablo() || isApple() || isHPUX() || isIBM() || isBlackdown() || isBEAWithUnsafeSupport() || isHitachi() || isSAP()) && is14() && loadClass("sun.misc.Unsafe") != null;
}
private boolean canUseHarmonyReflectionProvider() {