Avoid dependency on /usr/ucb on SunOS, fixes install on at least

SmartOS. Sort PLIST with LANG=C.

3 files changed, 33 insertions, 16 deletions

diff --git a/security/botan/PLIST b/security/botan/PLIST
index b2a62f55712..d396ed2d506 100644
--- a/security/botan/PLIST
+++ b/security/botan/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/05/19 22:10:24 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/06/03 11:52:42 fhajny Exp $
 bin/botan-config-1.10
 include/botan-1.10/botan/adler32.h
 include/botan-1.10/botan/aes.h
@@ -61,21 +61,21 @@ include/botan-1.10/botan/dlies.h
 include/botan-1.10/botan/dsa.h
 include/botan-1.10/botan/dyn_engine.h
 include/botan-1.10/botan/eax.h
+include/botan-1.10/botan/ec_group.h
 include/botan-1.10/botan/ecb.h
 include/botan-1.10/botan/ecc_key.h
 include/botan-1.10/botan/ecdh.h
 include/botan-1.10/botan/ecdsa.h
-include/botan-1.10/botan/ec_group.h
 include/botan-1.10/botan/elgamal.h
-include/botan-1.10/botan/eme1.h
 include/botan-1.10/botan/eme.h
+include/botan-1.10/botan/eme1.h
 include/botan-1.10/botan/eme_pkcs.h
-include/botan-1.10/botan/emsa1_bsi.h
+include/botan-1.10/botan/emsa.h
 include/botan-1.10/botan/emsa1.h
+include/botan-1.10/botan/emsa1_bsi.h
 include/botan-1.10/botan/emsa2.h
 include/botan-1.10/botan/emsa3.h
 include/botan-1.10/botan/emsa4.h
-include/botan-1.10/botan/emsa.h
 include/botan-1.10/botan/emsa_raw.h
 include/botan-1.10/botan/engine.h
 include/botan-1.10/botan/entropy_src.h
@@ -93,8 +93,8 @@ include/botan-1.10/botan/gost_3411.h
 include/botan-1.10/botan/has160.h
 include/botan-1.10/botan/hash.h
 include/botan-1.10/botan/hash_id.h
-include/botan-1.10/botan/hex_filt.h
 include/botan-1.10/botan/hex.h
+include/botan-1.10/botan/hex_filt.h
 include/botan-1.10/botan/hmac.h
 include/botan-1.10/botan/hmac_rng.h
 include/botan-1.10/botan/idea.h
@@ -102,13 +102,13 @@ ${PLIST.x86}include/botan-1.10/botan/idea_sse2.h
 include/botan-1.10/botan/if_algo.h
 include/botan-1.10/botan/init.h
 include/botan-1.10/botan/kasumi.h
+include/botan-1.10/botan/kdf.h
 include/botan-1.10/botan/kdf1.h
 include/botan-1.10/botan/kdf2.h
-include/botan-1.10/botan/kdf.h
 include/botan-1.10/botan/keccak.h
 include/botan-1.10/botan/key_filt.h
-include/botan-1.10/botan/keypair.h
 include/botan-1.10/botan/key_spec.h
+include/botan-1.10/botan/keypair.h
 include/botan-1.10/botan/libstate.h
 include/botan-1.10/botan/lion.h
 include/botan-1.10/botan/loadstor.h
@@ -140,24 +140,24 @@ include/botan-1.10/botan/passhash9.h
 include/botan-1.10/botan/pbe.h
 include/botan-1.10/botan/pbes1.h
 include/botan-1.10/botan/pbes2.h
+include/botan-1.10/botan/pbkdf.h
 include/botan-1.10/botan/pbkdf1.h
 include/botan-1.10/botan/pbkdf2.h
-include/botan-1.10/botan/pbkdf.h
 include/botan-1.10/botan/pem.h
 include/botan-1.10/botan/pgp_s2k.h
 include/botan-1.10/botan/pipe.h
-include/botan-1.10/botan/pkcs10.h
-include/botan-1.10/botan/pkcs8.h
 include/botan-1.10/botan/pk_filts.h
 include/botan-1.10/botan/pk_keys.h
 include/botan-1.10/botan/pk_ops.h
+include/botan-1.10/botan/pkcs10.h
+include/botan-1.10/botan/pkcs8.h
 include/botan-1.10/botan/point_gfp.h
 include/botan-1.10/botan/pow_mod.h
 include/botan-1.10/botan/prf_ssl3.h
 include/botan-1.10/botan/prf_tls.h
 include/botan-1.10/botan/prf_x942.h
-include/botan-1.10/botan/pubkey_enums.h
 include/botan-1.10/botan/pubkey.h
