summaryrefslogtreecommitdiff
path: root/sysutils/nnn
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/nnn')
-rw-r--r--sysutils/nnn/Makefile18
-rw-r--r--sysutils/nnn/distinfo10
2 files changed, 21 insertions, 7 deletions
diff --git a/sysutils/nnn/Makefile b/sysutils/nnn/Makefile
index 6a2a105f294..6572ce764b4 100644
--- a/sysutils/nnn/Makefile
+++ b/sysutils/nnn/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2020/04/29 09:29:38 sjmulder Exp $
+# $NetBSD: Makefile,v 1.18 2020/05/30 03:06:03 sjmulder Exp $
-DISTNAME= nnn-3.1
+DISTNAME= nnn-3.2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GITHUB:=jarun/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -30,6 +30,20 @@ READLINE_DEFAULT= readline
# https://github.com/jarun/nnn/issues/453
MAKE_ENV.Linux+= LDLIBS=-lrt
+.include "../../mk/compiler.mk"
+
+# nnn uses -std=c11 for `restrict` but c99 has it too, so use that on
+# old GCC versions that don't support c11.
+# https://github.com/jarun/nnn/issues/605
+.if !empty(CC_VERSION:Mgcc-[123].*) || \
+ !empty(CC_VERSION:Mgcc-4.[0123456].*)
+SUBST_CLASSES+= c11
+SUBST_MESSAGE.c11= Use c99 on old GCC instead of c11
+SUBST_STAGE.c11= pre-configure
+SUBST_FILES.c11= Makefile
+SUBST_SED.c11= -e 's/-std=c11/-std=c99/'
+.endif
+
MAKE_ENV+= MANPREFIX=${PREFIX}/${PKGMANDIR}
MAKE_ENV+= CFLAGS_OPTIMIZATION=
MAKE_ENV+= CFLAGS_CURSES=${BUILDLINK_CFLAGS.curses:Q}
diff --git a/sysutils/nnn/distinfo b/sysutils/nnn/distinfo
index 6d2dbcf6ecf..1c5e3637646 100644
--- a/sysutils/nnn/distinfo
+++ b/sysutils/nnn/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2020/04/29 09:29:38 sjmulder Exp $
+$NetBSD: distinfo,v 1.13 2020/05/30 03:06:03 sjmulder Exp $
-SHA1 (nnn-3.1.tar.gz) = 70e40acc2e2a9cd330e75ea8641751d69089597d
-RMD160 (nnn-3.1.tar.gz) = fd18ec2f3dcb17ff90463afc21c6f764bf08d806
-SHA512 (nnn-3.1.tar.gz) = f17bdcf95bba3eb50d20cb06725022bcdc2fae34a365e55dea1baa49e40c567e175a3d5c66fcf70f560e64a8933f0ed9a8ca39af67fd39edcb81c82be5aedca9
-Size (nnn-3.1.tar.gz) = 110005 bytes
+SHA1 (nnn-3.2.tar.gz) = 074b20d4a9da51a673e9a43e6ccc1bd8d0b9b425
+RMD160 (nnn-3.2.tar.gz) = 3a0bc30d30da0cb468390f8a583489f0725f1a6e
+SHA512 (nnn-3.2.tar.gz) = 9cdc8d0d74162ddd4b90f69a4f558a25845732497ebdb129159fda658a799a949fe237013bf69a2d6a649433254ba2ed4c65f8f10cddd119f713c1d5518ea378
+Size (nnn-3.2.tar.gz) = 143122 bytes