sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (9d5c938bcceac89196a294a936029568fa847067)
- From: Florian Franzmann <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (9d5c938bcceac89196a294a936029568fa847067)
- Date: Sat, 5 Oct 2019 16:29:35 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:
archive/unshield/BUILD | 2
archive/unshield/CONFIGURE | 1
archive/unshield/DEPENDS | 2
archive/unshield/DETAILS | 1
archive/unshield/HISTORY | 3
cluster/lapack/BUILD | 2
cluster/lapack/CONFIGURE | 1
cluster/lapack/DEPENDS | 5
cluster/lapack/DETAILS | 1
cluster/lapack/HISTORY | 3
cluster/metis/BUILD | 4
cluster/metis/CONFIGURE | 1
cluster/metis/DEPENDS | 2
cluster/metis/DETAILS | 1
cluster/metis/HISTORY | 3
crypto/encfs/BUILD | 2
crypto/encfs/CONFIGURE | 1
crypto/encfs/DEPENDS | 2
crypto/encfs/DETAILS | 1
crypto/encfs/HISTORY | 3
crypto/keepassxc/CONFIGURE | 1
crypto/keepassxc/DEPENDS | 2
crypto/keepassxc/DETAILS | 1
crypto/keepassxc/HISTORY | 3
crypto/nss/DETAILS | 114 --
crypto/nss/HISTORY | 13
crypto/nss/PREPARE | 4
crypto/nss/PRE_BUILD | 7
crypto/nss/nss-3.14-config-1.patch | 271
------
crypto/nss/nss-3.14.3_sync_with_upstream_softokn_changes.patch | 407
----------
crypto/nss/nss-3.15.1-standalone-2.patch | 241
-----
crypto/nss/nss-3.21-standalone-1.patch | 248
------
crypto/nss/nss-3.28.1-standalone-1.patch | 246
------
devel/cppcheck/CONFIGURE | 1
devel/cppcheck/DEPENDS | 2
devel/cppcheck/HISTORY | 3
devel/rapidcheck/BUILD | 1
devel/rapidcheck/CONFIGURE | 1
devel/rapidcheck/DEPENDS | 4
devel/rapidcheck/DETAILS | 1
devel/rapidcheck/HISTORY | 3
devel/rr/0001-fix-compile-errors.patch | 39
devel/rr/BUILD | 2
devel/rr/CONFIGURE | 1
devel/rr/DEPENDS | 2
devel/rr/DETAILS | 1
devel/rr/HISTORY | 4
devel/rr/PRE_BUILD | 3
devel/uncrustify/BUILD | 1
devel/uncrustify/CONFIGURE | 1
devel/uncrustify/DEPENDS | 4
devel/uncrustify/DETAILS | 1
devel/uncrustify/HISTORY | 3
disk/efibootmgr/BUILD | 1
disk/efibootmgr/HISTORY | 3
disk/efibootmgr/PRE_BUILD | 5
disk/efivar/BUILD | 3
disk/efivar/HISTORY | 3
disk/efivar/PRE_BUILD | 6
graphics/darktable/CONFIGURE | 1
graphics/darktable/DEPENDS | 2
graphics/darktable/DETAILS | 1
graphics/darktable/HISTORY | 3
graphics/lensfun/BUILD | 1
graphics/lensfun/CONFIGURE | 1
graphics/lensfun/DEPENDS | 2
graphics/lensfun/DETAILS | 1
graphics/lensfun/HISTORY | 3
graphics/openexr/BUILD | 2
graphics/openexr/CONFIGURE | 1
graphics/openexr/DEPENDS | 2
graphics/openexr/DETAILS | 1
graphics/openexr/HISTORY | 3
graphics/rawtherapee/BUILD | 2
graphics/rawtherapee/CONFIGURE | 1
graphics/rawtherapee/DEPENDS | 2
graphics/rawtherapee/DETAILS | 1
http/firefox-esr/DEPENDS | 4
http/firefox-esr/HISTORY | 3
kernels/linux/HISTORY | 4
kernels/linux/info/patches/maintenance_patches_4/patch-4.19.77 | 5
kernels/linux/latest.defaults | 2
libs/assimp/BUILD | 1
libs/assimp/CONFIGURE | 1
libs/assimp/DEPENDS | 2
libs/assimp/DETAILS | 1
libs/assimp/HISTORY | 3
libs/capnproto/BUILD | 1
libs/capnproto/CONFIGURE | 1
libs/capnproto/DEPENDS | 4
libs/capnproto/DETAILS | 1
libs/capnproto/HISTORY | 3
libs/gflags/BUILD | 2
libs/gflags/CONFIGURE | 1
libs/gflags/DEPENDS | 4
libs/gflags/DETAILS | 1
libs/gflags/HISTORY | 3
libs/libical/BUILD | 2
libs/libical/CONFIGURE | 1
libs/libical/DEPENDS | 2
libs/libical/DETAILS | 1
libs/libical/HISTORY | 3
libs/libiio/BUILD | 1
libs/libiio/CONFIGURE | 1
libs/libiio/DEPENDS | 2
libs/libiio/DETAILS | 1
libs/libiio/HISTORY | 3
libs/libxlsxwriter/BUILD | 1
libs/libxlsxwriter/CONFIGURE | 1
libs/libxlsxwriter/DEPENDS | 4
libs/libxlsxwriter/DETAILS | 1
libs/libxlsxwriter/HISTORY | 3
libs/openscenegraph/BUILD | 2
libs/openscenegraph/CONFIGURE | 1
libs/openscenegraph/DEPENDS | 2
libs/openscenegraph/DETAILS | 1
libs/openscenegraph/HISTORY | 3
libs/openscenegraph/INSTALL | 3
libs/tinyxml/BUILD | 1
libs/tinyxml/CONFIGURE | 1
libs/tinyxml/DEPENDS | 2
libs/tinyxml/DETAILS | 1
libs/tinyxml/HISTORY | 3
libs/utf8proc/BUILD | 1
libs/utf8proc/CONFIGURE | 1
libs/utf8proc/DEPENDS | 2
libs/utf8proc/DETAILS | 1
libs/utf8proc/HISTORY | 3
net/libproxy/BUILD | 3
net/libproxy/CONFIGURE | 1
net/libproxy/DEPENDS | 2
net/libproxy/DETAILS | 1
net/libproxy/HISTORY | 3
science/codec2/BUILD | 1
science/codec2/CONFIGURE | 1
science/codec2/DEPENDS | 2
science/codec2/DETAILS | 1
science/codec2/HISTORY | 3
science/gnuradio/CONFIGURE | 1
science/gnuradio/DEPENDS | 2
science/gnuradio/DETAILS | 1
science/gnuradio/HISTORY | 3
science/hackrf/CONFIGURE | 1
science/hackrf/DEPENDS | 2
science/hackrf/DETAILS | 1
science/hackrf/HISTORY | 3
science/openscad/DEPENDS | 1
science/openscad/HISTORY | 3
science/qmapshack/0001-fix-incompatibility-with-recent-proj.patch | 24
science/qmapshack/CONFIGURE | 1
science/qmapshack/DEPENDS | 2
science/qmapshack/DETAILS | 1
science/qmapshack/HISTORY | 4
science/qmapshack/PRE_BUILD | 4
science/units/BUILD | 2
science/units/DEPENDS | 3
science/units/HISTORY | 5
science/units/PRE_BUILD | 5
science/wxmaxima/BUILD | 1
science/wxmaxima/CONFIGURE | 1
science/wxmaxima/DEPENDS | 2
science/wxmaxima/DETAILS | 1
science/wxmaxima/HISTORY | 3
security/wireshark/CONFIGURE | 2
security/wireshark/DEPENDS | 2
security/wireshark/DETAILS | 1
security/wireshark/HISTORY | 3
167 files changed, 329 insertions(+), 1604 deletions(-)
New commits:
commit 9d5c938bcceac89196a294a936029568fa847067
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
security/wireshark: use CMAKE_*
commit fb56f84212e5156e3f81cebad27ef6767ac508e8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/wxmaxima: use CMAKE_*
commit 3bca0139bdeeee977a6ea69dd6a67da0cd4d7993
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/qmapshack: fix build error
commit 70d14a716203039ba1a89ad0ea85d4084bbaa93a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/qmapshack: use CMAKE_*
commit 882e3d01f5b7d9a119707a560e337f06989dc18d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
disk/efibootmgr: fix build error
commit 6d20ff5a4aafab71a7fff34bf742b03e12405527
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
disk/efivar: fix build error
commit 508a4d8f7fafbac616513d65fa64833c9c5d99ff
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/openscad: remove bogus dependency on cmake
commit cb478a56944d698ad18906ad84f5db3390f7c46d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/hackrf: use CMAKE_*
commit 27bd80c3e981bb0ff8e8a82186cad462bf59e172
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/gnuradio: use CMAKE_*
commit 2e403eeb031ecff9826f2f00a4fa51deba981c8c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/codec2: use CMAKE_*
commit 68d1f3dd55ace4efd3c7a05b8d8cbbe55d9615e3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
net/libproxy: use CMAKE_*
commit b19aeeacd05926d436d7bcfb5ccd9cdbcc416182
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/utf8proc: use CMAKE_*
commit 351d5c44ab3916013148e0cb9f8dcdabad257147
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/tinyxml: use CMAKE_*
commit 694549bcedc4520e39e864a854692726537e07cf
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/openscenegraph: use CMAKE_*
commit c75d725d19aafed29d39b056d0afbc4e4f0bb55e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/libxlsxwriter: use CMAKE_*
commit 0832c01f004448c99da3e87ccc99186546c087e1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/libiio: use CMAKE_*
commit c54ebaee38bf11cc504b8aa196384d86d8c1908a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/libcal: use CMAKE_*
commit 19c21dbdf4db418f1ca4a64c7be71df89c977d22
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/gflags: use CMAKE_*
commit 18b6f7f42b9c17d5bbca2887bb66eeed621f72ce
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/capnproto: use CMAKE_*
commit 832b93ec6760b9ad4ffba5f265491ecad04b9541
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/assimp: use CMAKE_*
commit 4a928a23fe01d5fa49d41ddb872e6cec790515b9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics/rawtherapee: use CMAKE_*
commit f9354e88d624ba12224c5d52fa3495dd81b1af1a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics/openexr: use CMAKE_*
commit 815c6c78d7e0fcff200330be83c87d32c6634859
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics/lensfun: use CMAKE_*
commit a496abd971aab7e89b28c6e44386e6f5236e16e9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
devel/uncrustify: use CMAKE_*
commit 3aa3901beb2529fa824574e96e6b88d53c0ea9fe
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
devel/rr: use CMAKE_*
commit 22a7acb67539b1ce3856abe9caa2fa21e5f3b565
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
devel/rr: fix compile error
commit 6e8cd6faeea610f8943b03fa3d4a4013370feca0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
devel/rapidcheck: use CMAKE_*
commit 8583c2e0d75cd8d5b8cb440224e791b6b74fc191
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
devel/cppcheck: use CMAKE_*
commit e24f0f1993b9886a1d4f6f1ba49ddb46b42bb8d4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
crypto/keepassxc: use CMAKE_*
commit 5f43a77f2bde6f1a1dc59c37d5ab324f08faf849
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
crypto/encfs: use CMAKE_*
commit abd8ecfc1868f815914f6a0198a8d98e37bd1fc8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
cluster/metis: use CMAKE_*
commit 5a190614fce877668e7baab26e49515dd74ee3d2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
cluster/lapack: use CMAKE_*
commit 71e6fc39d47331d8f267420f741448b06cf54c31
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
archive/unshield: use CMAKE_*
commit 687cefd7b7dba9a86bb950c71a55a3915328ed60
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
graphics/darktable: use CMAKE_*
commit 90ca4d71402f44f598d3c81055c1aeccff334053
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
http/firefox-esr: depend on nss 3.45
commit ff38be1cf2abc1a3ac8b4c2e7f881b68e3626355
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
kernels/linux: version 4.19.77
commit 6d0d40b7e9e0766856d5c5c3191d15ded80271f0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
crypto/nss: remove obsolete versions
commit de5c1f73374c46da56036202bd328760bafd4a9c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/units: fix installation path of currency.units
diff --git a/archive/unshield/BUILD b/archive/unshield/BUILD
index df8fe19..aa9d4fe 100755
--- a/archive/unshield/BUILD
+++ b/archive/unshield/BUILD
@@ -5,4 +5,4 @@ do
CFLAGS="${CFLAGS/$flag}"
done &&
-CFLAGS="$CFLAGS -D_DEFAULT_SOURCE" cmake_build
+CFLAGS="$CFLAGS -D_DEFAULT_SOURCE" default_build
diff --git a/archive/unshield/CONFIGURE b/archive/unshield/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/archive/unshield/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/archive/unshield/DEPENDS b/archive/unshield/DEPENDS
index 4748cd7..228af13 100755
--- a/archive/unshield/DEPENDS
+++ b/archive/unshield/DEPENDS
@@ -1,2 +1,2 @@
-depends cmake &&
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends zlib
diff --git a/archive/unshield/DETAILS b/archive/unshield/DETAILS
index 3c26fbf..4da3168 100755
--- a/archive/unshield/DETAILS
+++ b/archive/unshield/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=unshield
VERSION=1.4.3
SOURCE=${SPELL}-${VERSION}.tar.gz
diff --git a/archive/unshield/HISTORY b/archive/unshield/HISTORY
index 6a02d33..b7d0055 100644
--- a/archive/unshield/HISTORY
+++ b/archive/unshield/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2019-05-21 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Added missing dependency on cmake
diff --git a/cluster/lapack/BUILD b/cluster/lapack/BUILD
index 43310a3..de27eef 100755
--- a/cluster/lapack/BUILD
+++ b/cluster/lapack/BUILD
@@ -1,2 +1,4 @@
OPTS+="-DBUILD_DEPRECATED=on -DBUILD_SHARED_LIBS=on -DLAPACKE=on
-DLAPACKE_WITH_TMG=on" &&
+CMAKE_GEN='Unix Makefiles' &&
+
cmake_build
diff --git a/cluster/lapack/CONFIGURE b/cluster/lapack/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/cluster/lapack/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/cluster/lapack/DEPENDS b/cluster/lapack/DEPENDS
index 74fa454..cee3a01 100755
--- a/cluster/lapack/DEPENDS
+++ b/cluster/lapack/DEPENDS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
+
depends -sub FORTRAN gcc &&
-depends python &&
-depends cmake
+depends python
diff --git a/cluster/lapack/DETAILS b/cluster/lapack/DETAILS
index 8821327..1ad496c 100755
--- a/cluster/lapack/DETAILS
+++ b/cluster/lapack/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=lapack
VERSION=3.8.0
VERSIONMAN=3.8.0
diff --git a/cluster/lapack/HISTORY b/cluster/lapack/HISTORY
index e1fbb79..1568142 100644
--- a/cluster/lapack/HISTORY
+++ b/cluster/lapack/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2019-01-10 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: include deprecated functions (needed by octave control
package)
* DETAILS: PATCHLEVEL++
diff --git a/cluster/metis/BUILD b/cluster/metis/BUILD
index 17bb6c5..a231cfb 100755
--- a/cluster/metis/BUILD
+++ b/cluster/metis/BUILD
@@ -1,2 +1,2 @@
-make config prefix=${INSTALL_ROOT}/usr &&
-make
+OPTS=" -DGKLIB_PATH=$SOURCE_DIRECTORY/GKlib" &&
+cmake_build
diff --git a/cluster/metis/CONFIGURE b/cluster/metis/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/cluster/metis/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/cluster/metis/DEPENDS b/cluster/metis/DEPENDS
index 60dd614..6d7d390 100755
--- a/cluster/metis/DEPENDS
+++ b/cluster/metis/DEPENDS
@@ -1 +1 @@
-depends cmake
+source $GRIMOIRE/CMAKE_DEPENDS
diff --git a/cluster/metis/DETAILS b/cluster/metis/DETAILS
index 4f5f87f..f97855c 100755
--- a/cluster/metis/DETAILS
+++ b/cluster/metis/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=metis
VERSION=5.1.0
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/cluster/metis/HISTORY b/cluster/metis/HISTORY
index 018481a..8d14693 100644
--- a/cluster/metis/HISTORY
+++ b/cluster/metis/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2018-01-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.1.0
diff --git a/crypto/encfs/BUILD b/crypto/encfs/BUILD
index 6510859..d5e9246 100755
--- a/crypto/encfs/BUILD
+++ b/crypto/encfs/BUILD
@@ -1,2 +1,2 @@
OPTS+=' -DBUILD_SHARED_LIBS=0 -DINSTALL_LIBENCFS=1' &&
-cmake_build
+default_build
diff --git a/crypto/encfs/CONFIGURE b/crypto/encfs/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/crypto/encfs/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/crypto/encfs/DEPENDS b/crypto/encfs/DEPENDS
index df9915e..78db003 100755
--- a/crypto/encfs/DEPENDS
+++ b/crypto/encfs/DEPENDS
@@ -1,4 +1,4 @@
-depends cmake &&
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends fuse &&
depends SSL &&
depends SYSTEM-LOGGER &&
diff --git a/crypto/encfs/DETAILS b/crypto/encfs/DETAILS
index 4d1a161..ce92c08 100755
--- a/crypto/encfs/DETAILS
+++ b/crypto/encfs/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=encfs
VERSION=1.9.5
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/crypto/encfs/HISTORY b/crypto/encfs/HISTORY
index 17d7b12..baa58d1 100644
--- a/crypto/encfs/HISTORY
+++ b/crypto/encfs/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2019-05-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* TRIGGERS: on cast gettext check self
diff --git a/crypto/keepassxc/CONFIGURE b/crypto/keepassxc/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/crypto/keepassxc/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/crypto/keepassxc/DEPENDS b/crypto/keepassxc/DEPENDS
index fa45408..d3c7a29 100755
--- a/crypto/keepassxc/DEPENDS
+++ b/crypto/keepassxc/DEPENDS
@@ -1,5 +1,5 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends -sub CXX gcc &&
-depends cmake &&
depends libargon2 &&
depends libgcrypt &&
depends patchelf &&
diff --git a/crypto/keepassxc/DETAILS b/crypto/keepassxc/DETAILS
index 2268f6c..d0eb19f 100755
--- a/crypto/keepassxc/DETAILS
+++ b/crypto/keepassxc/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=keepassxc
VERSION=2.4.3
SOURCE="${SPELL}-${VERSION}.tar.gz"
diff --git a/crypto/keepassxc/HISTORY b/crypto/keepassxc/HISTORY
index cfe1847..a1b3aba 100644
--- a/crypto/keepassxc/HISTORY
+++ b/crypto/keepassxc/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2019-06-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.4.3
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 4dd65d9..8c629b3 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -1,128 +1,14 @@
SPELL=nss
case $NSS_BRANCH in
- 3.14)
- VERSION=3.14.5
-
SOURCE_HASH=sha512:ef35939d6b4627df0e562da7b0f1bb599c8f7cf09f7baa9fc059ddd725a91a4d34204a22e05e3aa9b2a609c085834f611f9e6ff2dde69e16e9cd7e7c74a86ddf
- ;;
- 3.15)
- VERSION=3.15.5
-
SOURCE_HASH=sha512:4db27ea98f17f1a5bc6f513455497945fc35957f573b3ac7e730b166fbe0e8fd741c188187c578faf361d969db63d83ff8ccf15ac2b8ca72a367f33a018695ca
- SECURITY_PATCH=4
- ;;
- 3.16)
- VERSION=3.16.6
-
SOURCE_HASH=sha512:c629d4810b23db5af4818573dc3b10ca3f99072aa679f1df930cbd16ebcc529e9fd77ccf1aeabc821cd8f8cd3e452e06ace8ef10ade173ae91a0c91134bc281e
- SECURITY_PATCH=6
- ;;
3.17)
VERSION=3.17.4
SOURCE_HASH=sha512:dfc44e28c303743a72b4553f471089bc991c3cb61d5f3071082c16400d5e4f216f84a2e44536570316fe0e798c14ca370c875dad791a873034595b9e4dd70b89
SECURITY_PATCH=2
;;
- 3.18)
- VERSION=3.18.1
-
SOURCE_HASH=sha512:00c2893b5aa74038661f7353ebc8200746de1757cec61072717a89ec10292040a1dd954aaf688fbcf68261031ec30e85e6fe9ab46283e202e8b62b06e05fa616
- ;;
- 3.19)
- VERSION=3.19.4
-
SOURCE_HASH=sha512:1876d908b52403776bcdb42a1a3e67582aa71af9182ed78cbb8d1907b4c620b7e0fafa0ea95106d527212d253903e2ef77f31e5c76adf376db1bb05c10d6384c
- ;;
3.20)
VERSION=3.20.2
SOURCE_HASH=sha512:030cd019a43f326b06d5524390c166a1a6be52a3f5f05e2e4a651677d6031659cbfca6ddb5d492ba95e816672ac289a4d09da14fd54131aad6967496f471a7e7
;;
- 3.21)
- VERSION=3.21.1
-
SOURCE_HASH=sha512:7a9354148f1c2ce47ab8e43c7db16e0cf755e5e3a8b4db53e846c65e4f7b7373e6340cf2a1f18ca3f49ff582fb7b35620800fa68fa4170cf4b83ce241f55f59e
- ;;
- 3.22)
- VERSION=3.22.3
-
SOURCE_HASH=sha512:eaffe0061f2d99d8cd69db267acfad443ce2123862d612b26d3b641c982b6e80b18d4e9e6c97d4115f030040390fff7579af35c73f225c278b84c17e3ac1853d
- ;;
- 3.23)
- VERSION=3.23
-
SOURCE_HASH=sha512:f3e388a415493685faa6df932e9e968af41ea2e8e4cba3fbd539c60177443e4042e8d2e2bfe74183552e14522d49048be2f80fbe038bdbd499971e82abf2cc32
- ;;
- 3.24)
- VERSION=3.24
-
SOURCE_HASH=sha512:9cf6d5dcbe8292bce53e043cf2713e55f01f979827c6f5f39a22ea8d1f40a2579728454a12c30540e8fb06e8119640a539cc5c6913aa12d97008d68386abfe6e
- ;;
- 3.25)
- VERSION=3.25
-
SOURCE_HASH=sha512:a33cff42d0d85eea091057648d598b7421de88f16ed357965ea08a8812de968c3f18d45452afd21afc90122f65c2c5bb2d7071357947b45e935aae55d28c4218
- ;;
- 3.26)
- VERSION=3.26.2
-
SOURCE_HASH=sha512:807ea78c00b57676fd119881487c8d87b1fe449805bd3319559db5e00c5f32023215652d3592e96df677cf73c1abdcd7541a9e168d75f456685f09e870d4eaff
- ;;
- 3.27)
- VERSION=3.27.1
-
SOURCE_HASH=sha512:b52bc18e42cab78a325a8c4fcf2894ca879cecbb657a852baf460551ed9727f145bc328ebb61a43a1605b457f923a1495707ac4aee27be70220463818ed8db8d
- ;;
- 3.28)
- VERSION=3.28.3
-
SOURCE_HASH=sha512:77602600c8d1e1b432a3c6be804ad80b2f8c2d521baf8bbe123eee6ded24d2344b4941b883e42145cd1d4d9f93062a63c18747215fb7e226e2a2489a9edaa678
- ;;
- 3.29)
- VERSION=3.29.5
-
SOURCE_HASH=sha512:ce18bc7e793d2b3698db412b2e5fcabbfd9862eca3def120d5e44bc67276526bff6b33ffa84b8128f8af6d35101000e6f7bb24194f63a55461b3c245fac11faa
- ;;
- 3.30)
- VERSION=3.30.2
-
SOURCE_HASH=sha512:02f14bc000cbde42268c4b6f42df80680b010d1491643ef9b11e0bac31a286a2e7fa251c40cb4ac70b64883a1b90efc64440ef9d797357f8a47cd37195fc5500
- ;;
- 3.32)
- VERSION=3.32.1
-
SOURCE_HASH=sha512:b377aba822c2955d801022eba1636b71943a64f6e74d5611c2625910d230059383c4dbdedd65e70b356eaea33aeefdd24de3b31d7a4823d921ea475af3dd9da8
- ;;
- 3.33)
- VERSION=3.33
-
SOURCE_HASH=sha512:82adc0b73805ba5e73b9bf350fffa383a8b4396c05f49edb360a53319b4ad26d928a135bee245f9da009d162129db4441a96ef05346dadac20922b21284468b0
- ;;
- 3.34)
- VERSION=3.34.1
-
SOURCE_HASH=sha512:6cc4826df4202e865e903a2ed05b49f708a047347b7b4d58f9b83ed097115a128239c4596a033ddeb9ee3fbfe6345a024e11eacb6149bce2d71fbe82c0a41c63
- ;;
- 3.35)
- VERSION=3.35
-
SOURCE_HASH=sha512:8d466f4602427d278b6aa28af0e6bdb99326fc40c94ac6d517d1cbe7ce6b9332dadba52ea092762fac2fd6e72f17cb880cf81e1cf86bf6b4f7913a755419626d
- ;;
- 3.36)
- VERSION=3.36.4
-
SOURCE_HASH=sha512:6c9df320ee6b2f12cafa06e99f768d9897686c5802870443dcecf998bdd763964d5ea845ea56a4014fac6d0bdc117fbaf9085b9fa41e21b647750d3e9698a3ef
- ;;
- 3.37)
- VERSION=3.37.3
-
SOURCE_HASH=sha512:11b21818f9fcff11d0e7f4c066ae9fbce0052a30a6b30df9a20022792039b5348554834a472e1b1195e467b9902067f9719678d5ca32efb4e60f1df161feed6f
- ;;
- 3.38)
- VERSION=3.38
-
SOURCE_HASH=sha512:06804163daa08f1f65cfe0e9546ddf066ec7f773aa615431a5952f6c04956dd62425fec38d11037ff7fb02b709de03e5a7637c6ba13de5b7686db4f9ecda52ab
- ;;
- 3.39)
- VERSION=3.39
-
SOURCE_HASH=sha512:16358c2d8660ca301410b1d39b2eae64fe2ebbbfab797872410e5fcc67f802ef48f4e362edeecb0591626c77013537019094a6a5dfc8d24487b6b6e54564da8f
- ;;
- 3.40)
- VERSION=3.40.1
-
SOURCE_HASH=sha512:464ae843161e8deb911975d2117e8bf1194a968689b4ce70f9a12d5a33dba7ddd69f1248ec45244139c30fcc87678b206a4e124f032b26ead8bf894e4e8d0564
- ;;
- 3.41)
- VERSION=3.41.1
-
SOURCE_HASH=sha512:2214c5130888fa676078c38d5eebf70ae9f55c30c7280d175d29129a0ac1352677b99ca8a880471e401ba6f69a91aa117aa5f788e923ca52b1c97c4bf05b1d41
- ;;
- 3.42)
- VERSION=3.42.1
-
SOURCE_HASH=sha512:468e1d4ea9d2b832c7b8975443ee6fe2790b39cbbd9f8e3d8428a43f47cce0e81d5ca21e3566701b75bcd4af09110c0134e204b2850d30ecfd6347ec27e6e265
- ;;
- 3.43)
- VERSION=3.43
-
SOURCE_HASH=sha512:e9dfba5bd6f68c5ab58fc7a6fa1b16a035be1b1b7c436cf787bdc99257c5f54c78d73d94d015bffd29420df19b2a2818166c68fe592dd7208ab5605344827fb5
- ;;
- 3.44)
- VERSION=3.44.1
-
SOURCE_HASH=sha512:eb8777701a25b54377026633b6bf284e4c62308012058355f348a7c57525afe96db74a07de41ba01754e316a7dff06689de527359a5474ed7ab606779c4cf169
- ;;
3.45)
VERSION=3.45
SOURCE_HASH=sha512:33360a1bb4e0a0a974070c354ee82c515d5cfa2a12c9c96817a9fdb3e4ca1ad62eb95886b9b0d60e2f69efda964376d0671c1e3c920b2ea614aeecb719c6ff29
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 8cadebf..713ae8b 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,16 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, PREPARE, PRE_BUILD,
+ nss-3.14-config-1.patch,
+ nss-3.14.3_sync_with_upstream_softokn_changes.patch,
+ nss-3.15.1-standalone-2.patch,
+ nss-3.21-standalone-1.patch,
+ nss-3.28.1-standalone-1.patch: remove obsolete versions and patches
+ The following versions have been retained:
+ - 3.45 (required by firefox)
+ - 3.17 (required by seamonkey)
+ - 3.20 (required by thunderbird)
+ - 3.46 (most recent version)
+
2019-10-04 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 3.46.1 for 3.46 branch
diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index 9b4c0fe..cbbb53e 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1,6 +1,6 @@
. "${GRIMOIRE}/FUNCTIONS" &&
-prepare_select_branch DEFAULT 3.14 3.15 3.16 3.17 3.18 3.19 3.20 3.21 3.22
3.23 3.24 3.25 3.26 3.27 3.28 3.29 3.30 3.32 3.33 3.34 3.35 3.36 3.37 3.38
3.39 3.40 3.41 3.42 3.43 3.44 3.45 3.46 &&
+prepare_select_branch DEFAULT 3.17 3.20 3.45 3.46 &&
if [[ -z "$NSS_BRANCH" ]] || [[ "$NSS_BRANCH" == "DEFAULT" ]]; then
- NSS_BRANCH=3.20
+ NSS_BRANCH=3.46
fi
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 4beeefa..b795ac2 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -3,10 +3,6 @@ cd "$SOURCE_DIRECTORY" &&
case "${NSS_BRANCH}" in
3.1[7-9] | 3.20) patch -p1 <
"${SPELL_DIRECTORY}/nss-3.17.2-standalone-2.patch" ;;
- 3.15 | 3.16) patch -p1 <
"${SCRIPT_DIRECTORY}/nss-3.15.1-standalone-2.patch" ;;
- 3.14) patch -p1 < "${SCRIPT_DIRECTORY}/nss-3.14-config-1.patch"
;;
- 3.2[1-7]) patch -p1 <
"${SCRIPT_DIRECTORY}/nss-3.21-standalone-1.patch" ;;
- 3.2[8,9] | 3.30) patch -p1 <
"${SCRIPT_DIRECTORY}/nss-3.28.1-standalone-1.patch" ;;
3.3[2-9] | 3.4[0-9] ) patch -p1 <
"${SCRIPT_DIRECTORY}/nss-3.32-standalone-1.patch" ;;
*) patch -p1 < "${SCRIPT_DIRECTORY}/nss-3.12-config-1.patch"
esac &&
@@ -20,8 +16,5 @@ if [[ "$NSS_PEM" == "y" ]]; then
# Playing safe with old stuff, no new PEM source there.
tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 &&
patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch
- fi &&
- if [[ $NSS_BRANCH == "3.14" ]]; then
- patch -p1 <
$SPELL_DIRECTORY/nss-3.14.3_sync_with_upstream_softokn_changes.patch
fi
fi
diff --git a/crypto/nss/nss-3.14-config-1.patch
b/crypto/nss/nss-3.14-config-1.patch
deleted file mode 100644
index 43e3d8a..0000000
--- a/crypto/nss/nss-3.14-config-1.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-From 6fc285f4176de5cc4f8afed2188c6021c3367511 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Wed, 9 Jan 2013 18:12:36 +0100
-Subject: [PATCH] nss-3.14-config-1
-
----
- mozilla/security/nss/cmd/disttools/Makefile | 66 +++++++++++
- mozilla/security/nss/cmd/disttools/nss-config.in | 145
+++++++++++++++++++++++
- mozilla/security/nss/cmd/disttools/nss.pc.in | 12 ++
- mozilla/security/nss/cmd/manifest.mn | 1 +
- 4 files changed, 224 insertions(+)
- create mode 100644 mozilla/security/nss/cmd/disttools/Makefile
- create mode 100644 mozilla/security/nss/cmd/disttools/nss-config.in
- create mode 100644 mozilla/security/nss/cmd/disttools/nss.pc.in
-
-diff --git a/mozilla/security/nss/cmd/disttools/Makefile
b/mozilla/security/nss/cmd/disttools/Makefile
-new file mode 100644
-index 0000000..7395bca
---- /dev/null
-+++ b/mozilla/security/nss/cmd/disttools/Makefile
-@@ -0,0 +1,66 @@
-+#! gmake
-+#
-+# ***** BEGIN LICENSE BLOCK *****
-+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+#
-+# The contents of this file are subject to the Mozilla Public License
Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License. You may obtain a copy of the License at
-+# http://www.mozilla.org/MPL/
-+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
-+#
-+# The Original Code is the Netscape security libraries.
-+#
-+# The Initial Developer of the Original Code is
-+# Netscape Communications Corporation.
-+# Portions created by the Initial Developer are Copyright (C) 1994-2000
-+# the Initial Developer. All Rights Reserved.
-+#
-+# Contributor(s):
-+# DJ Lucas <dj AT linuxfromscratch.org>
-+#
-+# Alternatively, the contents of this file may be used under the terms of
-+# either the GNU General Public License Version 2 or later (the "GPL"), or
-+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+# in which case the provisions of the GPL or the LGPL are applicable instead
-+# of those above. If you wish to allow use of your version of this file only
-+# under the terms of either the GPL or the LGPL, and not to allow others to
-+# use your version of this file under the terms of the MPL, indicate your
-+# decision by deleting the provisions above and replace them with the notice
-+# and other provisions required by the GPL or the LGPL. If you do not delete
-+# the provisions above, a recipient may use your version of this file under
-+# the terms of any one of the MPL, the GPL or the LGPL.
-+#
-+# ***** END LICENSE BLOCK *****
-+
-+CORE_DEPTH = ../../..
-+
-+VERSION = $(shell grep NSS_VERSION $(CORE_DEPTH)/../dist/public/nss/nss.h |
\
-+ cut -d\" -f2)
-+NSS_VERSION_MAJOR = $(shell echo $(VERSION) | cut -d. -f1)
-+NSS_VERSION_MINOR = $(shell echo $(VERSION) | cut -d. -f2)
-+NSS_VERSION_PATCH = $(shell echo $(VERSION) | cut -d. -f3)
-+
-+
-+all: export
-+
-+export:
-+ sed -e 's/@NSS_VERSION_MAJOR@/$(NSS_VERSION_MAJOR)/' \
-+ -e 's/@NSS_VERSION_MINOR@/$(NSS_VERSION_MINOR)/' \
-+ -e 's/@NSS_VERSION_PATCH@/$(NSS_VERSION_PATCH)/' \
-+ nss-config.in > nss-config
-+ sed -e 's/@NSS_VERSION_MAJOR@/$(NSS_VERSION_MAJOR)/' \
-+ -e 's/@NSS_VERSION_MINOR@/$(NSS_VERSION_MINOR)/' \
-+ -e 's/@NSS_VERSION_PATCH@/$(NSS_VERSION_PATCH)/' \
-+ nss.pc.in > nss.pc
-+
-+libs:
-+ # Do Nothing
-+ echo "Done."
-+
-+.phony: all export
-+
-diff --git a/mozilla/security/nss/cmd/disttools/nss-config.in
b/mozilla/security/nss/cmd/disttools/nss-config.in
-new file mode 100644
-index 0000000..d1641cd
---- /dev/null
-+++ b/mozilla/security/nss/cmd/disttools/nss-config.in
-@@ -0,0 +1,145 @@
-+#!/bin/sh
-+
-+prefix=/usr
-+
-+major_version=@NSS_VERSION_MAJOR@
-+minor_version=@NSS_VERSION_MINOR@
-+patch_version=@NSS_VERSION_PATCH@
-+
-+usage()
-+{
-+ cat <<EOF
-+Usage: nss-config [OPTIONS] [LIBRARIES]
-+Options:
-+ [--prefix[=DIR]]
-+ [--exec-prefix[=DIR]]
-+ [--includedir[=DIR]]
-+ [--libdir[=DIR]]
-+ [--version]
-+ [--libs]
-+ [--cflags]
-+Dynamic Libraries:
-+ nss
-+ ssl
-+ smime
-+EOF
-+ exit $1
-+}
-+
-+if test $# -eq 0; then
-+ usage 1 1>&2
-+fi
-+
-+lib_ssl=yes
-+lib_smime=yes
-+lib_nssutil=yes
-+lib_nss=yes
-+lib_softokn=yes
-+
-+while test $# -gt 0; do
-+ case "$1" in
-+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+ *) optarg= ;;
-+ esac
-+
-+ case $1 in
-+ --prefix=*)
-+ prefix=$optarg
-+ ;;
-+ --prefix)
-+ echo_prefix=yes
-+ ;;
-+ --exec-prefix=*)
-+ exec_prefix=$optarg
-+ ;;
-+ --exec-prefix)
-+ echo_exec_prefix=yes
-+ ;;
-+ --includedir=*)
-+ includedir=$optarg
-+ ;;
-+ --includedir)
-+ echo_includedir=yes
-+ ;;
-+ --libdir=*)
-+ libdir=$optarg
-+ ;;
-+ --libdir)
-+ echo_libdir=yes
-+ ;;
-+ --version)
-+ echo ${major_version}.${minor_version}.${patch_version}
-+ ;;
-+ --cflags)
-+ echo_cflags=yes
-+ ;;
-+ --libs)
-+ echo_libs=yes
-+ ;;
-+ ssl)
-+ lib_ssl=yes
-+ ;;
-+ smime)
-+ lib_smime=yes
-+ ;;
-+ nss)
-+ lib_nss=yes
-+ ;;
-+ *)
-+ usage 1 1>&2
-+ ;;
-+ esac
-+ shift
-+done
-+
-+# Set variables that may be dependent upon other variables
-+if test -z "$exec_prefix"; then
-+ exec_prefix=${prefix}
-+fi
-+if test -z "$includedir"; then
-+ includedir=${prefix}/include/nss
-+fi
-+if test -z "$libdir"; then
-+ libdir=${prefix}/lib
-+fi
-+
-+if test "$echo_prefix" = "yes"; then
-+ echo $prefix
-+fi
-+
-+if test "$echo_exec_prefix" = "yes"; then
-+ echo $exec_prefix
-+fi
-+
-+if test "$echo_includedir" = "yes"; then
-+ echo $includedir
-+fi
-+
-+if test "$echo_libdir" = "yes"; then
-+ echo $libdir
-+fi
-+
-+if test "$echo_cflags" = "yes"; then
-+ echo -I$includedir
-+fi
-+
-+if test "$echo_libs" = "yes"; then
-+ libdirs="-Wl,-R$libdir -L$libdir"
-+ if test -n "$lib_ssl"; then
-+ libdirs="$libdirs -lssl${major_version}"
-+ fi
-+ if test -n "$lib_smime"; then
-+ libdirs="$libdirs -lsmime${major_version}"
-+ fi
-+ if test -n "$lib_nssutil"; then
-+ libdirs="$libdirs -lnssutil${major_version}"
-+ fi
-+ if test -n "$lib_nss"; then
-+ libdirs="$libdirs -lnss${major_version}"
-+ fi
-+ if test -n "$lib_softokn"; then
-+ libdirs="$libdirs -lsoftokn${major_version}"
-+ fi
-+ echo $libdirs
-+fi
-+
-diff --git a/mozilla/security/nss/cmd/disttools/nss.pc.in
b/mozilla/security/nss/cmd/disttools/nss.pc.in
-new file mode 100644
-index 0000000..3a65f0e
---- /dev/null
-+++ b/mozilla/security/nss/cmd/disttools/nss.pc.in
-@@ -0,0 +1,12 @@
-+prefix=/usr
-+exec_prefix=/usr
-+libdir=/usr/lib
-+includedir=/usr/include
-+
-+Name: NSS
-+Description: Mozilla Network Security Services
-+Version: @NSS_VERSION_MAJOR@.@NSS_VERSION_MINOR@.@NSS_VERSION_PATCH@
-+Requires: nspr >= 4.7.0
-+Libs: -Wl,-R${libdir} -L${libdir} -lnss3 -lsmime3 -lnssutil3 -lssl3
-lsoftokn3
-+Cflags: -I${includedir}/nss
-+
-diff --git a/mozilla/security/nss/cmd/manifest.mn
b/mozilla/security/nss/cmd/manifest.mn
-index 3c5b132..b153aac 100644
---- a/mozilla/security/nss/cmd/manifest.mn
-+++ b/mozilla/security/nss/cmd/manifest.mn
-@@ -22,6 +22,7 @@ DIRS = lib \
- dbtest \
- derdump \
- digest \
-+ disttools \
- httpserv \
- fipstest \
- $(LOWHASHTEST_SRCDIR) \
---
-1.8.1
-
diff --git a/crypto/nss/nss-3.14.3_sync_with_upstream_softokn_changes.patch
b/crypto/nss/nss-3.14.3_sync_with_upstream_softokn_changes.patch
deleted file mode 100644
index 9611c13..0000000
--- a/crypto/nss/nss-3.14.3_sync_with_upstream_softokn_changes.patch
+++ /dev/null
@@ -1,407 +0,0 @@
-From d6dbecfea317a468be12423595e584f43d84d8ec Mon Sep 17 00:00:00 2001
-From: Elio Maldonado <emaldona AT redhat.com>
-Date: Sat, 9 Feb 2013 17:11:00 -0500
-Subject: [PATCH] Sync up with upstream softokn changes
-
-- Disable RSA OEP case in FormatBlock, RSA_OAEP support is experimental and
in a state of flux
-- Numerous change upstream due to the work for TLS/DTLS 'Lucky 13'
vulnerability CVE-2013-0169
-- It now compiles with the NSS_3_14_3_BETA1 source
----
- mozilla/security/nss/lib/ckfw/pem/rsawrapr.c | 338
+++++++-------------------
- 1 files changed, 82 insertions(+), 256 deletions(-)
-
-diff --git a/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
b/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
-index 5ac4f39..3780d30 100644
---- a/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
-+++ b/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
-@@ -46,6 +46,7 @@
- #include "sechash.h"
- #include "base.h"
-
-+#include "lowkeyi.h"
- #include "secerr.h"
-
- #define RSA_BLOCK_MIN_PAD_LEN 8
-@@ -54,9 +55,8 @@
- #define RSA_BLOCK_PRIVATE_PAD_OCTET 0xff
- #define RSA_BLOCK_AFTER_PAD_OCTET 0x00
-
--#define OAEP_SALT_LEN 8
--#define OAEP_PAD_LEN 8
--#define OAEP_PAD_OCTET 0x00
-+/* Needed for RSA-PSS functions */
-+static const unsigned char eightZeros[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-
- #define FLAT_BUFSIZE 512 /* bytes to hold flattened SHA1Context. */
-
-@@ -78,127 +78,39 @@ pem_PublicModulusLen(NSSLOWKEYPublicKey *pubk)
- return 0;
- }
-
--static SHA1Context *SHA1_CloneContext(SHA1Context * original)
--{
-- SHA1Context *clone = NULL;
-- unsigned char *pBuf;
-- int sha1ContextSize = SHA1_FlattenSize(original);
-- SECStatus frv;
-- unsigned char buf[FLAT_BUFSIZE];
--
-- PORT_Assert(sizeof buf >= sha1ContextSize);
-- if (sizeof buf >= sha1ContextSize) {
-- pBuf = buf;
-- } else {
-- pBuf = nss_ZAlloc(NULL, sha1ContextSize);
-- if (!pBuf)
-- goto done;
-- }
--
-- frv = SHA1_Flatten(original, pBuf);
-- if (frv == SECSuccess) {
-- clone = SHA1_Resurrect(pBuf, NULL);
-- memset(pBuf, 0, sha1ContextSize);
-- }
-- done:
-- if (pBuf != buf)
-- nss_ZFreeIf(pBuf);
-- return clone;
-+/* Constant time comparison of a single byte.
-+ * Returns 1 iff a == b, otherwise returns 0.
-+ * Note: For ranges of bytes, use constantTimeCompare.
-+ */
-+static unsigned char constantTimeEQ8(unsigned char a, unsigned char b) {
-+ unsigned char c = ~(a - b | b - a);
-+ c >>= 7;
-+ return c;
- }
-
--/*
-- * Modify data by XORing it with a special hash of salt.
-+/* Constant time comparison of a range of bytes.
-+ * Returns 1 iff len bytes of a are identical to len bytes of b, otherwise
-+ * returns 0.
- */
--static SECStatus
--oaep_xor_with_h1(unsigned char *data, unsigned int datalen,
-- unsigned char *salt, unsigned int saltlen)
--{
-- SHA1Context *sha1cx;
-- unsigned char *dp, *dataend;
-- unsigned char end_octet;
--
-- sha1cx = SHA1_NewContext();
-- if (sha1cx == NULL) {
-- return SECFailure;
-- }
--
-- /*
-- * Get a hash of salt started; we will use it several times,
-- * adding in a different end octet (x00, x01, x02, ...).
-- */
-- SHA1_Begin(sha1cx);
-- SHA1_Update(sha1cx, salt, saltlen);
-- end_octet = 0;
--
-- dp = data;
-- dataend = data + datalen;
--
-- while (dp < dataend) {
-- SHA1Context *sha1cx_h1;
-- unsigned int sha1len, sha1off;
-- unsigned char sha1[SHA1_LENGTH];
--
-- /*
-- * Create hash of (salt || end_octet)
-- */
-- sha1cx_h1 = SHA1_CloneContext(sha1cx);
-- SHA1_Update(sha1cx_h1, &end_octet, 1);
-- SHA1_End(sha1cx_h1, sha1, &sha1len, sizeof(sha1));
-- SHA1_DestroyContext(sha1cx_h1, PR_TRUE);
-- PORT_Assert(sha1len == SHA1_LENGTH);
--
-- /*
-- * XOR that hash with the data.
-- * When we have fewer than SHA1_LENGTH octets of data
-- * left to xor, use just the low-order ones of the hash.
-- */
-- sha1off = 0;
-- if ((dataend - dp) < SHA1_LENGTH)
-- sha1off = SHA1_LENGTH - (dataend - dp);
-- while (sha1off < SHA1_LENGTH)
-- *dp++ ^= sha1[sha1off++];
--
-- /*
-- * Bump for next hash chunk.
-- */
-- end_octet++;
-- }
--
-- SHA1_DestroyContext(sha1cx, PR_TRUE);
-- return SECSuccess;
-+static unsigned char constantTimeCompare(const unsigned char *a,
-+ const unsigned char *b,
-+ unsigned int len) {
-+ unsigned char tmp = 0;
-+ unsigned int i;
-+ for (i = 0; i < len; ++i, ++a, ++b)
-+ tmp |= *a ^ *b;
-+ return constantTimeEQ8(0x00, tmp);
- }
-
--/*
-- * Modify salt by XORing it with a special hash of data.
-+/* Constant time conditional.
-+ * Returns a if c is 1, or b if c is 0. The result is undefined if c is
-+ * not 0 or 1.
- */
--static SECStatus
--oaep_xor_with_h2(unsigned char *salt, unsigned int saltlen,
-- unsigned char *data, unsigned int datalen)
-+static unsigned int constantTimeCondition(unsigned int c,
-+ unsigned int a,
-+ unsigned int b)
- {
-- unsigned char sha1[SHA1_LENGTH];
-- unsigned char *psalt, *psha1, *saltend;
-- SECStatus rv;
--
-- /*
-- * Create a hash of data.
-- */
-- rv = SHA1_HashBuf(sha1, data, datalen);
-- if (rv != SECSuccess) {
-- return rv;
-- }
--
-- /*
-- * XOR the low-order octets of that hash with salt.
-- */
-- PORT_Assert(saltlen <= SHA1_LENGTH);
-- saltend = salt + saltlen;
-- psalt = salt;
-- psha1 = sha1 + SHA1_LENGTH - saltlen;
-- while (psalt < saltend) {
-- *psalt++ ^= *psha1++;
-- }
--
-- return SECSuccess;
-+ return (~(c - 1) & a) | ((c - 1) & b);
- }
-
- /*
-@@ -212,7 +124,7 @@ static unsigned char *rsa_FormatOneBlock(unsigned
modulusLen,
- unsigned char *block;
- unsigned char *bp;
- int padLen;
-- int i;
-+ int i, j;
- SECStatus rv;
-
- block = (unsigned char *) nss_ZAlloc(NULL, modulusLen);
-@@ -260,124 +172,58 @@ static unsigned char *rsa_FormatOneBlock(unsigned
modulusLen,
- */
- case RSA_BlockPublic:
-
-- /*
-- * 0x00 || BT || Pad || 0x00 || ActualData
-- * 1 1 padLen 1 data->len
-- * Pad is all non-zero random bytes.
-- */
-- padLen = modulusLen - data->len - 3;
-- PORT_Assert(padLen >= RSA_BLOCK_MIN_PAD_LEN);
-- if (padLen < RSA_BLOCK_MIN_PAD_LEN) {
-- nss_ZFreeIf(block);
-- return NULL;
-- }
-- for (i = 0; i < padLen; i++) {
-- /* Pad with non-zero random data. */
-- do {
-- rv = RNG_GenerateGlobalRandomBytes(bp + i, 1);
-- } while (rv == SECSuccess
-- && bp[i] == RSA_BLOCK_AFTER_PAD_OCTET);
-- if (rv != SECSuccess) {
-- nss_ZFreeIf(block);
-- return NULL;
-- }
-- }
-- bp += padLen;
-- *bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
-- nsslibc_memcpy(bp, data->data, data->len);
--
-- break;
--
-- /*
-- * Blocks intended for public-key operation, using
-- * Optimal Asymmetric Encryption Padding (OAEP).
-- */
-- case RSA_BlockOAEP:
-- /*
-- * 0x00 || BT || Modified2(Salt) || Modified1(PaddedData)
-- * 1 1 OAEP_SALT_LEN OAEP_PAD_LEN + data->len [+ N]
-- *
-- * where:
-- * PaddedData is "Pad1 || ActualData [|| Pad2]"
-- * Salt is random data.
-- * Pad1 is all zeros.
-- * Pad2, if present, is random data.
-- * (The "modified" fields are all the same length as the original
-- * unmodified values; they are just xor'd with other values.)
-- *
-- * Modified1 is an XOR of PaddedData with a special octet
-- * string constructed of iterated hashing of Salt (see below).
-- * Modified2 is an XOR of Salt with the low-order octets of
-- * the hash of Modified1 (see farther below ;-).
-- *
-- * Whew!
-- */
--
--
-- /*
-- * Salt
-- */
-- rv = RNG_GenerateGlobalRandomBytes(bp, OAEP_SALT_LEN);
-- if (rv != SECSuccess) {
-- nss_ZFreeIf(block);
-- return NULL;
-- }
-- bp += OAEP_SALT_LEN;
--
-- /*
-- * Pad1
-- */
-- nsslibc_memset(bp, OAEP_PAD_OCTET, OAEP_PAD_LEN);
-- bp += OAEP_PAD_LEN;
--
-- /*
-- * Data
-- */
-- nsslibc_memcpy(bp, data->data, data->len);
-- bp += data->len;
--
-- /*
-- * Pad2
-- */
-- if (bp < (block + modulusLen)) {
-- rv = RNG_GenerateGlobalRandomBytes(bp,
-- block - bp + modulusLen);
-- if (rv != SECSuccess) {
-- nss_ZFreeIf(block);
-- return NULL;
-- }
-- }
--
-- /*
-- * Now we have the following:
-- * 0x00 || BT || Salt || PaddedData
-- * (From this point on, "Pad1 || Data [|| Pad2]" is treated
-- * as the one entity PaddedData.)
-- *
-- * We need to turn PaddedData into Modified1.
-- */
-- if (oaep_xor_with_h1(block + 2 + OAEP_SALT_LEN,
-- modulusLen - 2 - OAEP_SALT_LEN,
-- block + 2, OAEP_SALT_LEN) != SECSuccess) {
-- nss_ZFreeIf(block);
-- return NULL;
-- }
--
-- /*
-- * Now we have:
-- * 0x00 || BT || Salt || Modified1(PaddedData)
-- *
-- * The remaining task is to turn Salt into Modified2.
-- */
-- if (oaep_xor_with_h2(block + 2, OAEP_SALT_LEN,
-- block + 2 + OAEP_SALT_LEN,
-- modulusLen - 2 - OAEP_SALT_LEN) !=
-- SECSuccess) {
-- nss_ZFreeIf(block);
-- return NULL;
-- }
--
-- break;
-+ /*
-+ * 0x00 || BT || Pad || 0x00 || ActualData
-+ * 1 1 padLen 1 data->len
-+ * Pad is all non-zero random bytes.
-+ *
-+ * Build the block left to right.
-+ * Fill the entire block from Pad to the end with random bytes.
-+ * Use the bytes after Pad as a supply of extra random bytes from
-+ * which to find replacements for the zero bytes in Pad.
-+ * If we need more than that, refill the bytes after Pad with
-+ * new random bytes as necessary.
-+ */
-+ padLen = modulusLen - (data->len + 3);
-+ PORT_Assert (padLen >= RSA_BLOCK_MIN_PAD_LEN);
-+ if (padLen < RSA_BLOCK_MIN_PAD_LEN) {
-+ nss_ZFreeIf (block);
-+ return NULL;
-+ }
-+ j = modulusLen - 2;
-+ rv = RNG_GenerateGlobalRandomBytes(bp, j);
-+ if (rv == SECSuccess) {
-+ for (i = 0; i < padLen; ) {
-+ unsigned char repl;
-+ /* Pad with non-zero random data. */
-+ if (bp[i] != RSA_BLOCK_AFTER_PAD_OCTET) {
-+ ++i;
-+ continue;
-+ }
-+ if (j <= padLen) {
-+ rv = RNG_GenerateGlobalRandomBytes(bp + padLen,
-+ modulusLen - (2 + padLen));
-+ if (rv != SECSuccess)
-+ break;
-+ j = modulusLen - 2;
-+ }
-+ do {
-+ repl = bp[--j];
-+ } while (repl == RSA_BLOCK_AFTER_PAD_OCTET && j > padLen);
-+ if (repl != RSA_BLOCK_AFTER_PAD_OCTET) {
-+ bp[i++] = repl;
-+ }
-+ }
-+ }
-+ if (rv != SECSuccess) {
-+ /*sftk_fatalError = PR_TRUE;*/
-+ nss_ZFreeIf (block);
-+ return NULL;
-+ }
-+ bp += padLen;
-+ *bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
-+ nsslibc_memcpy(bp, data->data, data->len);
-+ break;
-
- default:
- PORT_Assert(0);
-@@ -427,26 +273,6 @@ rsa_FormatBlock(SECItem * result, unsigned modulusLen,
-
- break;
-
-- case RSA_BlockOAEP:
-- /*
-- * 0x00 || BT || M1(Salt) || M2(Pad1||ActualData[||Pad2])
-- *
-- * The "2" below is the first octet + the second octet.
-- * (The other fields do not contain the clear values, but are
-- * the same length as the clear values.)
-- */
-- PORT_Assert(data->len <= (modulusLen - (2 + OAEP_SALT_LEN
-- + OAEP_PAD_LEN)));
--
-- result->data = rsa_FormatOneBlock(modulusLen, blockType, data);
-- if (result->data == NULL) {
-- result->len = 0;
-- return SECFailure;
-- }
-- result->len = modulusLen;
--
-- break;
--
- case RSA_BlockRaw:
- /*
- * Pad || ActualData
---
-1.7.1
-
-
diff --git a/crypto/nss/nss-3.15.1-standalone-2.patch
b/crypto/nss/nss-3.15.1-standalone-2.patch
deleted file mode 100644
index 289dbc2..0000000
--- a/crypto/nss/nss-3.15.1-standalone-2.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-Submitted By: Armin K. <krejzi at email dot com>
-Date: 2013-07-02
-Initial Package Version: 3.15
-Upstream Status: Not applicable
-Origin: Based on dj's original patch, rediffed and modified
for 3.15
-Description: Adds auto-generated nss.pc and nss-config script,
and allows
- building without nspr in the source tree.
-
---- a/nss/config/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ b/nss/config/Makefile 2013-07-02 14:53:56.684750636 +0200
-@@ -0,0 +1,40 @@
-+CORE_DEPTH = ..
-+DEPTH = ..
-+
-+include $(CORE_DEPTH)/coreconf/config.mk
-+
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
-+PREFIX = /usr
-+
-+all: export libs
-+
-+export:
-+ # Create the nss.pc file
-+ mkdir -p $(DIST)/lib/pkgconfig
-+ sed -e "s,@prefix@,$(PREFIX)," \
-+ -e "s,@exec_prefix@,\$${prefix}," \
-+ -e "s,@libdir@,\$${prefix}/lib," \
-+ -e "s,@includedir@,\$${prefix}/include/nss," \
-+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
-+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+ nss.pc.in > nss.pc
-+ chmod 0644 nss.pc
-+ ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
-+
-+ # Create the nss-config script
-+ mkdir -p $(DIST)/bin
-+ sed -e "s,@prefix@,$(PREFIX)," \
-+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
-+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+ nss-config.in > nss-config
-+ chmod 0755 nss-config
-+ ln -sf ../../../nss/config/nss-config $(DIST)/bin
-+
-+libs:
-+
-+dummy: all export libs
-+
---- a/nss/config/nss-config.in 1970-01-01 01:00:00.000000000 +0100
-+++ b/nss/config/nss-config.in 2013-07-02 14:52:58.328084334 +0200
-@@ -0,0 +1,153 @@
-+#!/bin/sh
-+
-+prefix=@prefix@
-+
-+major_version=@NSS_MAJOR_VERSION@
-+minor_version=@NSS_MINOR_VERSION@
-+patch_version=@NSS_PATCH_VERSION@
-+
-+usage()
-+{
-+ cat <<EOF
-+Usage: nss-config [OPTIONS] [LIBRARIES]
-+Options:
-+ [--prefix[=DIR]]
-+ [--exec-prefix[=DIR]]
-+ [--includedir[=DIR]]
-+ [--libdir[=DIR]]
-+ [--version]
-+ [--libs]
-+ [--cflags]
-+Dynamic Libraries:
-+ nss
-+ nssutil
-+ smime
-+ ssl
-+ softokn
-+EOF
-+ exit $1
-+}
-+
-+if test $# -eq 0; then
-+ usage 1 1>&2
-+fi
-+
-+lib_nss=yes
-+lib_nssutil=yes
-+lib_smime=yes
-+lib_ssl=yes
-+lib_softokn=yes
-+
-+while test $# -gt 0; do
-+ case "$1" in
-+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+ *) optarg= ;;
-+ esac
-+
-+ case $1 in
-+ --prefix=*)
-+ prefix=$optarg
-+ ;;
-+ --prefix)
-+ echo_prefix=yes
-+ ;;
-+ --exec-prefix=*)
-+ exec_prefix=$optarg
-+ ;;
-+ --exec-prefix)
-+ echo_exec_prefix=yes
-+ ;;
-+ --includedir=*)
-+ includedir=$optarg
-+ ;;
-+ --includedir)
-+ echo_includedir=yes
-+ ;;
-+ --libdir=*)
-+ libdir=$optarg
-+ ;;
-+ --libdir)
-+ echo_libdir=yes
-+ ;;
-+ --version)
-+ echo ${major_version}.${minor_version}.${patch_version}
-+ ;;
-+ --cflags)
-+ echo_cflags=yes
-+ ;;
-+ --libs)
-+ echo_libs=yes
-+ ;;
-+ nss)
-+ lib_nss=yes
-+ ;;
-+ nssutil)
-+ lib_nssutil=yes
-+ ;;
-+ smime)
-+ lib_smime=yes
-+ ;;
-+ ssl)
-+ lib_ssl=yes
-+ ;;
-+ softokn)
-+ lib_softokn=yes
-+ ;;
-+ *)
-+ usage 1 1>&2
-+ ;;
-+ esac
-+ shift
-+done
-+
-+# Set variables that may be dependent upon other variables
-+if test -z "$exec_prefix"; then
-+ exec_prefix=`pkg-config --variable=exec_prefix nss`
-+fi
-+if test -z "$includedir"; then
-+ includedir=`pkg-config --variable=includedir nss`
-+fi
-+if test -z "$libdir"; then
-+ libdir=`pkg-config --variable=libdir nss`
-+fi
-+
-+if test "$echo_prefix" = "yes"; then
-+ echo $prefix
-+fi
-+
-+if test "$echo_exec_prefix" = "yes"; then
-+ echo $exec_prefix
-+fi
-+
-+if test "$echo_includedir" = "yes"; then
-+ echo $includedir
-+fi
-+
-+if test "$echo_libdir" = "yes"; then
-+ echo $libdir
-+fi
-+
-+if test "$echo_cflags" = "yes"; then
-+ echo -I$includedir
-+fi
-+
-+if test "$echo_libs" = "yes"; then
-+ libdirs="-L$libdir"
-+ if test -n "$lib_nss"; then
-+ libdirs="$libdirs -lnss${major_version}"
-+ fi
-+ if test -n "$lib_nssutil"; then
-+ libdirs="$libdirs -lnssutil${major_version}"
-+ fi
-+ if test -n "$lib_smime"; then
-+ libdirs="$libdirs -lsmime${major_version}"
-+ fi
-+ if test -n "$lib_ssl"; then
-+ libdirs="$libdirs -lssl${major_version}"
-+ fi
-+ if test -n "$lib_softokn"; then
-+ libdirs="$libdirs -lsoftokn${major_version}"
-+ fi
-+ echo $libdirs
-+fi
-+
---- a/nss/config/nss.pc.in 1970-01-01 01:00:00.000000000 +0100
-+++ b/nss/config/nss.pc.in 2013-07-02 14:52:58.328084334 +0200
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: NSS
-+Description: Network Security Services
-+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
-+Requires: nspr >= 4.8
-+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@
-lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@
-lsoftokn@NSS_MAJOR_VERSION@
-+Cflags: -I${includedir}
-+
---- a/nss/Makefile 2013-05-28 23:43:24.000000000 +0200
-+++ b/nss/Makefile 2013-07-02 14:52:58.328084334 +0200
-@@ -44,7 +44,7 @@
- # (7) Execute "local" rules. (OPTIONAL). #
- #######################################################################
-
--nss_build_all: build_nspr all
-+nss_build_all: all
-
- nss_clean_all: clobber_nspr clobber
-
---- a/nss/manifest.mn 2013-05-28 23:43:24.000000000 +0200
-+++ b/nss/manifest.mn 2013-07-02 14:52:58.331417666 +0200
-@@ -10,4 +10,4 @@
-
- RELEASE = nss
-
--DIRS = coreconf lib cmd
-+DIRS = coreconf lib cmd config
diff --git a/crypto/nss/nss-3.21-standalone-1.patch
b/crypto/nss/nss-3.21-standalone-1.patch
deleted file mode 100644
index 33b09b8..0000000
--- a/crypto/nss/nss-3.21-standalone-1.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot
br>
-Date: 2015-11-10
-Initial Package Version: 3.21
-Upstream Status: Not applicable
-Origin: Based on dj's original patch, rediffed and
- modified for 3.15 by Armin K.
- <krejzi at email dot com>
-Description: Adds auto-generated nss.pc and nss-config script,
and
- allows building without nspr in the source tree.
-
-diff -Naur nss-3.21.orig/nss/config/Makefile nss-3.21/nss/config/Makefile
---- nss-3.21.orig/nss/config/Makefile 1969-12-31 21:00:00.000000000 -0300
-+++ nss-3.21/nss/config/Makefile 2015-11-10 12:54:49.358835857 -0300
-@@ -0,0 +1,40 @@
-+CORE_DEPTH = ..
-+DEPTH = ..
-+
-+include $(CORE_DEPTH)/coreconf/config.mk
-+
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
-+PREFIX = /usr
-+
-+all: export libs
-+
-+export:
-+ # Create the nss.pc file
-+ mkdir -p $(DIST)/lib/pkgconfig
-+ sed -e "s,@prefix@,$(PREFIX)," \
-+ -e "s,@exec_prefix@,\$${prefix}," \
-+ -e "s,@libdir@,\$${prefix}/lib," \
-+ -e "s,@includedir@,\$${prefix}/include/nss," \
-+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
-+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+ nss.pc.in > nss.pc
-+ chmod 0644 nss.pc
-+ ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
-+
-+ # Create the nss-config script
-+ mkdir -p $(DIST)/bin
-+ sed -e "s,@prefix@,$(PREFIX)," \
-+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
-+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+ nss-config.in > nss-config
-+ chmod 0755 nss-config
-+ ln -sf ../../../nss/config/nss-config $(DIST)/bin
-+
-+libs:
-+
-+dummy: all export libs
-+
-diff -Naur nss-3.21.orig/nss/config/nss-config.in
nss-3.21/nss/config/nss-config.in
---- nss-3.21.orig/nss/config/nss-config.in 1969-12-31 21:00:00.000000000
-0300
-+++ nss-3.21/nss/config/nss-config.in 2015-11-10 12:54:49.359835835 -0300
-@@ -0,0 +1,153 @@
-+#!/bin/sh
-+
-+prefix=@prefix@
-+
-+major_version=@NSS_MAJOR_VERSION@
-+minor_version=@NSS_MINOR_VERSION@
-+patch_version=@NSS_PATCH_VERSION@
-+
-+usage()
-+{
-+ cat <<EOF
-+Usage: nss-config [OPTIONS] [LIBRARIES]
-+Options:
-+ [--prefix[=DIR]]
-+ [--exec-prefix[=DIR]]
-+ [--includedir[=DIR]]
-+ [--libdir[=DIR]]
-+ [--version]
-+ [--libs]
-+ [--cflags]
-+Dynamic Libraries:
-+ nss
-+ nssutil
-+ smime
-+ ssl
-+ softokn
-+EOF
-+ exit $1
-+}
-+
-+if test $# -eq 0; then
-+ usage 1 1>&2
-+fi
-+
-+lib_nss=yes
-+lib_nssutil=yes
-+lib_smime=yes
-+lib_ssl=yes
-+lib_softokn=yes
-+
-+while test $# -gt 0; do
-+ case "$1" in
-+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+ *) optarg= ;;
-+ esac
-+
-+ case $1 in
-+ --prefix=*)
-+ prefix=$optarg
-+ ;;
-+ --prefix)
-+ echo_prefix=yes
-+ ;;
-+ --exec-prefix=*)
-+ exec_prefix=$optarg
-+ ;;
-+ --exec-prefix)
-+ echo_exec_prefix=yes
-+ ;;
-+ --includedir=*)
-+ includedir=$optarg
-+ ;;
-+ --includedir)
-+ echo_includedir=yes
-+ ;;
-+ --libdir=*)
-+ libdir=$optarg
-+ ;;
-+ --libdir)
-+ echo_libdir=yes
-+ ;;
-+ --version)
-+ echo ${major_version}.${minor_version}.${patch_version}
-+ ;;
-+ --cflags)
-+ echo_cflags=yes
-+ ;;
-+ --libs)
-+ echo_libs=yes
-+ ;;
-+ nss)
-+ lib_nss=yes
-+ ;;
-+ nssutil)
-+ lib_nssutil=yes
-+ ;;
-+ smime)
-+ lib_smime=yes
-+ ;;
-+ ssl)
-+ lib_ssl=yes
-+ ;;
-+ softokn)
-+ lib_softokn=yes
-+ ;;
-+ *)
-+ usage 1 1>&2
-+ ;;
-+ esac
-+ shift
-+done
-+
-+# Set variables that may be dependent upon other variables
-+if test -z "$exec_prefix"; then
-+ exec_prefix=`pkg-config --variable=exec_prefix nss`
-+fi
-+if test -z "$includedir"; then
-+ includedir=`pkg-config --variable=includedir nss`
-+fi
-+if test -z "$libdir"; then
-+ libdir=`pkg-config --variable=libdir nss`
-+fi
-+
-+if test "$echo_prefix" = "yes"; then
-+ echo $prefix
-+fi
-+
-+if test "$echo_exec_prefix" = "yes"; then
-+ echo $exec_prefix
-+fi
-+
-+if test "$echo_includedir" = "yes"; then
-+ echo $includedir
-+fi
-+
-+if test "$echo_libdir" = "yes"; then
-+ echo $libdir
-+fi
-+
-+if test "$echo_cflags" = "yes"; then
-+ echo -I$includedir
-+fi
-+
-+if test "$echo_libs" = "yes"; then
-+ libdirs="-L$libdir"
-+ if test -n "$lib_nss"; then
-+ libdirs="$libdirs -lnss${major_version}"
-+ fi
-+ if test -n "$lib_nssutil"; then
-+ libdirs="$libdirs -lnssutil${major_version}"
-+ fi
-+ if test -n "$lib_smime"; then
-+ libdirs="$libdirs -lsmime${major_version}"
-+ fi
-+ if test -n "$lib_ssl"; then
-+ libdirs="$libdirs -lssl${major_version}"
-+ fi
-+ if test -n "$lib_softokn"; then
-+ libdirs="$libdirs -lsoftokn${major_version}"
-+ fi
-+ echo $libdirs
-+fi
-+
-diff -Naur nss-3.21.orig/nss/config/nss.pc.in nss-3.21/nss/config/nss.pc.in
---- nss-3.21.orig/nss/config/nss.pc.in 1969-12-31 21:00:00.000000000 -0300
-+++ nss-3.21/nss/config/nss.pc.in 2015-11-10 12:54:49.359835835 -0300
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: NSS
-+Description: Network Security Services
-+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
-+Requires: nspr >= 4.8
-+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@
-lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@
-lsoftokn@NSS_MAJOR_VERSION@
-+Cflags: -I${includedir}
-+
-diff -Naur nss-3.21.orig/nss/Makefile nss-3.21/nss/Makefile
---- nss-3.21.orig/nss/Makefile 2015-11-09 02:12:59.000000000 -0300
-+++ nss-3.21/nss/Makefile 2015-11-10 12:54:49.359835835 -0300
-@@ -46,7 +46,7 @@
- # (7) Execute "local" rules. (OPTIONAL). #
- #######################################################################
-
--nss_build_all: build_nspr all
-+nss_build_all: all
-
- nss_clean_all: clobber_nspr clobber
-
-diff -Naur nss-3.21.orig/nss/manifest.mn nss-3.21/nss/manifest.mn
---- nss-3.21.orig/nss/manifest.mn 2015-11-09 02:12:59.000000000 -0300
-+++ nss-3.21/nss/manifest.mn 2015-11-10 12:59:22.439784449 -0300
-@@ -10,4 +10,4 @@
-
- RELEASE = nss
-
--DIRS = coreconf lib cmd external_tests
-+DIRS = coreconf lib cmd external_tests config
diff --git a/crypto/nss/nss-3.28.1-standalone-1.patch
b/crypto/nss/nss-3.28.1-standalone-1.patch
deleted file mode 100644
index 5a66e38..0000000
--- a/crypto/nss/nss-3.28.1-standalone-1.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
-Date: 2016-12-27
-Initial Package Version: 3.12.4
-Upstream Status: Not applicable
-Origin: Self, rediffed for nss-3.28.
-Description: Adds auto-generated nss.pc and nss-config script,
and
- allows building without nspr in the source tree.
-
-diff -Naurp nss-3.28-orig/nss/Makefile nss-3.28/nss/Makefile
---- nss-3.28-orig/nss/Makefile 2016-12-21 05:56:27.000000000 -0600
-+++ nss-3.28/nss/Makefile 2016-12-26 22:24:52.695146032 -0600
-@@ -46,7 +46,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
- # (7) Execute "local" rules. (OPTIONAL). #
- #######################################################################
-
--nss_build_all: build_nspr all latest
-+nss_build_all: all latest
-
- nss_clean_all: clobber_nspr clobber
-
-diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile
---- nss-3.28-orig/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600
-+++ nss-3.28/nss/config/Makefile 2016-12-26 22:20:40.008205774 -0600
-@@ -0,0 +1,40 @@
-+CORE_DEPTH = ..
-+DEPTH = ..
-+
-+include $(CORE_DEPTH)/coreconf/config.mk
-+
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
-+PREFIX = /usr
-+
-+all: export libs
-+
-+export:
-+ # Create the nss.pc file
-+ mkdir -p $(DIST)/lib/pkgconfig
-+ sed -e "s,@prefix@,$(PREFIX)," \
-+ -e "s,@exec_prefix@,\$${prefix}," \
-+ -e "s,@libdir@,\$${prefix}/lib," \
-+ -e "s,@includedir@,\$${prefix}/include/nss," \
-+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
-+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+ nss.pc.in > nss.pc
-+ chmod 0644 nss.pc
-+ ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig
-+
-+ # Create the nss-config script
-+ mkdir -p $(DIST)/bin
-+ sed -e "s,@prefix@,$(PREFIX)," \
-+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
-+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+ nss-config.in > nss-config
-+ chmod 0755 nss-config
-+ ln -sf ../../../nss/config/nss-config $(DIST)/bin
-+
-+libs:
-+
-+dummy: all export libs
-+
-diff -Naurp nss-3.28-orig/nss/config/nss-config.in
nss-3.28/nss/config/nss-config.in
---- nss-3.28-orig/nss/config/nss-config.in 1969-12-31 18:00:00.000000000
-0600
-+++ nss-3.28/nss/config/nss-config.in 2016-12-26 22:20:40.008205774 -0600
-@@ -0,0 +1,153 @@
-+#!/bin/sh
-+
-+prefix=@prefix@
-+
-+major_version=@NSS_MAJOR_VERSION@
-+minor_version=@NSS_MINOR_VERSION@
-+patch_version=@NSS_PATCH_VERSION@
-+
-+usage()
-+{
-+ cat <<EOF
-+Usage: nss-config [OPTIONS] [LIBRARIES]
-+Options:
-+ [--prefix[=DIR]]
-+ [--exec-prefix[=DIR]]
-+ [--includedir[=DIR]]
-+ [--libdir[=DIR]]
-+ [--version]
-+ [--libs]
-+ [--cflags]
-+Dynamic Libraries:
-+ nss
-+ nssutil
-+ smime
-+ ssl
-+ softokn
-+EOF
-+ exit $1
-+}
-+
-+if test $# -eq 0; then
-+ usage 1 1>&2
-+fi
-+
-+lib_nss=yes
-+lib_nssutil=yes
-+lib_smime=yes
-+lib_ssl=yes
-+lib_softokn=yes
-+
-+while test $# -gt 0; do
-+ case "$1" in
-+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+ *) optarg= ;;
-+ esac
-+
-+ case $1 in
-+ --prefix=*)
-+ prefix=$optarg
-+ ;;
-+ --prefix)
-+ echo_prefix=yes
-+ ;;
-+ --exec-prefix=*)
-+ exec_prefix=$optarg
-+ ;;
-+ --exec-prefix)
-+ echo_exec_prefix=yes
-+ ;;
-+ --includedir=*)
-+ includedir=$optarg
-+ ;;
-+ --includedir)
-+ echo_includedir=yes
-+ ;;
-+ --libdir=*)
-+ libdir=$optarg
-+ ;;
-+ --libdir)
-+ echo_libdir=yes
-+ ;;
-+ --version)
-+ echo ${major_version}.${minor_version}.${patch_version}
-+ ;;
-+ --cflags)
-+ echo_cflags=yes
-+ ;;
-+ --libs)
-+ echo_libs=yes
-+ ;;
-+ nss)
-+ lib_nss=yes
-+ ;;
-+ nssutil)
-+ lib_nssutil=yes
-+ ;;
-+ smime)
-+ lib_smime=yes
-+ ;;
-+ ssl)
-+ lib_ssl=yes
-+ ;;
-+ softokn)
-+ lib_softokn=yes
-+ ;;
-+ *)
-+ usage 1 1>&2
-+ ;;
-+ esac
-+ shift
-+done
-+
-+# Set variables that may be dependent upon other variables
-+if test -z "$exec_prefix"; then
-+ exec_prefix=`pkg-config --variable=exec_prefix nss`
-+fi
-+if test -z "$includedir"; then
-+ includedir=`pkg-config --variable=includedir nss`
-+fi
-+if test -z "$libdir"; then
-+ libdir=`pkg-config --variable=libdir nss`
-+fi
-+
-+if test "$echo_prefix" = "yes"; then
-+ echo $prefix
-+fi
-+
-+if test "$echo_exec_prefix" = "yes"; then
-+ echo $exec_prefix
-+fi
-+
-+if test "$echo_includedir" = "yes"; then
-+ echo $includedir
-+fi
-+
-+if test "$echo_libdir" = "yes"; then
-+ echo $libdir
-+fi
-+
-+if test "$echo_cflags" = "yes"; then
-+ echo -I$includedir
-+fi
-+
-+if test "$echo_libs" = "yes"; then
-+ libdirs="-L$libdir"
-+ if test -n "$lib_nss"; then
-+ libdirs="$libdirs -lnss${major_version}"
-+ fi
-+ if test -n "$lib_nssutil"; then
-+ libdirs="$libdirs -lnssutil${major_version}"
-+ fi
-+ if test -n "$lib_smime"; then
-+ libdirs="$libdirs -lsmime${major_version}"
-+ fi
-+ if test -n "$lib_ssl"; then
-+ libdirs="$libdirs -lssl${major_version}"
-+ fi
-+ if test -n "$lib_softokn"; then
-+ libdirs="$libdirs -lsoftokn${major_version}"
-+ fi
-+ echo $libdirs
-+fi
-+
-diff -Naurp nss-3.28-orig/nss/config/nss.pc.in nss-3.28/nss/config/nss.pc.in
---- nss-3.28-orig/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600
-+++ nss-3.28/nss/config/nss.pc.in 2016-12-26 22:22:53.300694346 -0600
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: NSS
-+Description: Network Security Services
-+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
-+Requires: nspr >= 4.10
-+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@
-lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@
-lsoftokn@NSS_MAJOR_VERSION@
-+Cflags: -I${includedir}
-+
-diff -Naurp nss-3.28-orig/nss/manifest.mn nss-3.28/nss/manifest.mn
---- nss-3.28-orig/nss/manifest.mn 2016-12-21 05:56:27.000000000 -0600
-+++ nss-3.28/nss/manifest.mn 2016-12-26 22:24:12.278991843 -0600
-@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.8 \
-
- RELEASE = nss
-
--DIRS = coreconf lib cmd gtests
-+DIRS = coreconf lib cmd gtests config
diff --git a/devel/cppcheck/CONFIGURE b/devel/cppcheck/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/devel/cppcheck/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/devel/cppcheck/DEPENDS b/devel/cppcheck/DEPENDS
index 0bc16d0..1da9257 100755
--- a/devel/cppcheck/DEPENDS
+++ b/devel/cppcheck/DEPENDS
@@ -1,4 +1,4 @@
-depends cmake &&
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends -sub CXX gcc &&
optional_depends qtbase \
diff --git a/devel/cppcheck/HISTORY b/devel/cppcheck/HISTORY
index c7531ca..4f061df 100644
--- a/devel/cppcheck/HISTORY
+++ b/devel/cppcheck/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * CONFIGURE, DEPENDS: use CMAKE_*
+
2019-09-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.89
* BUILD, DETAILS, DEPENDS: use cmake
diff --git a/devel/rapidcheck/BUILD b/devel/rapidcheck/BUILD
deleted file mode 100755
index e013b8d..0000000
--- a/devel/rapidcheck/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-cmake_build
diff --git a/devel/rapidcheck/CONFIGURE b/devel/rapidcheck/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/devel/rapidcheck/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/devel/rapidcheck/DEPENDS b/devel/rapidcheck/DEPENDS
index 40940c8..0ce83f2 100755
--- a/devel/rapidcheck/DEPENDS
+++ b/devel/rapidcheck/DEPENDS
@@ -1,2 +1,2 @@
-depends gcc &&
-depends cmake
+source $GRIMOIRE/CMAKE_DEPENDS &&
+depends gcc
diff --git a/devel/rapidcheck/DETAILS b/devel/rapidcheck/DETAILS
index 638f833..70b6ec1 100755
--- a/devel/rapidcheck/DETAILS
+++ b/devel/rapidcheck/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
. "$GRIMOIRE/FUNCTIONS"
SPELL=rapidcheck
VERSION=$(get_scm_version)
diff --git a/devel/rapidcheck/HISTORY b/devel/rapidcheck/HISTORY
index 7eed5cb..5f605af 100644
--- a/devel/rapidcheck/HISTORY
+++ b/devel/rapidcheck/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2018-12-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PREPARE, BUILD, DEPENDS, DETAILS: spell created
diff --git a/devel/rr/0001-fix-compile-errors.patch
b/devel/rr/0001-fix-compile-errors.patch
new file mode 100644
index 0000000..3de1aa2
--- /dev/null
+++ b/devel/rr/0001-fix-compile-errors.patch
@@ -0,0 +1,39 @@
+From f45ad40561266483293dc1a4f64d18ecaede4b91 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Sat, 5 Oct 2019 15:26:22 +0200
+Subject: [PATCH] fix compile errors
+
+---
+ CMakeLists.txt | 2 +-
+ src/test/tgkill.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 596f826..d22bcf8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,7 +45,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS_COMMON}
-Wstrict-prototypes -std=gnu
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS_COMMON}
-D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++14")
+ set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -g3")
+
+-set(RR_FLAGS_DEBUG "-Wall -Wextra -Werror -O0 -DDEBUG -UNDEBUG")
++set(RR_FLAGS_DEBUG "-Wall -Wextra -Wno-error -O0 -DDEBUG -UNDEBUG")
+ set(RR_FLAGS_RELEASE "-Wall -Wextra -O2 -UDEBUG -DNDEBUG")
+ set(RR_TEST_FLAGS "${RR_FLAGS_DEBUG}")
+
+diff --git a/src/test/tgkill.c b/src/test/tgkill.c
+index 1446b7c..c7de4dc 100644
+--- a/src/test/tgkill.c
++++ b/src/test/tgkill.c
+@@ -4,7 +4,7 @@
+
+ static int num_signals_caught;
+
+-static int tgkill(int tgid, int tid, int sig) {
++int tgkill(int tgid, int tid, int sig) {
+ return syscall(SYS_tgkill, tgid, tid, sig);
+ }
+
+--
+2.23.0
+
diff --git a/devel/rr/BUILD b/devel/rr/BUILD
index 64ef045..f40c16f 100755
--- a/devel/rr/BUILD
+++ b/devel/rr/BUILD
@@ -1,3 +1,3 @@
OPTS="$OPTS -Ddisable32bit=ON" &&
CXXFLAGS="$CXXFLAGS -std=c++14"
-cmake_build
+default_build
diff --git a/devel/rr/CONFIGURE b/devel/rr/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/devel/rr/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/devel/rr/DEPENDS b/devel/rr/DEPENDS
index 1016120..6351b23 100755
--- a/devel/rr/DEPENDS
+++ b/devel/rr/DEPENDS
@@ -1,5 +1,5 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends gcc &&
-depends cmake &&
depends gdb &&
depends pkgconfig &&
depends coreutils &&
diff --git a/devel/rr/DETAILS b/devel/rr/DETAILS
index 58c1f61..5202a09 100755
--- a/devel/rr/DETAILS
+++ b/devel/rr/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=rr
VERSION=5.2.0
SOURCE="$SPELL-$VERSION.tar.gz"
diff --git a/devel/rr/HISTORY b/devel/rr/HISTORY
index f4c64cb..da6b7c0 100644
--- a/devel/rr/HISTORY
+++ b/devel/rr/HISTORY
@@ -1,3 +1,7 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-fix-compile-errors.patch: fix build error
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2018-12-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* 0001-use-C-14-instead-of-C-11.patch,
53c5bd72bae089616a3ca626b8af240481d70e6f.patch, BUILD, DEPENDS,
diff --git a/devel/rr/PRE_BUILD b/devel/rr/PRE_BUILD
index b0d7cf8..8639ce7 100755
--- a/devel/rr/PRE_BUILD
+++ b/devel/rr/PRE_BUILD
@@ -2,6 +2,7 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
patch -p1 <
"$SPELL_DIRECTORY/53c5bd72bae089616a3ca626b8af240481d70e6f.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/0001-use-C-14-instead-of-C-11.patch"
+patch -p1 < "$SPELL_DIRECTORY/0001-use-C-14-instead-of-C-11.patch"
&&
+patch -p1 < "$SPELL_DIRECTORY/0001-fix-compile-errors.patch"
diff --git a/devel/uncrustify/BUILD b/devel/uncrustify/BUILD
deleted file mode 100755
index e013b8d..0000000
--- a/devel/uncrustify/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-cmake_build
diff --git a/devel/uncrustify/CONFIGURE b/devel/uncrustify/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/devel/uncrustify/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/devel/uncrustify/DEPENDS b/devel/uncrustify/DEPENDS
index 2236fb7..4d71ea1 100755
--- a/devel/uncrustify/DEPENDS
+++ b/devel/uncrustify/DEPENDS
@@ -1,2 +1,2 @@
-depends -sub CXX gcc &&
-depends cmake
+source $GRIMOIRE/CMAKE_DEPENDS &&
+depends -sub CXX gcc
diff --git a/devel/uncrustify/DETAILS b/devel/uncrustify/DETAILS
index eaca36b..382bc3c 100755
--- a/devel/uncrustify/DETAILS
+++ b/devel/uncrustify/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=uncrustify
VERSION=0.69.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
diff --git a/devel/uncrustify/HISTORY b/devel/uncrustify/HISTORY
index 0a8e0af..efdb000 100644
--- a/devel/uncrustify/HISTORY
+++ b/devel/uncrustify/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2019-05-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.69.0
diff --git a/disk/efibootmgr/BUILD b/disk/efibootmgr/BUILD
index 0393b9d..8588f35 100755
--- a/disk/efibootmgr/BUILD
+++ b/disk/efibootmgr/BUILD
@@ -1,2 +1 @@
-sed -i 's/lib64/lib/' Make.defaults &&
make EFIDIR=SMGL
diff --git a/disk/efibootmgr/HISTORY b/disk/efibootmgr/HISTORY
index a32dc36..c8a4c8e 100644
--- a/disk/efibootmgr/HISTORY
+++ b/disk/efibootmgr/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, PRE_BUILD: fix build error
+
2019-01-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 16
diff --git a/disk/efibootmgr/PRE_BUILD b/disk/efibootmgr/PRE_BUILD
new file mode 100755
index 0000000..36d1347
--- /dev/null
+++ b/disk/efibootmgr/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sedit 's/lib64/lib/' Make.defaults &&
+sedit 's/-Werror//' Make.defaults
diff --git a/disk/efivar/BUILD b/disk/efivar/BUILD
index 3290330..6dfecc1 100755
--- a/disk/efivar/BUILD
+++ b/disk/efivar/BUILD
@@ -1,2 +1 @@
-sed -i 's/lib64/lib/' Make.defaults &&
-make
+default_build_make
diff --git a/disk/efivar/HISTORY b/disk/efivar/HISTORY
index 94a49a4..6d028b8 100644
--- a/disk/efivar/HISTORY
+++ b/disk/efivar/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, PRE_BUILD: fix build error
+
2018-12-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 37
diff --git a/disk/efivar/PRE_BUILD b/disk/efivar/PRE_BUILD
new file mode 100755
index 0000000..ff4d785
--- /dev/null
+++ b/disk/efivar/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sed -i 's/lib64/lib/' Make.defaults &&
+sed -i 's/-Werror//' Make.defaults
+
diff --git a/graphics/darktable/CONFIGURE b/graphics/darktable/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/graphics/darktable/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/graphics/darktable/DEPENDS b/graphics/darktable/DEPENDS
index 61f8868..9387548 100755
--- a/graphics/darktable/DEPENDS
+++ b/graphics/darktable/DEPENDS
@@ -1,5 +1,5 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends cairo &&
-depends cmake &&
depends curl &&
depends exiv2 &&
depends gconf2 &&
diff --git a/graphics/darktable/DETAILS b/graphics/darktable/DETAILS
index e457228..bf7525e 100755
--- a/graphics/darktable/DETAILS
+++ b/graphics/darktable/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
. "$GRIMOIRE/FUNCTIONS"
SPELL=darktable
if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index c38adea..a2e1c00 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, DEPENDS, CONFIGURE: use CMAKE_*
+
2019-08-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, gcc9.patch: apply patch from opensuse to fix compile
error
with gcc 9
diff --git a/graphics/lensfun/BUILD b/graphics/lensfun/BUILD
deleted file mode 100755
index e013b8d..0000000
--- a/graphics/lensfun/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-cmake_build
diff --git a/graphics/lensfun/CONFIGURE b/graphics/lensfun/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/graphics/lensfun/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/graphics/lensfun/DEPENDS b/graphics/lensfun/DEPENDS
index 889995e..dcdfd41 100755
--- a/graphics/lensfun/DEPENDS
+++ b/graphics/lensfun/DEPENDS
@@ -1,6 +1,6 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends python &&
depends glib2 &&
-depends cmake &&
optional_depends libpng '-DBUILD_LENSTOOL=ON' '-DBUILD_LENSTOOL=OFF' 'build
lenstool?' &&
if [[ $LENSFUN_BRANCH == scm ]]; then
depends subversion
diff --git a/graphics/lensfun/DETAILS b/graphics/lensfun/DETAILS
index 5f75fe0..3812e94 100755
--- a/graphics/lensfun/DETAILS
+++ b/graphics/lensfun/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
. "$GRIMOIRE/FUNCTIONS"
SPELL=lensfun
if [[ $LENSFUN_BRANCH == scm ]]; then
diff --git a/graphics/lensfun/HISTORY b/graphics/lensfun/HISTORY
index c782013..64bfd50 100644
--- a/graphics/lensfun/HISTORY
+++ b/graphics/lensfun/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2017-07-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD,
0001-Add-a-virtual-destructor-to-lfCallbackData-to-avoid-.patch:
diff --git a/graphics/openexr/BUILD b/graphics/openexr/BUILD
index aeb8820..dd0b209 100755
--- a/graphics/openexr/BUILD
+++ b/graphics/openexr/BUILD
@@ -5,4 +5,4 @@ fi &&
OPTS+=" -DBUILD_SHARED_LIBS=on" &&
OPTS+=" -DOPENEXR_NAMESPACE_VERSIONING=off" &&
-CXXFLAGS="${CXXFLAGS} -fpermissive" LDFLAGS="${LDFLAGS} -lpthread"
cmake_build
+CXXFLAGS="${CXXFLAGS} -fpermissive" LDFLAGS="${LDFLAGS} -lpthread"
default_build
diff --git a/graphics/openexr/CONFIGURE b/graphics/openexr/CONFIGURE
index 7d1b237..02790d4 100755
--- a/graphics/openexr/CONFIGURE
+++ b/graphics/openexr/CONFIGURE
@@ -1 +1,2 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
config_query RESTEST "Build IlmImf damaged input resilience test?" n
diff --git a/graphics/openexr/DEPENDS b/graphics/openexr/DEPENDS
index 84f6e20..9a7d192 100755
--- a/graphics/openexr/DEPENDS
+++ b/graphics/openexr/DEPENDS
@@ -1,5 +1,5 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends -sub CXX gcc &&
-depends cmake &&
depends PYTHON &&
depends boost -sub PYTHON &&
depends ilmbase
diff --git a/graphics/openexr/DETAILS b/graphics/openexr/DETAILS
index 89b6f58..5e97356 100755
--- a/graphics/openexr/DETAILS
+++ b/graphics/openexr/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=openexr
VERSION=2.4.0
SECURITY_PATCH=1
diff --git a/graphics/openexr/HISTORY b/graphics/openexr/HISTORY
index 2600efa..594aaad 100644
--- a/graphics/openexr/HISTORY
+++ b/graphics/openexr/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2019-09-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.4.0
diff --git a/graphics/rawtherapee/BUILD b/graphics/rawtherapee/BUILD
index 4aff67c..3381b54 100755
--- a/graphics/rawtherapee/BUILD
+++ b/graphics/rawtherapee/BUILD
@@ -4,4 +4,4 @@ OPTS="-DLICENSEDIR=$INSTALL_ROOT/usr/share/$SPELL $OPTS" &&
OPTS="-DCACHE_NAME_SUFFIX='' $OPTS" &&
OPTS="-DWITH_SYSTEM_KLT=off $OPTS" &&
-cmake_build
+default_build
diff --git a/graphics/rawtherapee/CONFIGURE b/graphics/rawtherapee/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/graphics/rawtherapee/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/graphics/rawtherapee/DEPENDS b/graphics/rawtherapee/DEPENDS
index 3185c54..48833b1 100755
--- a/graphics/rawtherapee/DEPENDS
+++ b/graphics/rawtherapee/DEPENDS
@@ -1,4 +1,4 @@
-depends cmake &&
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends expat &&
depends libsigc++3 &&
depends lcms2 &&
diff --git a/graphics/rawtherapee/DETAILS b/graphics/rawtherapee/DETAILS
index 69adc35..bf79986 100755
--- a/graphics/rawtherapee/DETAILS
+++ b/graphics/rawtherapee/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=rawtherapee
VERSION=5.7
SOURCE="${SPELL}-${VERSION}.tar.xz"
diff --git a/http/firefox-esr/DEPENDS b/http/firefox-esr/DEPENDS
index edbc1a2..42ea3be 100755
--- a/http/firefox-esr/DEPENDS
+++ b/http/firefox-esr/DEPENDS
@@ -30,8 +30,8 @@ depends librsvg2
&&
depends nspr "--with-system-nspr" &&
-if spell_ok nss && is_version_less "$(installed_version nss)" "3.40.1"; then
- depends -sub "3.40.x" nss "--with-system-nss"
+if spell_ok nss && is_version_less "$(installed_version nss)" "3.45.0"; then
+ depends -sub "3.45.x" nss "--with-system-nss"
else
depends nss "--with-system-nss"
fi &&
diff --git a/http/firefox-esr/HISTORY b/http/firefox-esr/HISTORY
index f962ce1..a16a553 100644
--- a/http/firefox-esr/HISTORY
+++ b/http/firefox-esr/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: depend on nss 3.45
+
2019-09-04 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 60.9.0, SECURITY_PATCH++ (multiple CVEs)
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 80908dc..f487ff3 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest.defaults: LATEST_maintenance_patches_4=patch-4.19.77
+ * info/patches/maintenance_patches_4/patch-4.19.77: added
+
2019-10-02 Pavel Vinogradov <public AT sourcemage.org>
* latest.defaults: LATEST_maintenance_patches_5=patch-5.3.2
* info/patches/maintenance_patches_5/patch-5.3.2: added
diff --git a/kernels/linux/info/patches/maintenance_patches_4/patch-4.19.77
b/kernels/linux/info/patches/maintenance_patches_4/patch-4.19.77
new file mode 100755
index 0000000..6e655c3
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_4/patch-4.19.77
@@ -0,0 +1,5 @@
+appliedkernels="4.19"
+patchversion="${appliedkernels}.77"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v4.x/${source}"
+sha1sum="11a0cdfc1f70c9b0db492d5e04b1e26afad6c721"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index aebe9ee..18600d5 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,5 +2,5 @@ LATEST_5=5.3
LATEST_4=4.19
LATEST_3=3.19
LATEST_maintenance_patches_3=patch-3.19.3
-LATEST_maintenance_patches_4=patch-4.19.76
+LATEST_maintenance_patches_4=patch-4.19.77
LATEST_maintenance_patches_5=patch-5.3.2
diff --git a/libs/assimp/BUILD b/libs/assimp/BUILD
deleted file mode 100755
index e013b8d..0000000
--- a/libs/assimp/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-cmake_build
diff --git a/libs/assimp/CONFIGURE b/libs/assimp/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/libs/assimp/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/libs/assimp/DEPENDS b/libs/assimp/DEPENDS
index ad14e3d..43208fd 100755
--- a/libs/assimp/DEPENDS
+++ b/libs/assimp/DEPENDS
@@ -1,5 +1,5 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends -sub CXX gcc &&
-depends cmake &&
optional_depends boost "-DASSIMP_ENABLE_BOOST_WORKAROUND=ON" \
"-DASSIMP_ENABLE_BOOST_WORKAROUND=OFF" \
diff --git a/libs/assimp/DETAILS b/libs/assimp/DETAILS
index fecae75..5c21b89 100755
--- a/libs/assimp/DETAILS
+++ b/libs/assimp/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=assimp
VERSION=4.1.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
diff --git a/libs/assimp/HISTORY b/libs/assimp/HISTORY
index 5d82878..28d1f43 100644
--- a/libs/assimp/HISTORY
+++ b/libs/assimp/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2017-12-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.1.0
diff --git a/libs/capnproto/BUILD b/libs/capnproto/BUILD
deleted file mode 100755
index e013b8d..0000000
--- a/libs/capnproto/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-cmake_build
diff --git a/libs/capnproto/CONFIGURE b/libs/capnproto/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/libs/capnproto/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/libs/capnproto/DEPENDS b/libs/capnproto/DEPENDS
index 40940c8..0ce83f2 100755
--- a/libs/capnproto/DEPENDS
+++ b/libs/capnproto/DEPENDS
@@ -1,2 +1,2 @@
-depends gcc &&
-depends cmake
+source $GRIMOIRE/CMAKE_DEPENDS &&
+depends gcc
diff --git a/libs/capnproto/DETAILS b/libs/capnproto/DETAILS
index 1690d88..7f4b5a7 100755
--- a/libs/capnproto/DETAILS
+++ b/libs/capnproto/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=capnproto
VERSION=0.7.0
SOURCE="$SPELL-$VERSION.tar.gz"
diff --git a/libs/capnproto/HISTORY b/libs/capnproto/HISTORY
index 950b62e..87ecce1 100644
--- a/libs/capnproto/HISTORY
+++ b/libs/capnproto/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2018-12-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS: spell created
diff --git a/libs/gflags/BUILD b/libs/gflags/BUILD
index acc2ed5..58a85d0 100755
--- a/libs/gflags/BUILD
+++ b/libs/gflags/BUILD
@@ -1,2 +1,2 @@
OPTS+=" -DBUILD_SHARED_LIBS=on" &&
-cmake_build
+default_build
diff --git a/libs/gflags/CONFIGURE b/libs/gflags/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/libs/gflags/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/libs/gflags/DEPENDS b/libs/gflags/DEPENDS
index 2236fb7..4d71ea1 100755
--- a/libs/gflags/DEPENDS
+++ b/libs/gflags/DEPENDS
@@ -1,2 +1,2 @@
-depends -sub CXX gcc &&
-depends cmake
+source $GRIMOIRE/CMAKE_DEPENDS &&
+depends -sub CXX gcc
diff --git a/libs/gflags/DETAILS b/libs/gflags/DETAILS
index 2c99104..ceef6c8 100755
--- a/libs/gflags/DETAILS
+++ b/libs/gflags/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=gflags
VERSION=2.2.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
diff --git a/libs/gflags/HISTORY b/libs/gflags/HISTORY
index 294763f..b47f348 100644
--- a/libs/gflags/HISTORY
+++ b/libs/gflags/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2018-11-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.2.2
diff --git a/libs/libical/BUILD b/libs/libical/BUILD
index 78c3600..f86971e 100755
--- a/libs/libical/BUILD
+++ b/libs/libical/BUILD
@@ -1,2 +1,2 @@
OPTS+=' -DSHARED_ONLY=1' &&
-cmake_build
+default_build
diff --git a/libs/libical/CONFIGURE b/libs/libical/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/libs/libical/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/libs/libical/DEPENDS b/libs/libical/DEPENDS
index d16954a..a40eacc 100755
--- a/libs/libical/DEPENDS
+++ b/libs/libical/DEPENDS
@@ -1,5 +1,5 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends -sub CXX gcc &&
-depends cmake &&
depends perl &&
depends tzdata &&
optional_depends db '' '' 'Berkeley DB storage' &&
diff --git a/libs/libical/DETAILS b/libs/libical/DETAILS
index a67d7c4..e95ceaa 100755
--- a/libs/libical/DETAILS
+++ b/libs/libical/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=libical
VERSION=3.0.6
SOURCE_HASH=sha512:d1a3397071c2989983893e3bbaeb088f7cb9a3639dca39709e9422c334dd1e9a869bba9292a250f83eb2a5b6727bd91b73c8e420bd1814422d97aff9fc6b26fc
diff --git a/libs/libical/HISTORY b/libs/libical/HISTORY
index 463723c..8317309 100644
--- a/libs/libical/HISTORY
+++ b/libs/libical/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2019-09-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0.6
diff --git a/libs/libiio/BUILD b/libs/libiio/BUILD
deleted file mode 100755
index e013b8d..0000000
--- a/libs/libiio/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-cmake_build
diff --git a/libs/libiio/CONFIGURE b/libs/libiio/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/libs/libiio/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/libs/libiio/DEPENDS b/libs/libiio/DEPENDS
index a9031dd..60b6841 100755
--- a/libs/libiio/DEPENDS
+++ b/libs/libiio/DEPENDS
@@ -1,4 +1,4 @@
-depends cmake &&
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends libaio &&
depends libusb &&
depends libxml2
diff --git a/libs/libiio/DETAILS b/libs/libiio/DETAILS
index 568d546..691caa2 100755
--- a/libs/libiio/DETAILS
+++ b/libs/libiio/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=libiio
VERSION=0.15
SOURCE="$SPELL-$VERSION.tar.gz"
diff --git a/libs/libiio/HISTORY b/libs/libiio/HISTORY
index ec1ae82..983392d 100644
--- a/libs/libiio/HISTORY
+++ b/libs/libiio/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2018-07-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS: spell created
diff --git a/libs/libxlsxwriter/BUILD b/libs/libxlsxwriter/BUILD
deleted file mode 100755
index e013b8d..0000000
--- a/libs/libxlsxwriter/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-cmake_build
diff --git a/libs/libxlsxwriter/CONFIGURE b/libs/libxlsxwriter/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/libs/libxlsxwriter/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/libs/libxlsxwriter/DEPENDS b/libs/libxlsxwriter/DEPENDS
index a4945a5..228af13 100755
--- a/libs/libxlsxwriter/DEPENDS
+++ b/libs/libxlsxwriter/DEPENDS
@@ -1,2 +1,2 @@
-depends zlib &&
-depends cmake
+source $GRIMOIRE/CMAKE_DEPENDS &&
+depends zlib
diff --git a/libs/libxlsxwriter/DETAILS b/libs/libxlsxwriter/DETAILS
index 847078a..d027f7f 100755
--- a/libs/libxlsxwriter/DETAILS
+++ b/libs/libxlsxwriter/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=libxlsxwriter
VERSION=0.8.7
SOURCE="${SPELL}-${VERSION}.tar.gz"
diff --git a/libs/libxlsxwriter/HISTORY b/libs/libxlsxwriter/HISTORY
index b8af1684..8fdedfe 100644
--- a/libs/libxlsxwriter/HISTORY
+++ b/libs/libxlsxwriter/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2019-06-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.8.7
diff --git a/libs/openscenegraph/BUILD b/libs/openscenegraph/BUILD
index 2966661..20ed4b9 100755
--- a/libs/openscenegraph/BUILD
+++ b/libs/openscenegraph/BUILD
@@ -1,2 +1,2 @@
OPTS+="-DFREETYPE_INCLUDE_DIR_freetype2=/usr/include/freetype2
-DFREETYPE_INCLUDE_DIR_ft2build=/usr/include/freetype2" &&
-cmake_build
+default_build
diff --git a/libs/openscenegraph/CONFIGURE b/libs/openscenegraph/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/libs/openscenegraph/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/libs/openscenegraph/DEPENDS b/libs/openscenegraph/DEPENDS
index 5b3d216..91768fc 100755
--- a/libs/openscenegraph/DEPENDS
+++ b/libs/openscenegraph/DEPENDS
@@ -1,5 +1,5 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends -sub CXX gcc &&
-depends cmake &&
depends freetype2 &&
depends GIFLIB &&
depends gdal &&
diff --git a/libs/openscenegraph/DETAILS b/libs/openscenegraph/DETAILS
index b2b6210..cfccc3f 100755
--- a/libs/openscenegraph/DETAILS
+++ b/libs/openscenegraph/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=openscenegraph
VERSION=3.6.4
SOURCE=OpenSceneGraph-$VERSION.tar.gz
diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index 7dde682..73ed80d 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS, INSTALL: use CMAKE_*
+
2019-07-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.6.4
diff --git a/libs/openscenegraph/INSTALL b/libs/openscenegraph/INSTALL
index 122885c..7316569 100755
--- a/libs/openscenegraph/INSTALL
+++ b/libs/openscenegraph/INSTALL
@@ -1,2 +1 @@
-make INST_LOCATION=${INSTALL_ROOT}/usr \
- INST_EXAMPLES=${INSTALL_ROOT}/usr/bin install
+INST_LOCATION=${INSTALL_ROOT}/usr INST_EXAMPLES=${INSTALL_ROOT}/usr/bin
cmake_install
diff --git a/libs/tinyxml/BUILD b/libs/tinyxml/BUILD
deleted file mode 100755
index e013b8d..0000000
--- a/libs/tinyxml/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-cmake_build
diff --git a/libs/tinyxml/CONFIGURE b/libs/tinyxml/CONFIGURE
index 6da3712..fd5acc6 100755
--- a/libs/tinyxml/CONFIGURE
+++ b/libs/tinyxml/CONFIGURE
@@ -1 +1,2 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
config_query TINYXML_STL "Build with STL support?" "n"
diff --git a/libs/tinyxml/DEPENDS b/libs/tinyxml/DEPENDS
index 98b886e..278955f 100755
--- a/libs/tinyxml/DEPENDS
+++ b/libs/tinyxml/DEPENDS
@@ -1,2 +1,2 @@
-depends cmake &&
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends -sub CXX gcc
diff --git a/libs/tinyxml/DETAILS b/libs/tinyxml/DETAILS
index b11d41d..41299af 100755
--- a/libs/tinyxml/DETAILS
+++ b/libs/tinyxml/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=tinyxml
VERSION=7.0.1
SOURCE_HASH=sha512:623cd7eff542d20b434a67111ac98110101c95a18767318bf906e5e56d8cc25622269f740f50477fe907a4c52d875b614cb6167f4760d42ab18dc55b9d4bf380
diff --git a/libs/tinyxml/HISTORY b/libs/tinyxml/HISTORY
index 5a0e650..766a6d3 100644
--- a/libs/tinyxml/HISTORY
+++ b/libs/tinyxml/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2018-11-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 7.0.1
diff --git a/libs/utf8proc/BUILD b/libs/utf8proc/BUILD
deleted file mode 100755
index e013b8d..0000000
--- a/libs/utf8proc/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-cmake_build
diff --git a/libs/utf8proc/CONFIGURE b/libs/utf8proc/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/libs/utf8proc/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/libs/utf8proc/DEPENDS b/libs/utf8proc/DEPENDS
index ce741a9..afdd4a6 100755
--- a/libs/utf8proc/DEPENDS
+++ b/libs/utf8proc/DEPENDS
@@ -1,2 +1,2 @@
-depends cmake &&
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends gcc
diff --git a/libs/utf8proc/DETAILS b/libs/utf8proc/DETAILS
index 18ea9f3..278f417 100755
--- a/libs/utf8proc/DETAILS
+++ b/libs/utf8proc/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=utf8proc
VERSION=2.4.0
SOURCE="$SPELL-$VERSION.tar.gz"
diff --git a/libs/utf8proc/HISTORY b/libs/utf8proc/HISTORY
index ba76e1a..b12c7ef 100644
--- a/libs/utf8proc/HISTORY
+++ b/libs/utf8proc/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2019-05-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.4.0
diff --git a/net/libproxy/BUILD b/net/libproxy/BUILD
index 3bed602..b7db3fd 100755
--- a/net/libproxy/BUILD
+++ b/net/libproxy/BUILD
@@ -2,4 +2,5 @@ if [ "$LIBPROXY_WEBKIT" == "none" ]; then
OPTS="-DWITH_WEBKIT=0 $OPTS"
fi &&
-cmake_build
+CMAKE_GEN='Unix Makefiles' &&
+default_build
diff --git a/net/libproxy/CONFIGURE b/net/libproxy/CONFIGURE
index f3f472c..18dd3cf 100755
--- a/net/libproxy/CONFIGURE
+++ b/net/libproxy/CONFIGURE
@@ -1 +1,2 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
config_query_list LIBPROXY_WEBKIT "Use which webkitgtk?" none gtk+2 gtk+3
diff --git a/net/libproxy/DEPENDS b/net/libproxy/DEPENDS
index 82f5be0..ec98348 100755
--- a/net/libproxy/DEPENDS
+++ b/net/libproxy/DEPENDS
@@ -1,5 +1,5 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends -sub CXX gcc &&
-depends cmake &&
depends libxmu &&
if [ "$LIBPROXY_WEBKIT" == "gtk+2" ]; then
diff --git a/net/libproxy/DETAILS b/net/libproxy/DETAILS
index 4c780a9..abd3c77 100755
--- a/net/libproxy/DETAILS
+++ b/net/libproxy/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=libproxy
VERSION=0.4.15
SOURCE_HASH=sha512:8f68bd56e44aeb3f553f4657bef82a5d14302780508dafa32454d6f724b724c884ceed6042f8df53a081d26ea0b05598cf35eab44823257c47c5ef8afb36442b
diff --git a/net/libproxy/HISTORY b/net/libproxy/HISTORY
index 242fc81..b64db15 100644
--- a/net/libproxy/HISTORY
+++ b/net/libproxy/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2019-06-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.4.15
diff --git a/science/codec2/BUILD b/science/codec2/BUILD
deleted file mode 100755
index e013b8d..0000000
--- a/science/codec2/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-cmake_build
diff --git a/science/codec2/CONFIGURE b/science/codec2/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/science/codec2/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/science/codec2/DEPENDS b/science/codec2/DEPENDS
index ce741a9..afdd4a6 100755
--- a/science/codec2/DEPENDS
+++ b/science/codec2/DEPENDS
@@ -1,2 +1,2 @@
-depends cmake &&
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends gcc
diff --git a/science/codec2/DETAILS b/science/codec2/DETAILS
index c755548..263bc3c 100755
--- a/science/codec2/DETAILS
+++ b/science/codec2/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=codec2
VERSION=0.8.1
SOURCE="${SPELL}-${VERSION}.tar.xz"
diff --git a/science/codec2/HISTORY b/science/codec2/HISTORY
index b4d5fc8..b29cc74 100644
--- a/science/codec2/HISTORY
+++ b/science/codec2/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2019-08-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS: spell created
* PRE_BUILD, codec2-0.8.1-unused-deps.patch: patch from gentoo that
diff --git a/science/gnuradio/CONFIGURE b/science/gnuradio/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/science/gnuradio/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/science/gnuradio/DEPENDS b/science/gnuradio/DEPENDS
index 858610a..681990a 100755
--- a/science/gnuradio/DEPENDS
+++ b/science/gnuradio/DEPENDS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends python3 &&
depends -sub PYTHON3 mako &&
@@ -19,7 +20,6 @@ depends codec2 &&
depends log4cpp &&
depends alsa-lib &&
-depends cmake &&
depends fftw &&
depends qtbase &&
depends pyqt5 &&
diff --git a/science/gnuradio/DETAILS b/science/gnuradio/DETAILS
index bba5bd5..0094f27 100755
--- a/science/gnuradio/DETAILS
+++ b/science/gnuradio/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=gnuradio
VERSION=3.8.0.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
diff --git a/science/gnuradio/HISTORY b/science/gnuradio/HISTORY
index 4be2f54..0409b31 100644
--- a/science/gnuradio/HISTORY
+++ b/science/gnuradio/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2019-08-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, DEPENDS: version 3.8.0.0
diff --git a/science/hackrf/CONFIGURE b/science/hackrf/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/science/hackrf/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/science/hackrf/DEPENDS b/science/hackrf/DEPENDS
index 60dd614..6d7d390 100755
--- a/science/hackrf/DEPENDS
+++ b/science/hackrf/DEPENDS
@@ -1 +1 @@
-depends cmake
+source $GRIMOIRE/CMAKE_DEPENDS
diff --git a/science/hackrf/DETAILS b/science/hackrf/DETAILS
index f2a0ff8..0695ac2 100755
--- a/science/hackrf/DETAILS
+++ b/science/hackrf/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=hackrf
VERSION=2018.01.1
SOURCE="${SPELL}-v${VERSION}.tar.gz"
diff --git a/science/hackrf/HISTORY b/science/hackrf/HISTORY
index 18b30ee..77ab055 100644
--- a/science/hackrf/HISTORY
+++ b/science/hackrf/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2018-07-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2018.01.1
diff --git a/science/openscad/DEPENDS b/science/openscad/DEPENDS
index 791ace7..9b1143d 100755
--- a/science/openscad/DEPENDS
+++ b/science/openscad/DEPENDS
@@ -4,7 +4,6 @@ depends qscintilla &&
depends cgal &&
depends gmp &&
depends mpfr &&
-depends cmake &&
depends boost &&
# "-DBoost_USE_STATIC_LIBS=OFF
-DBOOST_INCLUDEDIR=${INSTALL_ROOT}/usr/include
-DBOOST_LIBRARYDIR=${INSTALL_ROOT}/usr/lib" &&
sub_depends boost FILESYSTEM &&
diff --git a/science/openscad/HISTORY b/science/openscad/HISTORY
index f5ad011..4618823 100644
--- a/science/openscad/HISTORY
+++ b/science/openscad/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: remove bogus dependency on cmake
+
2019-07-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS: spell created
diff --git
a/science/qmapshack/0001-fix-incompatibility-with-recent-proj.patch
b/science/qmapshack/0001-fix-incompatibility-with-recent-proj.patch
new file mode 100644
index 0000000..2271649
--- /dev/null
+++ b/science/qmapshack/0001-fix-incompatibility-with-recent-proj.patch
@@ -0,0 +1,24 @@
+From 5d636ad60cde62d576e3b2e66e22620bad2c5e65 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sat, 5 Oct 2019 18:12:35 +0200
+Subject: [PATCH] fix incompatibility with recent proj
+
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 397dbdb..4d0aa15 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,6 +28,7 @@ project(QMapShack VERSION 1.11.1)
+ set(VERSION_SUFFIX "")
+ # !!! Do not forget to update versions in the sub-repos, too!!!
+
++add_definitions("-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H")
+
+
###############################################################################################
+ # Define paths and include other modules
+--
+2.23.0
+
diff --git a/science/qmapshack/CONFIGURE b/science/qmapshack/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/science/qmapshack/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/science/qmapshack/DEPENDS b/science/qmapshack/DEPENDS
index 99de7ba..d0f6242 100755
--- a/science/qmapshack/DEPENDS
+++ b/science/qmapshack/DEPENDS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends gdal &&
depends proj &&
depends routino &&
@@ -5,5 +6,4 @@ depends qtscript &&
depends qtwebkit &&
depends qttools &&
depends qtbase &&
-depends cmake &&
depends quazip "-DLIBQUAZIP_LIBRARY=$INSTALL_ROOT/opt/qt5/lib/libquazip5.so
-DQUAZIP_INCLUDE_DIR=$INSTALL_ROOT/opt/qt5/include/quazip5"
diff --git a/science/qmapshack/DETAILS b/science/qmapshack/DETAILS
index e292ed2..a5f4fe3 100755
--- a/science/qmapshack/DETAILS
+++ b/science/qmapshack/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=qmapshack
VERSION=1.11.1
SOURCE="${SPELL}-${VERSION}.tar.gz"
diff --git a/science/qmapshack/HISTORY b/science/qmapshack/HISTORY
index 71e92fa..b775746 100644
--- a/science/qmapshack/HISTORY
+++ b/science/qmapshack/HISTORY
@@ -1,3 +1,7 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+ * PRE_BUILD, 0001-fix-incompatibility-with-recent-proj.patch: fix
build error
+
2018-07-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS, BUILD, 0001-add-missing-include.patch, PRE_BUILD:
spell
created
diff --git a/science/qmapshack/PRE_BUILD b/science/qmapshack/PRE_BUILD
index 7c8eb15..bedfa95 100755
--- a/science/qmapshack/PRE_BUILD
+++ b/science/qmapshack/PRE_BUILD
@@ -1,5 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -p1 < "$SPELL_DIRECTORY/0001-add-missing-include.patch"
+patch -p1 < "$SPELL_DIRECTORY/0001-add-missing-include.patch" &&
+patch -p1 <
"$SPELL_DIRECTORY/0001-fix-incompatibility-with-recent-proj.patch"
+
diff --git a/science/units/BUILD b/science/units/BUILD
new file mode 100755
index 0000000..aed2255
--- /dev/null
+++ b/science/units/BUILD
@@ -0,0 +1,2 @@
+OPTS="--sharedstatedir=$INSTALL_ROOT/var/state" &&
+default_build
diff --git a/science/units/DEPENDS b/science/units/DEPENDS
new file mode 100755
index 0000000..7a1d89c
--- /dev/null
+++ b/science/units/DEPENDS
@@ -0,0 +1,3 @@
+depends gcc &&
+depends python &&
+depends requests
diff --git a/science/units/HISTORY b/science/units/HISTORY
index ff670d9..1f25a5b 100644
--- a/science/units/HISTORY
+++ b/science/units/HISTORY
@@ -1,3 +1,8 @@
+2019-10-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, BUILD: install currency.units to /var/state instead of
+ /usr/com
+ * DEPENDS: add dependencies on gcc, python and requests
+
2019-06-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.19
diff --git a/science/units/PRE_BUILD b/science/units/PRE_BUILD
new file mode 100755
index 0000000..cbe002a
--- /dev/null
+++ b/science/units/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sedit "/^outfile/s|'.*'|'/var/state/units/currency.units'|g" units_cur &&
+sedit "s|#!/usr/bin/python|#!/usr/bin/python3|" units_cur
diff --git a/science/wxmaxima/BUILD b/science/wxmaxima/BUILD
deleted file mode 100755
index e013b8d..0000000
--- a/science/wxmaxima/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-cmake_build
diff --git a/science/wxmaxima/CONFIGURE b/science/wxmaxima/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/science/wxmaxima/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/science/wxmaxima/DEPENDS b/science/wxmaxima/DEPENDS
index cdb3059..7bfa6fd 100755
--- a/science/wxmaxima/DEPENDS
+++ b/science/wxmaxima/DEPENDS
@@ -1,4 +1,4 @@
-depends cmake &&
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends wxgtk-new &&
depends maxima
diff --git a/science/wxmaxima/DETAILS b/science/wxmaxima/DETAILS
index 6a755a4..83d4ffc 100755
--- a/science/wxmaxima/DETAILS
+++ b/science/wxmaxima/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=wxmaxima
VERSION=19.09.1
SOURCE="wxmaxima-${VERSION}.tar.gz"
diff --git a/science/wxmaxima/HISTORY b/science/wxmaxima/HISTORY
index c40704c..22cbc98 100644
--- a/science/wxmaxima/HISTORY
+++ b/science/wxmaxima/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2019-09-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 19.09.1
diff --git a/security/wireshark/CONFIGURE b/security/wireshark/CONFIGURE
index e55f8ba..94ab1af 100755
--- a/security/wireshark/CONFIGURE
+++ b/security/wireshark/CONFIGURE
@@ -1,3 +1,5 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
+
# remove obsolete options from WIRESHARK_OPTS
list_remove WIRESHARK_OPTS '--enable-threads' &&
list_remove WIRESHARK_OPTS '--disable-threads' &&
diff --git a/security/wireshark/DEPENDS b/security/wireshark/DEPENDS
index 358dc4f..b7a2372 100755
--- a/security/wireshark/DEPENDS
+++ b/security/wireshark/DEPENDS
@@ -1,4 +1,4 @@
-depends cmake &&
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends glib2 &&
depends glibc &&
depends libgcrypt &&
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index 89a9075..e99973e 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=wireshark
VERSION=3.0.5
SECURITY_PATCH=60
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index 6a8c42f..9b42df6 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,6 @@
+2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
+
2019-09-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.0.5
- [SM-Commit] GIT changes to master grimoire by Florian Franzmann (9d5c938bcceac89196a294a936029568fa847067), Florian Franzmann, 10/05/2019
Archive powered by MHonArc 2.6.24.