diff options
| -rw-r--r-- | libre/java-bcel/PKGBUILD | 53 | ||||
| -rw-r--r-- | libre/java-bcel/java-bcel-iso_8859_1_encoding.patch | 11 |
2 files changed, 24 insertions, 40 deletions
diff --git a/libre/java-bcel/PKGBUILD b/libre/java-bcel/PKGBUILD index c5de83f87..bb2875008 100644 --- a/libre/java-bcel/PKGBUILD +++ b/libre/java-bcel/PKGBUILD @@ -1,52 +1,47 @@ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> _libname=bcel pkgname=java-${_libname} -pkgver=5.2 -pkgrel=2.parabola1 +pkgver=6.0 +pkgrel=1.parabola1 pkgdesc="Java library to analyze, create, and manipulate (binary) Java class files" arch=('any') -url="http://commons.apache.org/bcel/" +url='https://commons.apache.org/proper/commons-bcel/' license=('APACHE') -depends=('java-runtime-headless') -makedepends=('apache-ant' 'jakarta-regexp' 'jh' 'junit') -source=("http://archive.apache.org/dist/jakarta/${_libname}/source/${_libname}-${pkgver}-src.tar.gz" - "http://repo.maven.apache.org/maven2/org/apache/${_libname}/${_libname}/${pkgver}/${_libname}-${pkgver}.pom" - "java-bcel-iso_8859_1_encoding.patch") -md5sums=('905b7e718e30e7ca726530ecf106e532' - 'a691cc2bb8fe12cec388c7edf3ab27f0' - 'adc403be36c101ba78119d27f1e230d7') +depends=('java-runtime') +makedepends=('java-environment' 'jh') +source=("http://archive.apache.org/dist/jakarta/${_libname}/source/${_libname}-$pkgver-src.tar.gz") +sha256sums=('b963b9f0614f17de40da1de265e44476b80a8cc8a36c07a3acfe48f603306958') prepare() { - cd "${srcdir}/${_libname}-${pkgver}" - patch -Np1 -i ../java-bcel-iso_8859_1_encoding.patch + cd "$srcdir/${_libname}-$pkgver-src" + mkdir -p build/classes } build() { - cd "${srcdir}/${_libname}-${pkgver}" - # "-Dbuild.sysclasspath=only" prevents ant from downloading regexp - export ANT_OPTS=-Dfile.encoding=iso-8859-1 - ant clean jar javadoc \ - -Dbuild.sysclasspath=only \ - -lib "/usr/share/java/regexp.jar" + cd "$srcdir/${_libname}-$pkgver-src" + javac -d build/classes -encoding UTF-8 \ + $(find src/main/java -name \*.java) + javadoc -sourcepath src/main/java -d build/javadoc \ + -encoding UTF-8 -subpackages org + + jar -cvf "${_libname}.jar" -C build/classes . } package() { - cd "${srcdir}/${_libname}-${pkgver}" + cd "$srcdir/${_libname}-$pkgver-src" # Install license file - install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt" # Install documentation - install -d "${pkgdir}/usr/share/doc/${pkgname}" - cp -r "dist/docs/api" "${pkgdir}/usr/share/doc/${pkgname}" + install -d "$pkgdir/usr/share/doc/$pkgname" + cp -r build/javadoc "$pkgdir/usr/share/doc/$pkgname" # Install Maven artifacts - export DESTDIR=${pkgdir} - jh mvn-install "org.apache.${_libname}" ${_libname} ${pkgver} \ - "${srcdir}/${_libname}-${pkgver}.pom" \ - "target/${_libname}-${pkgver}.jar" \ - "${_libname}.jar" + export DESTDIR=$pkgdir + jh mvn-install "org.apache.${_libname}" ${_libname} $pkgver \ + pom.xml "${_libname}.jar" "${_libname}.jar" ln -s "/usr/share/java/${_libname}.jar" \ - "${pkgdir}/usr/share/java/${_libname}-${pkgver}.jar" + "$pkgdir/usr/share/java/${_libname}-$pkgver.jar" } diff --git a/libre/java-bcel/java-bcel-iso_8859_1_encoding.patch b/libre/java-bcel/java-bcel-iso_8859_1_encoding.patch deleted file mode 100644 index 3f9e64884..000000000 --- a/libre/java-bcel/java-bcel-iso_8859_1_encoding.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bcel-5.2.orig/build.xml 2006-06-02 22:48:22.000000000 -0500 -+++ bcel-5.2/build.xml 2015-12-04 22:52:11.526978338 -0500 -@@ -100,7 +100,7 @@ - </property> - <property name="title" value="jakarta-bcel 5.2 API"> - </property> -- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.bcel.*"> -+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.bcel.*" encoding="ISO-8859-1"> - <classpath> - <path refid="build.classpath"> - </path> |