Import of pkgsrc-2016Q3

security/john/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/09/14 13:20:08 shattered Exp $
+# $NetBSD: Makefile,v 1.24 2016/01/28 10:04:38 wiz Exp $
 #
 
 DISTNAME=	john-1.8.0
@@ -18,18 +18,16 @@ TEST_TARGET=	check
 .include "../../mk/compiler.mk"
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc"
-.  if !empty(CC_VERSION:MSun)
-.    if defined(SPARC_TARGET_ARCH) && ${SPARC_TARGET_ARCH} == "sparcv9"
-BUILD_TARGET=	solaris-sparc-v9-cc
-.    else
-BUILD_TARGET=	solaris-sparc-v8-cc
-.    endif
-.  else
-BUILD_TARGET=	solaris-sparc-gcc
+.if ${OPSYS} == "SunOS"
+.  if ${MACHINE_ARCH} == "sparc"
+BUILD_TARGET=	solaris-sparc-${${PKGSRC_COMPILER}==gcc:?gcc:cc}
+.  elif ${MACHINE_ARCH} == "sparc64"
+BUILD_TARGET=	solaris-sparcv9-${${PKGSRC_COMPILER}==gcc:?gcc:cc}
+.  elif ${MACHINE_ARCH} == "i386"
+BUILD_TARGET=	solaris-x86-any-${${PKGSRC_COMPILER}==gcc:?gcc:cc}
+.  elif ${MACHINE_ARCH} == "x86_64"
+BUILD_TARGET=	solaris-x86_64-${${PKGSRC_COMPILER}==gcc:?gcc:cc}
 .  endif
-.elif ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "i386"
-BUILD_TARGET=	solaris-x86-any
 .elif ${OPSYS} == "NetBSD"
 .  if ${MACHINE_ARCH} == "i386"
 BUILD_TARGET=	openbsd-x86-any

security/john/distinfo

@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.14 2014/09/14 13:20:08 shattered Exp $
+$NetBSD: distinfo,v 1.15 2015/11/04 01:17:47 agc Exp $
 
 SHA1 (john-1.8.0.tar.xz) = 423901b9b281c26656234ee31b362f1c0c2b680c
 RMD160 (john-1.8.0.tar.xz) = fda9971cd78bdf2b5154586efde2504c9a5974a4
+SHA512 (john-1.8.0.tar.xz) = e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543
 Size (john-1.8.0.tar.xz) = 4468704 bytes
 SHA1 (patch-aa) = 15ba3d70444435c6705f189b32af109e1f211ff4
 SHA1 (patch-ab) = 4f8c9e1bba14f64b651c6d08337f004a3e278e44