fix/update (959)

2 files changed, 16 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e159fc477efc..e61e65d0c45b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = netbeans-incubator
 	pkgdesc = IDE for Java, HTML5, PHP, Groovy, C and C++ (incubator/nightly version)
-	pkgver = 20180605
+	pkgver = 20190105
 	pkgrel = 1
 	url = http://netbeans.apache.org
 	install = netbeans.install
@@ -11,15 +11,12 @@ pkgbase = netbeans-incubator
 	makedepends = curl
 	depends = java-environment>=9
 	depends = ttf-font
-	depends = libxtst
-	depends = giflib
-	depends = atk
 	optdepends = php: for developing programs in php
 	optdepends = groovy: for developing programs in groovy
 	optdepends = lib32-glibc
 	provides = netbeans
 	options = !strip
-	backup = usr/share/netbeans-incubator/etc/netbeans.conf
+	backup = usr/lib/netbeans-incubator/etc/netbeans.conf
 	source = netbeans-nightly.png
 	sha512sums = 5ce471647913dd0686511724d9b6045f44e9ae06938a8b6f8478bfd7c261c17fea4fa2b692a8c2d6b766503f00aff9c4b8f9e6c26d3b697b8f9a2361a66d9409
 
diff --git a/PKGBUILD b/PKGBUILD
index 19b008c9067b..d53546363d1f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,20 @@
-# Maintainer: Pavol Hluchy (Lopo) <lopo at losys dot eu>
+# Maintainer: Pavol Hluchy (Lopo) <lopo AT losys DOT eu>
 
 pkgname=netbeans-incubator
-pkgver=20180605
+pkgver=20190105
 pkgrel=1
 pkgdesc='IDE for Java, HTML5, PHP, Groovy, C and C++ (incubator/nightly version)'
 license=('Apache')
 arch=('any')
 url="http://netbeans.apache.org"
-depends=('java-environment>=9' 'ttf-font' 'libxtst' 'giflib' 'atk')
+depends=('java-environment>=9' 'ttf-font')
 makedepends=('gendesk' 'setconf' 'curl')
 optdepends=('php: for developing programs in php'
-			'groovy: for developing programs in groovy'
-			'lib32-glibc')
+	'groovy: for developing programs in groovy'
+	'lib32-glibc'
+	)
 provides=('netbeans')
-backup=("usr/share/$pkgname/etc/netbeans.conf")
+backup=("usr/lib/$pkgname/etc/netbeans.conf")
 install="netbeans.install"
 options=(!strip)
 source=('netbeans-nightly.png')
@@ -26,8 +27,8 @@ prepare() {
 	rm -f webindex
 	curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o webindex "${_webroot}/lastStableBuild/artifact/nbbuild/"
 
-	_file=`grep -e '-basic.zip' webindex \
-		| awk  'BEGIN{FPAT="NetBeans-dev-incubator-netbeans-linux-[[:digit:]]+-on-[[:digit:]]+-basic.zip";} {print $1}'`
+	_file=`grep -e '-release.zip' webindex \
+		| awk  'BEGIN{FPAT="NetBeans-dev-incubator-netbeans-linux-[[:digit:]]+-on-[[:digit:]]+-release.zip";} {print $1}'`
 	download_file "${_webroot}/lastStableBuild/artifact/nbbuild/${_file}"
 
 	cd "$srcdir"
@@ -40,23 +41,24 @@ build() {
 	rm $(find -name '*\.exe' -or -name '*\.bat' -or -name '*\.dll')
 	rm -r $(find -name 'MacOSX*' -or -name 'Windows*' -or -name 'SunOS*' -or -name 'FreeBSD*')
 	rm -r $(find -name 'hpux*' -or -name 'mac*' -or -name 'solaris*' -or -name 'windows*')
+	rm -r $(find -name '*-sparc_64' -or -name 'linux-arm*')
 
 	gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" \
 		--custom "StartupWMClass=NetBeans IDE Dev"
-	setconf "netbeans/bin/netbeans" basedir "/usr/share/$pkgname"
+	setconf "netbeans/bin/netbeans" basedir "/usr/lib/$pkgname"
 }
 
 package() {
-	mkdir -p "$pkgdir"/usr/{bin,share/applications}
+	mkdir -p "$pkgdir"/usr/{bin,lib}
 
 	# Resources
-	cp -r netbeans "$pkgdir/usr/share/$pkgname"
+	cp -r netbeans "$pkgdir/usr/lib/$pkgname"
 
 	# Desktop shortcut and icon
 	install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
 	install -Dm644 netbeans-nightly.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
 
-	ln -fs "/usr/share/$pkgname/bin/netbeans" "$pkgdir/usr/bin/$pkgname"
+	ln -fs "/usr/lib/$pkgname/bin/netbeans" "$pkgdir/usr/bin/$pkgname"
 }
 
 # vim:set ts=4 sw=4 ai: