CVS commit: pkgsrc/devel/nss

["Sebastian Wiedenroth" <wiedi%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiedi
Date:           Thu Dec  1 21:57:43 UTC 2016

Modified Files:
        pkgsrc/devel/nss: Makefile

Log Message:
simplify installation of commandline utilities, fixes SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 pkgsrc/devel/nss/Makefile

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

Modified files:

Index: pkgsrc/devel/nss/Makefile
diff -u pkgsrc/devel/nss/Makefile:1.123 pkgsrc/devel/nss/Makefile:1.124
--- pkgsrc/devel/nss/Makefile:1.123     Tue Nov 29 22:51:12 2016
+++ pkgsrc/devel/nss/Makefile   Thu Dec  1 21:57:43 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.123 2016/11/29 22:51:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.124 2016/12/01 21:57:43 wiedi Exp $
 
 DISTNAME=              nss-${NSS_RELEASE:S/.0$//}
 NSS_RELEASE=           3.27.2
@@ -103,13 +103,6 @@ INSTALL_CMDS+=             certcgi certutil cmsutil
                        p7verify pk12util rsaperf shlibsign signtool signver \
                        ssltap strsclnt symkeyutil vfychain vfyserv
 
-CMDS_DIR=              ${OPSYS}${OS_VERSION}_OPT.OBJ
-.for platform in ${LP64PLATFORMS}
-.  if ${MACHINE_PLATFORM:M${platform}}
-CMDS_DIR=              ${OPSYS}${OS_VERSION}_64_OPT.OBJ
-.  endif
-.endfor
-
 post-extract:
        find ${WRKSRC} -type f | xargs ${CHMOD} 644
        find ${WRKSRC} -type d | xargs ${CHMOD} 755
@@ -125,8 +118,7 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/nss.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/nss.pc
        ${INSTALL_SCRIPT} ${WRKSRC}/nss-config ${DESTDIR}${PREFIX}/bin/nss-config
 .for cmd in ${INSTALL_CMDS}
-       ${INSTALL_PROGRAM} ${WRKSRC}/dist/${CMDS_DIR}/bin/${cmd} \
-               ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${DIST}/*_OPT.OBJ/bin/${cmd} ${DESTDIR}${PREFIX}/bin
 .endfor
 
 # For consistency of libxul.so link in www/firefox.