Import of pkgsrc-2016Q3

games/nethack-lib/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2015/08/18 07:31:08 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2016/02/25 13:19:47 jperkin Exp $
 #
 
 .include		"../../games/nethack-lib/Makefile.common"
@@ -16,13 +16,11 @@ INSTALLATION_DIRS=	${PKGMANDIR}/man6
 
 # Using 'nroff -Tascii' works better with groff and we don't want to use col
 # on linux as it removes the escape the the ansi color sequences.
-.if ${OPSYS} == "Linux"
-SUBST_CLASSES+=		nroff
+SUBST_CLASSES.Linux+=	nroff
 SUBST_STAGE.nroff=	pre-configure
 SUBST_MESSAGE.nroff=	Fixing Guidebook format command.
 SUBST_FILES.nroff=	sys/unix/Makefile.doc
 SUBST_SED.nroff=	-e '/^GUIDECMD/s,nroff .*$$,nroff -Tascii,'
-.endif
 
 # Special handling for the scorefiles: we do not want to delete
 # them between package installations and deinstallations.

games/nethack-lib/Makefile.common

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2012/10/06 11:54:47 asau Exp $
+# $NetBSD: Makefile.common,v 1.30 2016/02/25 13:19:47 jperkin Exp $
 #
 # used by games/nethack/Makefile
 # used by games/nethack-lib/Makefile
@@ -13,7 +13,7 @@ NETHACK_DIR=		nethackdir340
 
 DISTNAME=		nethack-${NETHACK_DISTVER}-src
 CATEGORIES=		games
-MASTER_SITES=		ftp://ftp.sourceforge.net/pub/sourceforge/n/ne/nethack/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=nethack/${NETHACK_BASEVER}/}
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		pooka@NetBSD.org
@@ -31,19 +31,18 @@ USE_TOOLS+=		gzip yacc lex awk
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
-SUBST_CLASSES+=		ttylib
+SUBST_CLASSES.Darwin+=	ttylib
+SUBST_CLASSES.Linux+=	ttylib
 SUBST_MESSAGE.ttylib=	Configuring to use ncurses
 SUBST_STAGE.ttylib=	post-patch
 SUBST_FILES.ttylib=	sys/unix/Makefile.src
 SUBST_SED.ttylib=	-e 's,^WINTTYLIB = -ltermlib,WINTTYLIB = -lncurses,'
-.endif
+
 .include "../../mk/curses.buildlink3.mk"
 
-.if ${OPSYS} == "Linux"
-NETHACK_OS=		SYSV
-.endif
-NETHACK_OS?=		BSD
+OPSYSVARS+=		NETHACK_OS
+NETHACK_OS.Linux=	SYSV
+NETHACK_OS.*=		BSD
 
 SUBST_CLASSES+=		os
 SUBST_MESSAGE.os=	Configuring for ${NETHACK_OS}

games/nethack-lib/distinfo

@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.18 2012/12/16 20:34:08 dholland Exp $
+$NetBSD: distinfo,v 1.19 2015/11/03 20:56:59 agc Exp $
 
 SHA1 (nethack-343-src.tgz) = c26537093c38152bc0fbcec20468d975b35f59fd
 RMD160 (nethack-343-src.tgz) = 42f600d24715a0b7e631b357c135761410b3ca95
+SHA512 (nethack-343-src.tgz) = 052342c19619219f291571d48cf7799f962eb6ec6f8a276427225c0abbd833eada18abeff9fbd647919f2a9e3bb097d7f154675e283fe48abc4752f24c192d8f
 Size (nethack-343-src.tgz) = 3497458 bytes
 SHA1 (patch-aa) = 31d89b27e52189de9a51fbb04f1ed390c5377b2b
 SHA1 (patch-ab) = 49947b960f2b7871fc798398d1c1ceab8d462ec9