+include/botan-1.10/botan/pubkey_enums.h
 include/botan-1.10/botan/randpool.h
 include/botan-1.10/botan/rc2.h
 include/botan-1.10/botan/rc5.h
@@ -177,8 +177,8 @@ include/botan-1.10/botan/secmem.h
 include/botan-1.10/botan/secqueue.h
 include/botan-1.10/botan/seed.h
 include/botan-1.10/botan/selftest.h
-include/botan-1.10/botan/serpent.h
 include/botan-1.10/botan/serp_simd.h
+include/botan-1.10/botan/serpent.h
 include/botan-1.10/botan/sha160.h
 ${PLIST.x86}include/botan-1.10/botan/sha1_sse2.h
 ${PLIST.x86_64}include/botan-1.10/botan/sha1_x86_64.h
@@ -213,12 +213,12 @@ include/botan-1.10/botan/version.h
 include/botan-1.10/botan/whrlpool.h
 include/botan-1.10/botan/wid_wake.h
 include/botan-1.10/botan/x509_ca.h
-include/botan-1.10/botan/x509cert.h
 include/botan-1.10/botan/x509_crl.h
 include/botan-1.10/botan/x509_dn.h
 include/botan-1.10/botan/x509_ext.h
 include/botan-1.10/botan/x509_key.h
 include/botan-1.10/botan/x509_obj.h
+include/botan-1.10/botan/x509cert.h
 include/botan-1.10/botan/x509self.h
 include/botan-1.10/botan/x509stor.h
 include/botan-1.10/botan/x919_mac.h
@@ -233,8 +233,8 @@ lib/libbotan-1.10.so.1.12
 lib/pkgconfig/botan-1.10.pc
 share/doc/${PKGNAME}/manual/algos.txt
 share/doc/${PKGNAME}/manual/bigint.txt
-share/doc/${PKGNAME}/manual/building.txt
 share/doc/${PKGNAME}/manual/build_log.txt
+share/doc/${PKGNAME}/manual/building.txt
 share/doc/${PKGNAME}/manual/contents.txt
 share/doc/${PKGNAME}/manual/credits.txt
 share/doc/${PKGNAME}/manual/download.txt
diff --git a/security/botan/distinfo b/security/botan/distinfo
index 5d9365155a5..b715e22bfbe 100644
--- a/security/botan/distinfo
+++ b/security/botan/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2016/05/31 21:36:17 joerg Exp $
+$NetBSD: distinfo,v 1.18 2016/06/03 11:52:42 fhajny Exp $
 
 SHA1 (Botan-1.10.12.tgz) = 45ad77e59dadc8498dc62dbcaf7c8cec46e2b073
 RMD160 (Botan-1.10.12.tgz) = ebe525ff8bc35d2363bb934b045c83a29ea4f358
@@ -7,6 +7,7 @@ Size (Botan-1.10.12.tgz) = 2707397 bytes
 SHA1 (patch-src_build-data_arch_arm.txt) = 23e40eb4bf43ca8c96f809b7f7a33de4a5149f47
 SHA1 (patch-src_build-data_makefile_unix.in) = 1ab76671c1acfe955d3e01d27e91687c0c382239
 SHA1 (patch-src_build-data_makefile_unix__shr.in) = ecd64f1ee80cb791d58052a75c6f33c5d4360a96
+SHA1 (patch-src_build-data_os_solaris.txt) = 6c3e522392f5c20bab5ea59c18ff149d65bc2ab6
 SHA1 (patch-src_entropy_unix_procs_info.txt) = 0d94e14b48f049112c8913ac244c358318974c6f
 SHA1 (patch-src_ssl_rec__wri.cpp) = af2dafd229b46c69674644a35dc231cdcc888786
 SHA1 (patch-src_ssl_tls__client.cpp) = 6e9f70d09c764bc5374a8d986351c01fd45395af
diff --git a/security/botan/patches/patch-src_build-data_os_solaris.txt b/security/botan/patches/patch-src_build-data_os_solaris.txt
new file mode 100644
index 00000000000..74c9abdce85
--- /dev/null
+++ b/security/botan/patches/patch-src_build-data_os_solaris.txt
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_build-data_os_solaris.txt,v 1.1 2016/06/03 11:52:42 fhajny Exp $
+
+Modern SunOS platforms might not have /usr/ucb. Fixes install on
+SmartOS and other.
+
+--- src/build-data/os/solaris.txt.orig	2016-02-03 07:57:06.000000000 +0000
++++ src/build-data/os/solaris.txt
+@@ -1,8 +1,5 @@
+ os_type unix
+ 
+-install_cmd_data '/usr/ucb/install -m 644'
+-install_cmd_exec '/usr/ucb/install -m 755'
+-
+ <target_features>
+ posix_mlock
+ gettimeofday