[pkgsrc/trunk]: pkgsrc/security/john Simplify and fix the platform/compiler s...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/90a48a21a90e
branches:  trunk
changeset: 367138:90a48a21a90e
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Aug 24 17:22:58 2017 +0000

description:
Simplify and fix the platform/compiler selection for SunOS.  Other
platforms may want to follow suit.  Prompted by NetBSD/pkgsrc#12.

diffstat:

 security/john/Makefile |  18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diffs (32 lines):

diff -r f521a563b7bd -r 90a48a21a90e security/john/Makefile
--- a/security/john/Makefile    Thu Aug 24 16:12:23 2017 +0000
+++ b/security/john/Makefile    Thu Aug 24 17:22:58 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2016/01/28 10:04:38 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2017/08/24 17:22:58 jperkin Exp $
 #
 
 DISTNAME=      john-1.8.0
@@ -19,15 +19,13 @@
 .include "../../mk/bsd.prefs.mk"
 
 .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
+JOHN_ARCH.i386=                x86-any
+JOHN_ARCH.sparc=       sparc
+JOHN_ARCH.sparc64=     sparcv9
+JOHN_ARCH.x86_64=      x86-64
+JOHN_CC.gcc=           gcc
+JOHN_CC.sunpro=                cc
+BUILD_TARGET=  solaris-${JOHN_ARCH.${MACHINE_ARCH}}-${JOHN_CC.${PKGSRC_COMPILER}}
 .elif ${OPSYS} == "NetBSD"
 .  if ${MACHINE_ARCH} == "i386"
 BUILD_TARGET=  openbsd-x86-any