From 0284379d31c7ceb05c4c668043dadaea3c995c42 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 11 Oct 2018 11:04:24 +0200
Subject: [PATCH] Tools/emacs - build-script reviewed - variant for version
 26.1 added

---
 Tools/emacs/build                 | 41 ++++++++++++++-----------------
 Tools/emacs/files/variants        |  2 +-
 Tools/emacs/files/variants.Darwin |  3 +++
 3 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 Tools/emacs/files/variants.Darwin

diff --git a/Tools/emacs/build b/Tools/emacs/build
index 629ec5a..7261baa 100755
--- a/Tools/emacs/build
+++ b/Tools/emacs/build
@@ -1,29 +1,24 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="https://ftp.gnu.org/gnu/emacs/$P-$V.tar.xz"
+pbuild::set_download_url "https://ftp.gnu.org/gnu/emacs/$P-$V.tar.xz"
 
-case ${OS} in
-Darwin )
-	configure_args='--with-ns --with-jpeg=no'
-	CC=''
-	CXX=''
-	COMPILER=''
-	COMPILER_VERSION=''
-	;;
-Linux )
-	# with 24.5 configure complains about missing libjpeg even it
-	# is installed!
-	configure_args='--with-jpeg=no'
-	;;
-*)
-	;;
-esac
+CC=''
+CXX=''
+module use System
 
-pbuild::configure() {
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		${configure_args} \
-		|| exit 1
+pbuild::pre_configure() {
+	case ${OS} in
+	Darwin )
+		pbuild::add_configure_args '--with-ns' '--with-jpeg=no'
+		;;
+	Linux )
+		# with 24.5 configure complains about missing libjpeg even it
+		# is installed!
+		pbuild::add_configure_args '--with-jpeg=no'
+		;;
+	*)
+		;;
+	esac
 	install -m 0755 -d "${PREFIX}"
 }
 
@@ -31,6 +26,8 @@ pbuild::post_install() {
 	mkdir -p "${PREFIX}/bin"
 	install -m 0755 "${BUILDBLOCK_DIR}/Emacs" "${PREFIX}/bin"
 	install -m 0755 "${BUILDBLOCK_DIR}/Emacsclient" "${PREFIX}/bin"
+	#cp -a "${GNUTLS_LIBRARY_DIR}"/libgnutls.so.* "${PREFIX}/lib"
+	#cp -a "${NETTLE_LIBRARY_DIR}"/libnettle.so.* "${PREFIX}/lib"
 }
 
 pbuild::post_install_Darwin() {
diff --git a/Tools/emacs/files/variants b/Tools/emacs/files/variants
index 3a44157..9fa24ad 100644
--- a/Tools/emacs/files/variants
+++ b/Tools/emacs/files/variants
@@ -1,3 +1,3 @@
 emacs/25.1	stable	b:libungif/4.1.4 b:tiff/4.0.3
 emacs/25.3	stable	b:libungif/4.1.4 b:tiff/4.0.9
-emacs/26.1	stable	b:libungif/4.1.4 b:tiff/4.0.9
+emacs/26.1	unstable	b:libungif/4.1.4 b:tiff/4.0.9 b:nettle/3.4 gnutls/3.5.19
diff --git a/Tools/emacs/files/variants.Darwin b/Tools/emacs/files/variants.Darwin
new file mode 100644
index 0000000..b5c333d
--- /dev/null
+++ b/Tools/emacs/files/variants.Darwin
@@ -0,0 +1,3 @@
+emacs/25.1	stable	b:libungif/4.1.4 b:tiff/4.0.3
+emacs/25.3	stable	b:libungif/4.1.4 b:tiff/4.0.9
+emacs/26.1	unstable	b:libungif/4.1.4 b:tiff/4.0.9 b:nettle/3.4 b:pkg-config/0.29.2 gnutls/3.5.19