singularity: Patch around configure bug for prefix

[Jason Bacon <bacon%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Tue Sep 25 10:12:14 2018 -0500
Changeset:	1bbfd9b6e0cf27871743d16400826984cee52bda

Modified Files:
	singularity/Makefile
	singularity/distinfo
Added Files:
	singularity/patches/patch-configure.ac

Log Message:
singularity: Patch around configure bug for prefix

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1bbfd9b6e0cf27871743d16400826984cee52bda

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 singularity/Makefile                   |  9 ++++++++-
 singularity/distinfo                   |  1 +
 singularity/patches/patch-configure.ac | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diffs:
diff --git a/singularity/Makefile b/singularity/Makefile
index b47c929de2..8721778071 100644
--- a/singularity/Makefile
+++ b/singularity/Makefile
@@ -22,6 +22,12 @@ REPLACE_PYTHON=		libexec/helpers/*/*.py
 REPLACE_PYTHON+=	libexec/python/*.py
 REPLACE_PYTHON+=	libexec/python/*/*.py
 REPLACE_PYTHON+=	libexec/python/*/*/*.py
+REPLACE_BASH+=		bin/singularity.in
+
+SUBST_CLASSES+=		path
+SUBST_STAGE.path=	pre-configure
+SUBST_FILES.path=	bin/singularity.in
+SUBST_SED.path=		-e 's|/usr/local|${PREFIX}|g'
 
 USE_TOOLS+=	autoconf automake autoreconf bash
 USE_LIBTOOL=	yes
@@ -29,7 +35,7 @@ GNU_CONFIGURE=	yes
 
 PV=			2.5.1
 CONFIG_SHELL=		${BASH}
-CHECK_PORTABILITY_SKIP=	configure
+# CHECK_PORTABILITY_SKIP=	configure
 
 # Requires clone()
 ONLY_FOR_PLATFORM=	Linux-*-*
@@ -50,6 +56,7 @@ pre-configure:
 post-install:
 	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/*.conf ${DESTDIR}${EGDIR}
 	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/init ${DESTDIR}${EGDIR}
+	${CHMOD} a-w ${DESTDIR}${PREFIX}/libexec/singularity/bin/*-suid
 
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/singularity/distinfo b/singularity/distinfo
index ec4bdb19ae..b672b8a807 100644
--- a/singularity/distinfo
+++ b/singularity/distinfo
@@ -4,3 +4,4 @@ SHA1 (singularity-2.5.1.tar.gz) = 29e72052f901218b1996fec32f7990b14135329a
 RMD160 (singularity-2.5.1.tar.gz) = eb957981be467e375b0d21c39b6c9f995d7c2e5f
 SHA512 (singularity-2.5.1.tar.gz) = cbe5ca50eaf349a73702c3e8ec2d9493fa3a2309b195a1be261843f70edbab36b97dae575c56da0fb1ab2b465abb8f2b004fc72e7e2a966c71cc7bf685e4e96e
 Size (singularity-2.5.1.tar.gz) = 236497 bytes
+SHA1 (patch-configure.ac) = e2b38e24670d0518aa851eab1606f60868b3ff6b
diff --git a/singularity/patches/patch-configure.ac b/singularity/patches/patch-configure.ac
new file mode 100644
index 0000000000..f3013a8f49
--- /dev/null
+++ b/singularity/patches/patch-configure.ac
@@ -0,0 +1,15 @@
+$NetBSD$
+
+# Portability
+
+--- configure.ac.orig	2018-09-25 14:38:34.635766268 +0000
++++ configure.ac
+@@ -296,7 +296,7 @@ AC_MSG_CHECKING([--with-slurm])
+ AC_ARG_WITH([slurm],
+             AS_HELP_STRING([--with-slurm], [This feature will no longer be part of Singularity proper]),
+            )
+-AS_IF([test "x$with_slurm" == "xyes"],
++AS_IF([test "x$with_slurm" = "xyes"],
+     [
+         AC_MSG_RESULT([yes])
+         echo