[arch-commits] Commit in jedit/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Saturday, October 24, 2015 @ 16:43:06
  Author: arodseth
Revision: 144895

upgpkg: jedit 5.3.0-1

Modified:
  jedit/trunk/PKGBUILD

----------+
 PKGBUILD |   37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-24 14:38:38 UTC (rev 144894)
+++ PKGBUILD	2015-10-24 14:43:06 UTC (rev 144895)
@@ -1,12 +1,14 @@
 # $Id$
-# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 # Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
 # Contributor: Jeff Mickey <j at codemac.net>
 # Contributor: Dusty Phillips <dusty at buchuki.com>
 
+# Does not currently build in a chroot.
+
 pkgname=jedit
-pkgver=5.2.0
+pkgver=5.3.0
 pkgrel=1
 pkgdesc='Text editor for programmers'
 arch=('any')
@@ -13,20 +15,20 @@
 url='http://www.jedit.org/'
 license=('GPL')
 depends=('java-runtime' 'desktop-file-utils')
-makedepends=('gendesk' 'unzip' 'tar')
+makedepends=('apache-ant' 'gendesk' 'unzip' 'tar')
 optdepends=('java-environment: for java development'
             'ttf-fira-mono: usable font')
 options=('!emptydirs')
 install=$pkgname.install
 noextract=("${pkgname}${pkgver}install.jar")
-source=("http://downloads.sourceforge.net/$pkgname/${pkgname}${pkgver}install.jar"
-        'jedit.sh'
+source=('jedit.sh'
         'jeditbg.sh'
-        'jedit.props')
-sha256sums=('78869461199947fd51f629fdf3863482e3c02d64fac2c0d96103dfc438d2924c'
-            'b2e5a8f2f4818b336b5d71f677114f1bc01e929d7fa60918675cc2234dae1a3a'
+        'jedit.props'
+        "http://sourceforge.net/projects/jedit/files/jedit/$pkgver/jedit${pkgver}source.tar.bz2")
+sha256sums=('b2e5a8f2f4818b336b5d71f677114f1bc01e929d7fa60918675cc2234dae1a3a'
             'a1dd1b688f08c5c967861fe80df13cac201afa6dcfcecc9a289b2c3bec7c8915'
-            '1a8c6e51810abc9ff56606b61042e2e980cb4b479fa0099b3c93acd7e4b9295b')
+            '1a8c6e51810abc9ff56606b61042e2e980cb4b479fa0099b3c93acd7e4b9295b'
+            '8d56d036be4dd45254748f063ade01293b862a615cdff6aed274ab58085f6304')
 
 prepare() {
   gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --exec 'jeditbg %U' \
@@ -33,15 +35,23 @@
     --name 'jEdit' --genericname 'Editor'
 
   # Extract the documentation so that it can be installed manually
-  unzip "${pkgname}${pkgver}install.jar"
-  tar jxf installer/jedit-api.tar.bz2
+  #unzip "${pkgname}${pkgver}install.jar"
+  #tar jxf installer/jedit-api.tar.bz2
 }
 
+build() {
+  cd jEdit
+
+  ant dist-java
+}
+
 package() {
   install -d "$pkgdir/usr/share/java/$pkgdir" \
     "$pkgdir/usr/bin" \
     "$pkgdir/usr/share/man/man1"
 
+  cd jEdit/dist
+
   # Run the installer
   (java -jar "${pkgname}${pkgver}install.jar" auto \
     "$pkgdir/usr/share/java/$pkgname/" \
@@ -48,6 +58,8 @@
     unix-script="$pkgdir/usr/bin/" \
     unix-man="$pkgdir/usr/share/man/man1/" 2>&1) > inst.log
 
+  cd "$srcdir"
+
   # Launchers, properties and desktop shortcuts
   install -Dm755 jedit.sh "$pkgdir/usr/bin/jedit"
   install -Dm755 jeditbg.sh "$pkgdir/usr/bin/jeditbg"
@@ -57,7 +69,8 @@
     "$pkgdir/usr/share/pixmaps/jedit.png"
 
   # The missing documentation files
-  cp -ru "$srcdir/doc" "$pkgdir/usr/share/java/jedit/doc"
+  cd jEdit
+  cp -ru doc "$pkgdir/usr/share/java/jedit/doc"
 }
 
 # vim:set ts=2 sw=2 et: