mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
- Update to 1.1.3_8 [1]
- Remove deprecated patch (fix for Java 1.5) Reported by: portscout [1]
This commit is contained in:
parent
7a95d26c62
commit
0dc845dc67
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=165999
3 changed files with 7 additions and 45 deletions
|
@ -6,11 +6,11 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
PORTNAME= xpp3
|
PORTNAME= xpp3
|
||||||
PORTVERSION= 1.1.3.4.M
|
DISTVERSION= 1.1.3_8
|
||||||
PORTEPOCH= 1
|
PORTEPOCH= 1
|
||||||
CATEGORIES= textproc java
|
CATEGORIES= textproc java
|
||||||
MASTER_SITES= http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/
|
MASTER_SITES= http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/
|
||||||
DISTNAME= ${PORTNAME}-${PORTVERSION}_src
|
DISTNAME= ${PORTNAME}-${DISTVERSION}_src
|
||||||
EXTRACT_SUFX= .tgz
|
EXTRACT_SUFX= .tgz
|
||||||
|
|
||||||
MAINTAINER= hq@FreeBSD.org
|
MAINTAINER= hq@FreeBSD.org
|
||||||
|
@ -22,7 +22,7 @@ RUN_DEPENDS= ${JAVAJARDIR}/xmlpull.jar:${PORTSDIR}/textproc/xmlpull
|
||||||
USE_JAVA= yes
|
USE_JAVA= yes
|
||||||
JAVA_VERSION= 1.3+
|
JAVA_VERSION= 1.3+
|
||||||
|
|
||||||
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
|
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
|
||||||
|
|
||||||
USE_ANT= yes
|
USE_ANT= yes
|
||||||
ALL_TARGET= jar
|
ALL_TARGET= jar
|
||||||
|
@ -31,7 +31,7 @@ MAKE_ARGS= -Djavadoc_packages=org.xmlpull.mxp1
|
||||||
ALL_TARGET+= javadoc
|
ALL_TARGET+= javadoc
|
||||||
PORTDOCS= api_impl ABOUT.txt THANKS.txt TODO.html build.txt changes.html faq.html
|
PORTDOCS= api_impl ABOUT.txt THANKS.txt TODO.html build.txt changes.html faq.html
|
||||||
.endif
|
.endif
|
||||||
JARFILE= ${PORTNAME}-${PORTVERSION}.jar
|
JARFILE= ${PORTNAME}-${DISTVERSION}.jar
|
||||||
DESTJARFILE= ${PORTNAME}.jar
|
DESTJARFILE= ${PORTNAME}.jar
|
||||||
PLIST_FILES= %%JAVAJARDIR%%/${DESTJARFILE}
|
PLIST_FILES= %%JAVAJARDIR%%/${DESTJARFILE}
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
MD5 (xpp3-1.1.3.4.M_src.tgz) = 4f3c02abb76368ff29e3bbc30f067dad
|
MD5 (xpp3-1.1.3_8_src.tgz) = 6d1847c8c71cf4eb01d20c38bb3afc58
|
||||||
SHA256 (xpp3-1.1.3.4.M_src.tgz) = e0fd7fd8a681c736097546fbcdbc1999f8ce75cef7178c076a10506ea5f38eff
|
SHA256 (xpp3-1.1.3_8_src.tgz) = 1a8d08734fd18d07c069710d02dcfe57977881ee3924ffca12104d72da12c6ed
|
||||||
SIZE (xpp3-1.1.3.4.M_src.tgz) = 567986
|
SIZE (xpp3-1.1.3_8_src.tgz) = 571719
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
$FreeBSD$
|
|
||||||
|
|
||||||
With Java 1.5, 'enum' is a keyword
|
|
||||||
|
|
||||||
--- src/java/xpath/org/xmlpull/v1/builder/xpath/jaxen/function/ext/LocaleFunctionSupport.java.orig Sat Apr 15 02:21:03 2006
|
|
||||||
+++ src/java/xpath/org/xmlpull/v1/builder/xpath/jaxen/function/ext/LocaleFunctionSupport.java Sat Apr 15 02:21:40 2006
|
|
||||||
@@ -130,24 +130,24 @@
|
|
||||||
* be found
|
|
||||||
*/
|
|
||||||
protected Locale findLocale(String localeText) {
|
|
||||||
- StringTokenizer enum = new StringTokenizer( localeText, "-" );
|
|
||||||
- if (enum.hasMoreTokens())
|
|
||||||
+ StringTokenizer _enum = new StringTokenizer( localeText, "-" );
|
|
||||||
+ if (_enum.hasMoreTokens())
|
|
||||||
{
|
|
||||||
- String language = enum.nextToken();
|
|
||||||
- if (! enum.hasMoreTokens())
|
|
||||||
+ String language = _enum.nextToken();
|
|
||||||
+ if (! _enum.hasMoreTokens())
|
|
||||||
{
|
|
||||||
return findLocaleForLanguage(language);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
- String country = enum.nextToken();
|
|
||||||
- if (! enum.hasMoreTokens())
|
|
||||||
+ String country = _enum.nextToken();
|
|
||||||
+ if (! _enum.hasMoreTokens())
|
|
||||||
{
|
|
||||||
return new Locale(language, country);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
- String variant = enum.nextToken();
|
|
||||||
+ String variant = _enum.nextToken();
|
|
||||||
return new Locale(language, country, variant);
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Add table
Reference in a new issue