From d1d93fafb9ef98fdd0c9a5a486c179c03cbbfb33 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 23 Apr 2013 01:16:16 -0700
Subject: Tue Apr 23 01:16:16 PDT 2013

---
 extra/js/PKGBUILD            | 48 ++++++++++++++++++++------------------------
 extra/js/js185-destdir.patch | 15 --------------
 2 files changed, 22 insertions(+), 41 deletions(-)
 delete mode 100644 extra/js/js185-destdir.patch

(limited to 'extra/js')

diff --git a/extra/js/PKGBUILD b/extra/js/PKGBUILD
index 71d3ac492..7671edddf 100644
--- a/extra/js/PKGBUILD
+++ b/extra/js/PKGBUILD
@@ -1,39 +1,35 @@
-# $Id: PKGBUILD 132237 2011-07-21 21:43:04Z ibiru $
+# $Id: PKGBUILD 183424 2013-04-21 22:11:07Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
+
 pkgname=js
-pkgver=1.8.5
-pkgrel=3
+pkgver=17.0.0
+pkgrel=1
 pkgdesc="JavaScript interpreter and libraries"
 arch=(i686 x86_64)
-url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5"
-license=('GPL2')
-depends=('nspr' 'gcc-libs')
-makedepends=('python2' 'zip')
-replaces=('spidermonkey')
-conflicts=('spidermonkey')
-source=(http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
-        js185-destdir.patch)
-md5sums=('a4574365938222adca0a6bd33329cb32'
-         '364834a8391888642c53d78c3a949d94')
-build() {
-  cd "$srcdir/$pkgname-$pkgver/js/src"
-
-  patch -Np0 -i $srcdir/js185-destdir.patch
-
-  ./configure --prefix=/usr --with-system-nspr \
-     --enable-threadsafe
+url="https://developer.mozilla.org/En/SpiderMonkey/17"
+license=(MPL)
+depends=(nspr gcc-libs libffi readline)
+makedepends=(python2 zip)
+options=(!staticlibs)
+source=(http://ftp.mozilla.org/pub/mozilla.org/js/mozjs$pkgver.tar.gz)
+md5sums=('20b6f8f1140ef6e47daa3b16965c9202')
 
+build() {
+  cd mozjs$pkgver/js/src
+  ./configure --prefix=/usr --with-system-nspr --with-system-ffi \
+     --enable-readline --enable-threadsafe
   make
 }
 
+check() {
+  cd mozjs$pkgver/js/src
+  make check
+}
+
 package() {
-  cd "$srcdir/$pkgname-$pkgver/js/src"
+  cd mozjs$pkgver/js/src
   make DESTDIR="$pkgdir" install
-
-  install -m 0755 shell/js ${pkgdir}/usr/bin
-
-  #cleanup
-  rm -f "${pkgdir}/usr/lib/libmozjs185-1.0.a"
+  find "$pkgdir"/usr/{lib/pkgconfig,include} -type f -exec chmod -x {} +
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/js/js185-destdir.patch b/extra/js/js185-destdir.patch
deleted file mode 100644
index 87b7b53b3..000000000
--- a/extra/js/js185-destdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-#https://bugzilla.mozilla.org/show_bug.cgi?id=628723
-
---- Makefile.in.old	2011-04-10 04:21:19.918608008 -0700
-+++ Makefile.in	2011-04-10 04:21:58.088607992 -0700
-@@ -888,8 +888,8 @@
- ifeq (,$(HOST_BIN_SUFFIX))
- 	mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
- 	@[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER)
--	ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
--	ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
-+	ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER)
-+	ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER)
- endif
- endif
- ifneq (,$(IMPORT_LIBRARY))
-- 
cgit v1.2.3-54-g00ecf