From 98ec339825e4adbf56553904a33c42286203cf8f Mon Sep 17 00:00:00 2001
From: Peter Marquardt <wwwutz@molgen.mpg.de>
Date: Thu, 30 Jan 2020 10:31:23 +0100
Subject: [PATCH 1/2] nsrp: update to 4.24

- be0ify
- fixed SRCURL
---
 nspr-4.12-0.bee | 94 -------------------------------------------------
 nspr.be0        | 40 +++++++++++++++++++++
 2 files changed, 40 insertions(+), 94 deletions(-)
 delete mode 100755 nspr-4.12-0.bee
 create mode 100755 nspr.be0

diff --git a/nspr-4.12-0.bee b/nspr-4.12-0.bee
deleted file mode 100755
index 9d49ff973..000000000
--- a/nspr-4.12-0.bee
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/env beesh
-
-## this file was created by bee init and should be executed to build a
-## bee-package. (Additional hints are located at the end of this file.)
-
-###############################################################################
-## The source URL(s) define the location of the sources that will be
-## downloaded. Version variables may be used to simplify reuse of this bee-file.
-
-SRCURL[0]="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PKGVERSION}/src/nspr-${PKGVERSION}.tar.gz"
-
-###############################################################################
-## Add URLs/pathes to patch files to the PATCHURL array.
-## The sources will be patched in the order of the array.
-
-# PATCHURL+=()
-
-###############################################################################
-## Add filename patterns to the EXCLUDE array of files that should not
-## be added to you package but may be present in the image directory.
-
-# EXCLUDE+=()
-
-###############################################################################
-## Uncomment the next statement, if the software may not be able to be build
-## outside the source directory and need to be build inside the source
-## directory.
-
-build_in_sourcedir
-
-###############################################################################
-## bee cannot detect buildtypes specified in subdirectories.
-## Sometimes packages "hide" the real sources in a subdirectory named
-## 'src' or 'cmake' or ..
-## use 'sourcesubdir_append' to specify this directory if known.
-
-# sourcesubdir_append src
-
-
-###############################################################################
-## Change the default (auto-detected) steps to
-## extract, patch, configure/setup, build and install the software.
-## Make sure the mee_install function does install everything to the
-## image directory "${D}"
-
-mee_extract() {
-    bee_extract "${@}"
-    cd $S/nspr
-}
-
-mee_patch() {
-    cd $S/nspr
-    bee_patch "${@}"
-    sed -ri 's#^(RELEASE_BINS =).*#\1#' pr/src/misc/Makefile.in
-    sed -i 's#$(LIBRARY) ##' config/rules.mk
-}
-
-mee_configure() {
-    cd $S/nspr
-    ./configure --prefix=/usr \
-            --with-mozilla \
-            --with-pthreads \
-            --enable-64bit
-}
-
-mee_build() {
-    cd $S/nspr
-    make
-}
-
-mee_install() {
-    cd $S/nspr
-    make install DESTDIR=$D
-}
-
-## by default this may be 'make install DESTDIR="${D}"'
-
-###############################################################################
-##
-## Additional hints:
-##
-## The name of this bee-file should follow the following naming convention:
-##     pkgname-pkgversion-pkgrevision.bee
-##
-## You may remove all comments as long as SRCURL[0] is set.
-##
-## Everything in this file will be executed in a bash environment.
-##
-## Build the package by executing
-##     './pkg-version-N.bee' or
-##     'beesh ./pkg-version-N.bee'
-##
-## see http://beezinga.org/
-##
diff --git a/nspr.be0 b/nspr.be0
new file mode 100755
index 000000000..77a749504
--- /dev/null
+++ b/nspr.be0
@@ -0,0 +1,40 @@
+#!/usr/bin/env beesh
+
+# BEE_VERSION nspr-4.24-0
+
+# more info: https://foo.bar.com
+
+#SRCURL[0]="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PKGVERSION}/src/nspr-${PKGVERSION}.tar.gz"
+
+SRCURL[0]="https://beehive.molgen.mpg.de/d630c2111e1db6d2ec2069aad22b4121/nspr-4.24.tar.gz"
+
+# PATCHURL+=()
+
+build_in_sourcedir
+
+sourcesubdir_append nspr
+
+#mee_extract() {
+#    bee_extract "${@}"
+#}
+
+mee_patch() {
+    bee_patch "${@}"
+    sed -ri 's#^(RELEASE_BINS =).*#\1#' pr/src/misc/Makefile.in
+    sed -i 's#$(LIBRARY) ##'            config/rules.mk
+}
+
+mee_configure() {
+    bee_configure \
+        --with-mozilla \
+        --with-pthreads \
+        --enable-64bit
+}
+
+#mee_build() {
+#    bee_build
+#}
+
+#mee_install() {
+#    bee_install
+#}

From 755a0d37b22e2164c83bae6c22c3003c231cfb0f Mon Sep 17 00:00:00 2001
From: Peter Marquardt <wwwutz@molgen.mpg.de>
Date: Thu, 30 Jan 2020 11:37:13 +0100
Subject: [PATCH 2/2] nspr: update to 4.24

- using bee_configure ends up in cutting /nspr/ folder
- nss-3.49 depends on nspr-4.24
---
 nspr.be0 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nspr.be0 b/nspr.be0
index 77a749504..ab4021f73 100755
--- a/nspr.be0
+++ b/nspr.be0
@@ -4,7 +4,7 @@
 
 # more info: https://foo.bar.com
 
-#SRCURL[0]="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PKGVERSION}/src/nspr-${PKGVERSION}.tar.gz"
+# SRCURL[0]="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PKGVERSION}/src/nspr-${PKGVERSION}.tar.gz"
 
 SRCURL[0]="https://beehive.molgen.mpg.de/d630c2111e1db6d2ec2069aad22b4121/nspr-4.24.tar.gz"
 
@@ -25,7 +25,8 @@ mee_patch() {
 }
 
 mee_configure() {
-    bee_configure \
+    ./configure \
+        --prefix=/usr \
         --with-mozilla \
         --with-pthreads \
         --enable-64bit