Re-commit of

64 bit linuxulator support (not activated by default):
 - most of the work was done by Alan Jude
 - all errors are mine
 - 64bit (may) have rough edges
 - I validated
    * that the 32bit part doesn't has deinstall regressions (incl. EXP runs by
      antoine)
    * 29 of 72 64bit ports ports don't have deinstall leftovers (more validation
      later, when I dare to activate the 64bit linuxulator in the kernel)
 - the infrastructure part looks mature enough to let more test-bunnies get
   some experience with the new 64 bit parts
 - to use it you shall have no linux ports installed and have to specify
   (on your own risk) the following in make.conf before installing the ports:
   OVERRIDE_LINUX_BASE_PORT=c6_64
   OVERRIDE_LINUX_NONBASE_PORTS=c6_64

This is on top of the exiting c6 linux ports. Given that CentOS 7 is 64bits
only, we decided to have it as an "overlay" instead of new ports.
The 64bit part only installs 64bit executables, the 32bit ports can not be
installed at the same time (if needed we can think of letting the 64bit
overlay install the 32bit parts too, but given the CentOS 7 comment
above...).

Differential Revision:	https://reviews.freebsd.org/D174
Submitted by:		alanjude
Sponsored by:		Essen FreeBSD Hackathon 2015
Reviewed by:		xmj, eadler (earlier versions)
Approved by:		portmgr (antoine after some EXP-runs)

33 files changed, 314 insertions, 13 deletions

diff --git a/security/linux-c6-cyrus-sasl2/Makefile b/security/linux-c6-cyrus-sasl2/Makefile
index d138e5c70d3b..0b7d83d74059 100644
--- a/security/linux-c6-cyrus-sasl2/Makefile
+++ b/security/linux-c6-cyrus-sasl2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cyrus-sasl2
 PORTVERSION=	2.1.23
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security linux
 DISTNAME=	cyrus-sasl-lib-${PORTVERSION}-${RPMVERSION}
 MASTER_SITES=	CENTOS_LINUX_UPDATES
@@ -12,8 +12,9 @@ MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer) (Linux CentOS ${LINUX_DIST_VER})
 
 ONLY_FOR_ARCHS=	i386 amd64
+
 .if defined(PACKAGE_BUILDING)
-SRC_DISTFILES=	cyrus-sasl-${PORTVERSION}-${RPMVERSION}.src.rpm
+SRC_DISTFILES= cyrus-sasl-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 .endif
 
 USE_LINUX=	c6
diff --git a/security/linux-c6-cyrus-sasl2/distinfo.x86_64 b/security/linux-c6-cyrus-sasl2/distinfo.x86_64
new file mode 100644
index 000000000000..1c65b5616c62
--- /dev/null
+++ b/security/linux-c6-cyrus-sasl2/distinfo.x86_64
@@ -0,0 +1,4 @@
+SHA256 (rpm/x86_64/centos/6.6/cyrus-sasl-lib-2.1.23-15.el6_6.2.x86_64.rpm) = 92bf37f8fba52b15726f6cade5bcf35c18acd305a3c472cb9360fedd515965bf
+SIZE (rpm/x86_64/centos/6.6/cyrus-sasl-lib-2.1.23-15.el6_6.2.x86_64.rpm) = 139644
+SHA256 (rpm/x86_64/centos/6.6/cyrus-sasl-2.1.23-15.el6_6.2.src.rpm) = a12449366385bb4ad18c1639c79e8999013e9e5cbd90474dfcc3c9269d8554ee
+SIZE (rpm/x86_64/centos/6.6/cyrus-sasl-2.1.23-15.el6_6.2.src.rpm) = 1671069
diff --git a/security/linux-c6-cyrus-sasl2/pkg-plist b/security/linux-c6-cyrus-sasl2/pkg-plist.i686
index 339989fec8b7..339989fec8b7 100644
--- a/security/linux-c6-cyrus-sasl2/pkg-plist
+++ b/security/linux-c6-cyrus-sasl2/pkg-plist.i686
diff --git a/security/linux-c6-cyrus-sasl2/pkg-plist.x86_64 b/security/linux-c6-cyrus-sasl2/pkg-plist.x86_64
new file mode 100644
index 000000000000..eeda2a333a36
--- /dev/null
+++ b/security/linux-c6-cyrus-sasl2/pkg-plist.x86_64
@@ -0,0 +1,30 @@
+usr/lib64/libsasl2.so.2
+usr/lib64/libsasl2.so.2.0.23
+usr/lib64/sasl2/libanonymous.so
+usr/lib64/sasl2/libanonymous.so.2
+usr/lib64/sasl2/libanonymous.so.2.0.23
+usr/lib64/sasl2/libsasldb.so
+usr/lib64/sasl2/libsasldb.so.2
+usr/lib64/sasl2/libsasldb.so.2.0.23
+usr/sbin/sasldblistusers2
+usr/sbin/saslpasswd2
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/appconvert.html
+%%PORTDOCS%%%%DOCSDIR%%/components.html
+%%PORTDOCS%%%%DOCSDIR%%/gssapi.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/install.html
+%%PORTDOCS%%%%DOCSDIR%%/macosx.html
+%%PORTDOCS%%%%DOCSDIR%%/mechanisms.html
+%%PORTDOCS%%%%DOCSDIR%%/options.html
+%%PORTDOCS%%%%DOCSDIR%%/plugprog.html
+%%PORTDOCS%%%%DOCSDIR%%/programming.html
+%%PORTDOCS%%%%DOCSDIR%%/readme.html
+%%PORTDOCS%%%%DOCSDIR%%/sysadmin.html
+%%PORTDOCS%%%%DOCSDIR%%/upgrading.html
+%%PORTDOCS%%%%DOCSDIR%%/windows.html
+@dir etc/sasl2
diff --git a/security/linux-c6-gnutls/distinfo.x86_64 b/security/linux-c6-gnutls/distinfo.x86_64
new file mode 100644
index 000000000000..5f5b8f6cae37
--- /dev/null
+++ b/security/linux-c6-gnutls/distinfo.x86_64
@@ -0,0 +1,4 @@
+SHA256 (rpm/x86_64/centos/6.6/gnutls-2.8.5-14.el6_5.x86_64.rpm) = eb3d9f8cad0b394e5b2a3255424e71838464c21d2125d45c0827e6b6f68e99d9
+SIZE (rpm/x86_64/centos/6.6/gnutls-2.8.5-14.el6_5.x86_64.rpm) = 354252
+SHA256 (rpm/x86_64/centos/6.6/gnutls-2.8.5-14.el6_5.src.rpm) = c501ecc43d6caf9432cd44f040363c8ed5001e923001c5c7d28a6055766fb5f1
+SIZE (rpm/x86_64/centos/6.6/gnutls-2.8.5-14.el6_5.src.rpm) = 6322859
diff --git a/security/linux-c6-gnutls/pkg-plist b/security/linux-c6-gnutls/pkg-plist.i686
index 06b01e5fff9e..06b01e5fff9e 100644
--- a/security/linux-c6-gnutls/pkg-plist
+++ b/security/linux-c6-gnutls/pkg-plist.i686
diff --git a/security/linux-c6-gnutls/pkg-plist.x86_64 b/security/linux-c6-gnutls/pkg-plist.x86_64
new file mode 100644
index 000000000000..017c5a807923
--- /dev/null
+++ b/security/linux-c6-gnutls/pkg-plist.x86_64
@@ -0,0 +1,20 @@
+usr/lib64/libgnutls-extra.so.26.14.12
+usr/lib64/libgnutls-extra.so.26
+usr/lib64/libgnutls.so.26.14.12
+usr/lib64/libgnutls.so.26
+usr/lib64/libgnutlsxx.so.26.14.12
+usr/lib64/libgnutlsxx.so.26
+usr/share/doc/gnutls-%%PORTVERSION%%/AUTHORS
+usr/share/doc/gnutls-%%PORTVERSION%%/COPYING
+usr/share/doc/gnutls-%%PORTVERSION%%/COPYING.LIB
+usr/share/doc/gnutls-%%PORTVERSION%%/README
+usr/share/locale/cs/LC_MESSAGES/libgnutls.mo
+usr/share/locale/de/LC_MESSAGES/libgnutls.mo
+usr/share/locale/en@boldquot/LC_MESSAGES/libgnutls.mo
+usr/share/locale/en@quot/LC_MESSAGES/libgnutls.mo
+usr/share/locale/fr/LC_MESSAGES/libgnutls.mo
+usr/share/locale/ms/LC_MESSAGES/libgnutls.mo
+usr/share/locale/nl/LC_MESSAGES/libgnutls.mo
+usr/share/locale/pl/LC_MESSAGES/libgnutls.mo
+usr/share/locale/sv/LC_MESSAGES/libgnutls.mo
+usr/share/locale/vi/LC_MESSAGES/libgnutls.mo
diff --git a/security/linux-c6-libgcrypt/Makefile b/security/linux-c6-libgcrypt/Makefile
index 1a494ae09ed0..af7cb3f3a7a6 100644
--- a/security/linux-c6-libgcrypt/Makefile
+++ b/security/linux-c6-libgcrypt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libgcrypt
 PORTVERSION=	1.4.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security linux
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -14,8 +14,6 @@ USE_LINUX_RPM=	yes
 RPMVERSION=	11.el6_4
 USE_LDCONFIG=	yes
 
-PLIST_FILES=	lib/libgcrypt.so.11 lib/.libgcrypt.so.11.hmac lib/libgcrypt.so.11.5.3
-PLIST_DIRS=	etc/gcrypt
 DOCSDIR=	usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS COPYING.LIB NEWS THANKS
 DESCR=		${.CURDIR}/../libgcrypt/pkg-descr
diff --git a/security/linux-c6-libgcrypt/distinfo.x86_64 b/security/linux-c6-libgcrypt/distinfo.x86_64
new file mode 100644
index 000000000000..2e4f7d4746b3
--- /dev/null
+++ b/security/linux-c6-libgcrypt/distinfo.x86_64
@@ -0,0 +1,4 @@
+SHA256 (rpm/x86_64/centos/6.6/libgcrypt-1.4.5-11.el6_4.x86_64.rpm) = bdda38f5a6dbfe6a1d07dd6d5f38aace66ff0a19c4575c834a6fdb0f8a226c01
+SIZE (rpm/x86_64/centos/6.6/libgcrypt-1.4.5-11.el6_4.x86_64.rpm) = 234008
+SHA256 (rpm/x86_64/centos/6.6/libgcrypt-1.4.5-11.el6_4.src.rpm) = c963b5bf4c84d5798d987e86b4e600ce3c7ae03e035096d88982385a81dcdbbc
+SIZE (rpm/x86_64/centos/6.6/libgcrypt-1.4.5-11.el6_4.src.rpm) = 1257444
diff --git a/security/linux-c6-libgcrypt/pkg-plist.i686 b/security/linux-c6-libgcrypt/pkg-plist.i686
new file mode 100644
index 000000000000..82854eea1c93
--- /dev/null
+++ b/security/linux-c6-libgcrypt/pkg-plist.i686
@@ -0,0 +1,4 @@
+lib/.libgcrypt.so.11.hmac
+lib/libgcrypt.so.11
+lib/libgcrypt.so.11.5.3
+@dir etc/gcrypt
diff --git a/security/linux-c6-libgcrypt/pkg-plist.x86_64 b/security/linux-c6-libgcrypt/pkg-plist.x86_64
new file mode 100644
index 000000000000..95faea1b75f2
--- /dev/null
+++ b/security/linux-c6-libgcrypt/pkg-plist.x86_64
@@ -0,0 +1,4 @@
+lib64/.libgcrypt.so.11.hmac
+lib64/libgcrypt.so.11
+lib64/libgcrypt.so.11.5.3
+@dir etc/gcrypt
diff --git a/security/linux-c6-libgpg-error/distinfo.x86_64 b/security/linux-c6-libgpg-error/distinfo.x86_64
new file mode 100644
index 000000000000..cd62d63207da
--- /dev/null
+++ b/security/linux-c6-libgpg-error/distinfo.x86_64
@@ -0,0 +1,4 @@
+SHA256 (rpm/x86_64/centos/6.6/libgpg-error-1.7-4.el6.x86_64.rpm) = cb494b9932409f9b592d213b8cf8f3ef2ca9a7af16b9cdfcca7998e33a20674a
+SIZE (rpm/x86_64/centos/6.6/libgpg-error-1.7-4.el6.x86_64.rpm) = 60628
+SHA256 (rpm/x86_64/centos/6.6/libgpg-error-1.7-4.el6.src.rpm) = 955d0a4d5aaa3539c7a58d94cef41ef09a0d8cc08c0aeb5b0986c623aebd53be
+SIZE (rpm/x86_64/centos/6.6/libgpg-error-1.7-4.el6.src.rpm) = 413579
diff --git a/security/linux-c6-libgpg-error/pkg-plist b/security/linux-c6-libgpg-error/pkg-plist.i686
index 32503fbdf793..32503fbdf793 100644
--- a/security/linux-c6-libgpg-error/pkg-plist
+++ b/security/linux-c6-libgpg-error/pkg-plist.i686
diff --git a/security/linux-c6-libgpg-error/pkg-plist.x86_64 b/security/linux-c6-libgpg-error/pkg-plist.x86_64
new file mode 100644
index 000000000000..27359db67ff5
--- /dev/null
+++ b/security/linux-c6-libgpg-error/pkg-plist.x86_64
@@ -0,0 +1,34 @@
+lib64/libgpg-error.so.0
+lib64/libgpg-error.so.0.5.0
+usr/bin/gpg-error
+usr/share/doc/libgpg-error-1.7/AUTHORS
+usr/share/doc/libgpg-error-1.7/COPYING
+usr/share/doc/libgpg-error-1.7/COPYING.LIB
+usr/share/doc/libgpg-error-1.7/ChangeLog
+usr/share/doc/libgpg-error-1.7/NEWS
+usr/share/doc/libgpg-error-1.7/README
+usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
+usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo
+usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo
+usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo
+usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo
+usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo
+@dirrmtry usr/share/locale/vi/LC_MESSAGES
+@dirrmtry usr/share/locale/vi
+@dirrmtry usr/share/locale/sv/LC_MESSAGES
+@dirrmtry usr/share/locale/sv
+@dirrmtry usr/share/locale/ro/LC_MESSAGES
+@dirrmtry usr/share/locale/ro
+@dirrmtry usr/share/locale/pl/LC_MESSAGES
+@dirrmtry usr/share/locale/pl
+@dirrmtry usr/share/locale/fr/LC_MESSAGES
+@dirrmtry usr/share/locale/fr
+@dirrmtry usr/share/locale/de/LC_MESSAGES
+@dirrmtry usr/share/locale/de
+@dirrmtry usr/share/locale
+@dirrmtry usr/share/doc/libgpg-error-1.7
+@dirrmtry usr/share/doc
+@dirrmtry usr/share
+@dirrmtry usr/bin
+@dirrmtry usr
+@dirrmtry lib64
diff --git a/security/linux-c6-libssh2/Makefile b/security/linux-c6-libssh2/Makefile
index e1ee1a3c1aca..37fc350ce7a0 100644
--- a/security/linux-c6-libssh2/Makefile
+++ b/security/linux-c6-libssh2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libssh2
 PORTVERSION=	1.4.2
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	security linux
 MASTER_SITES=	CENTOS_LINUX_UPDATES
 
@@ -20,7 +20,6 @@ USE_LINUX_APPS=	openssl
 USE_LINUX_RPM=	yes
 USE_LDCONFIG=	yes
 
-PLIST_FILES=	usr/lib/libssh2.so.1 usr/lib/libssh2.so.1.0.1
 DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/security/linux-c6-libssh2/distinfo.x86_64 b/security/linux-c6-libssh2/distinfo.x86_64
new file mode 100644
index 000000000000..bf126066a4b6
--- /dev/null
+++ b/security/linux-c6-libssh2/distinfo.x86_64
@@ -0,0 +1,4 @@
+SHA256 (rpm/x86_64/centos/6.6/libssh2-1.4.2-1.el6_6.1.x86_64.rpm) = 2e07438d7789237523d415dd3a92d99215867b7641ad267b424880b0dca9c89c
+SIZE (rpm/x86_64/centos/6.6/libssh2-1.4.2-1.el6_6.1.x86_64.rpm) = 125616
+SHA256 (rpm/x86_64/centos/6.6/libssh2-1.4.2-1.el6_6.1.src.rpm) = 10684ae17a697ab8cce1cfca1dcd8915c0a7d2a5f4e84f568bf52dabe97c1c6c
+SIZE (rpm/x86_64/centos/6.6/libssh2-1.4.2-1.el6_6.1.src.rpm) = 693407
diff --git a/security/linux-c6-libssh2/pkg-plist.i686 b/security/linux-c6-libssh2/pkg-plist.i686
new file mode 100644
index 000000000000..108739ce7acf
--- /dev/null
+++ b/security/linux-c6-libssh2/pkg-plist.i686
@@ -0,0 +1,2 @@
+usr/lib/libssh2.so.1
+usr/lib/libssh2.so.1.0.1
diff --git a/security/linux-c6-libssh2/pkg-plist.x86_64 b/security/linux-c6-libssh2/pkg-plist.x86_64
new file mode 100644
index 000000000000..be2b9da626f4
--- /dev/null
+++ b/security/linux-c6-libssh2/pkg-plist.x86_64
@@ -0,0 +1,2 @@
+usr/lib64/libssh2.so.1
+usr/lib64/libssh2.so.1.0.1
diff --git a/security/linux-c6-libtasn1/Makefile b/security/linux-c6-libtasn1/Makefile
index e6909f06f711..f9ca7dbb4d47 100644
--- a/security/linux-c6-libtasn1/Makefile
+++ b/security/linux-c6-libtasn1/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libtasn1
 PORTVERSION=	2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security linux
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -18,7 +18,6 @@ USE_LINUX_RPM=	yes
 RPMVERSION=	6.el6_5
 USE_LDCONFIG=	yes
 
-PLIST_FILES=	usr/lib/libtasn1.so.3 usr/lib/libtasn1.so.3.1.6
 DOCSDIR=	${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	AUTHORS COPYING COPYING.LIB ChangeLog NEWS README THANKS TODO libtasn1.pdf
 DESCR=		${.CURDIR}/../libtasn1/pkg-descr
diff --git a/security/linux-c6-libtasn1/distinfo.x86_64 b/security/linux-c6-libtasn1/distinfo.x86_64
new file mode 100644
index 000000000000..477f0946140a
--- /dev/null
+++ b/security/linux-c6-libtasn1/distinfo.x86_64
@@ -0,0 +1,4 @@
+SHA256 (rpm/x86_64/centos/6.6/libtasn1-2.3-6.el6_5.x86_64.rpm) = ee516dac9b0d36fbee5f77e443be13a7e4ca60c3f3105bdc50e112c7ae834780
+SIZE (rpm/x86_64/centos/6.6/libtasn1-2.3-6.el6_5.x86_64.rpm) = 243868
+SHA256 (rpm/x86_64/centos/6.6/libtasn1-2.3-6.el6_5.src.rpm) = 24fe6cafdf3ed4c45d49395bdfd7a73e1a4b8c7fab9503fea801a6b68234b199
+SIZE (rpm/x86_64/centos/6.6/libtasn1-2.3-6.el6_5.src.rpm) = 1501312
diff --git a/security/linux-c6-libtasn1/pkg-plist.i686 b/security/linux-c6-libtasn1/pkg-plist.i686
new file mode 100644
index 000000000000..e59abd0f5a69
--- /dev/null
+++ b/security/linux-c6-libtasn1/pkg-plist.i686
@@ -0,0 +1,2 @@
+usr/lib/libtasn1.so.3
+usr/lib/libtasn1.so.3.1.6
diff --git a/security/linux-c6-libtasn1/pkg-plist.x86_64 b/security/linux-c6-libtasn1/pkg-plist.x86_64
new file mode 100644
index 000000000000..a31a4edb9694
--- /dev/null
+++ b/security/linux-c6-libtasn1/pkg-plist.x86_64
@@ -0,0 +1,2 @@
+usr/lib64/libtasn1.so.3
+usr/lib64/libtasn1.so.3.1.6
diff --git a/security/linux-c6-nss/Makefile b/security/linux-c6-nss/Makefile
index ec4397b17865..e3ed93d60e1c 100644
--- a/security/linux-c6-nss/Makefile
+++ b/security/linux-c6-nss/Makefile
@@ -23,9 +23,9 @@ USE_LINUX_APPS=	nspr sqlite3
 USE_LINUX_RPM=	yes
 USE_LDCONFIG=	yes
 
-SRC_DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX} \
-		nss-util-3.19.1-1.el6_6.src.rpm \
-		nss-softokn-3.14.3-22.el6_6.src.rpm
+SRC_DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE \
+		nss-util-3.19.1-1.el6_6.src.rpm:SOURCE \
+		nss-softokn-3.14.3-22.el6_6.src.rpm:SOURCE
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/security/linux-c6-nss/distinfo.x86_64 b/security/linux-c6-nss/distinfo.x86_64
new file mode 100644
index 000000000000..36f888017229
--- /dev/null
+++ b/security/linux-c6-nss/distinfo.x86_64
@@ -0,0 +1,14 @@
+SHA256 (rpm/x86_64/centos/6.6/nss-3.19.1-3.el6_6.x86_64.rpm) = 527b9685f9466312d5dc12fd5c95a17eaca308b93cb6e6e2b6e90f67b6199839
+SIZE (rpm/x86_64/centos/6.6/nss-3.19.1-3.el6_6.x86_64.rpm) = 877004
+SHA256 (rpm/x86_64/centos/6.6/nss-util-3.19.1-1.el6_6.x86_64.rpm) = 6d18c09300d59c832734701ff7403398a46ef2faa8897ae52f88d204a2d610a2
+SIZE (rpm/x86_64/centos/6.6/nss-util-3.19.1-1.el6_6.x86_64.rpm) = 67636
+SHA256 (rpm/x86_64/centos/6.6/nss-softokn-3.14.3-22.el6_6.x86_64.rpm) = fb22476443aa77b1ec969dc09416a9cabde6e652e4712a6a33266a9140c2b7d9
+SIZE (rpm/x86_64/centos/6.6/nss-softokn-3.14.3-22.el6_6.x86_64.rpm) = 268076
+SHA256 (rpm/x86_64/centos/6.6/nss-softokn-freebl-3.14.3-22.el6_6.x86_64.rpm) = 1078c1194369da908b57512aa6f76655b26694f00106756e290852deda12742b
+SIZE (rpm/x86_64/centos/6.6/nss-softokn-freebl-3.14.3-22.el6_6.x86_64.rpm) = 170992
+SHA256 (rpm/x86_64/centos/6.6/nss-3.19.1-3.el6_6.src.rpm) = b30fb858dcec5a154713cfd27386aa48def4cf819f2ed39f586c513f8eb1d209
+SIZE (rpm/x86_64/centos/6.6/nss-3.19.1-3.el6_6.src.rpm) = 5605304
+SHA256 (rpm/x86_64/centos/6.6/nss-util-3.19.1-1.el6_6.src.rpm) = 8b4f5d17d8260f788fc58e0d22bc4f6d79481822be4218403e3d8dfc7f92229b
+SIZE (rpm/x86_64/centos/6.6/nss-util-3.19.1-1.el6_6.src.rpm) = 748693
+SHA256 (rpm/x86_64/centos/6.6/nss-softokn-3.14.3-22.el6_6.src.rpm) = db139757d5d628729ad254de68e45d8595c2727159d991388a93296e221b2c81
+SIZE (rpm/x86_64/centos/6.6/nss-softokn-3.14.3-22.el6_6.src.rpm) = 1302552
diff --git a/security/linux-c6-nss/pkg-plist b/security/linux-c6-nss/pkg-plist.i686
index bc7c26057283..bc7c26057283 100644
--- a/security/linux-c6-nss/pkg-plist
+++ b/security/linux-c6-nss/pkg-plist.i686
diff --git a/security/linux-c6-nss/pkg-plist.x86_64 b/security/linux-c6-nss/pkg-plist.x86_64
new file mode 100644
index 000000000000..eede9d3bfeef
--- /dev/null
+++ b/security/linux-c6-nss/pkg-plist.x86_64
@@ -0,0 +1,27 @@
+@comment file listing
+etc/pki/nssdb/cert8.db
+etc/pki/nssdb/key3.db
+etc/pki/nssdb/secmod.db
+lib64/libfreebl3.chk
+lib64/libfreebl3.so
+usr/lib64/libfreebl3.chk
+usr/lib64/libfreebl3.so
+usr/lib64/libnss3.so
+usr/lib64/nss/libnssckbi.so
+usr/lib64/libnssdbm3.chk
+usr/lib64/libnssdbm3.so
+usr/lib64/libnsspem.so
+usr/lib64/libnssutil3.so
+usr/lib64/libsmime3.so
+usr/lib64/libssl3.so
+usr/lib64/libsoftokn3.chk
+usr/lib64/libsoftokn3.so
+usr/lib64/nss/unsupported-tools/shlibsign
+usr/lib64/nss/unsupported-tools/bltest
+usr/lib64/nss/unsupported-tools/fipstest
+@comment non-empty directory listing in revers order
+@dirrm etc/pki/nssdb
+@dirrmtry etc/pki
+@dirrm usr/lib64/nss/unsupported-tools
+@dirrm usr/lib64/nss/saved
+@dirrm usr/lib64/nss
diff --git a/security/linux-c6-openssl-compat/Makefile b/security/linux-c6-openssl-compat/Makefile
index 2e93e812bfa8..9b57f459f45c 100644
--- a/security/linux-c6-openssl-compat/Makefile
+++ b/security/linux-c6-openssl-compat/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openssl-compat
 PORTVERSION=	0.9.8e
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security linux
 DISTNAME=	openssl098e-${PORTVERSION}-${RPMVERSION}
 
@@ -22,6 +22,10 @@ PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 DESCR=		${.CURDIR}/../openssl/pkg-descr
 
 post-install:
+.	if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64"
+	@cd ${STAGEDIR}${PREFIX}/usr/lib64 && ${LN} -sf libssl.so.6 libssl.so.7
+.	else
 	@cd ${STAGEDIR}${PREFIX}/usr/lib && ${LN} -sf libssl.so.6 libssl.so.7
+.	endif
 
 .include <bsd.port.mk>
diff --git a/security/linux-c6-openssl-compat/distinfo.x86_64 b/security/linux-c6-openssl-compat/distinfo.x86_64
new file mode 100644
index 000000000000..d410f8eae75a
--- /dev/null
+++ b/security/linux-c6-openssl-compat/distinfo.x86_64
@@ -0,0 +1,4 @@
+SHA256 (rpm/x86_64/centos/6.6/openssl098e-0.9.8e-18.el6_5.2.x86_64.rpm) = 5da4e81c728ae6199597cdd1107e244b7920e1d3425828db435bff7b22c62509
+SIZE (rpm/x86_64/centos/6.6/openssl098e-0.9.8e-18.el6_5.2.x86_64.rpm) = 779620
+SHA256 (rpm/x86_64/centos/6.6/openssl098e-0.9.8e-18.el6_5.2.src.rpm) = 25cdd2928d00f8aec7e84cd5937ecf9ad869256c980634a9c7132e75cfeccce2
+SIZE (rpm/x86_64/centos/6.6/openssl098e-0.9.8e-18.el6_5.2.src.rpm) = 3101400
diff --git a/security/linux-c6-openssl-compat/pkg-plist b/security/linux-c6-openssl-compat/pkg-plist.i686
index 84c1ac1c9eb8..84c1ac1c9eb8 100644
--- a/security/linux-c6-openssl-compat/pkg-plist
+++ b/security/linux-c6-openssl-compat/pkg-plist.i686
diff --git a/security/linux-c6-openssl-compat/pkg-plist.x86_64 b/security/linux-c6-openssl-compat/pkg-plist.x86_64
new file mode 100644
index 000000000000..af81880ae1a7
--- /dev/null
+++ b/security/linux-c6-openssl-compat/pkg-plist.x86_64
@@ -0,0 +1,26 @@
+@comment file listing
+usr/lib64/.libcrypto.so.0.9.8e.hmac
+usr/lib64/.libcrypto.so.6.hmac
+usr/lib64/.libssl.so.0.9.8e.hmac
+usr/lib64/.libssl.so.6.hmac
+usr/lib64/libcrypto.so.0.9.8e
+usr/lib64/libcrypto.so.6
+usr/lib64/libssl.so.0.9.8e
+usr/lib64/libssl.so.6
+usr/lib64/libssl.so.7
+usr/lib64/openssl098e/engines/lib4758cca.so
+usr/lib64/openssl098e/engines/libaep.so
+usr/lib64/openssl098e/engines/libatalla.so
+usr/lib64/openssl098e/engines/libchil.so
+usr/lib64/openssl098e/engines/libcswift.so
+usr/lib64/openssl098e/engines/libgmp.so
+usr/lib64/openssl098e/engines/libnuron.so
+usr/lib64/openssl098e/engines/libsureware.so
+usr/lib64/openssl098e/engines/libubsec.so
+usr/share/doc/openssl098e-0.9.8e/CHANGES
+usr/share/doc/openssl098e-0.9.8e/FAQ
+usr/share/doc/openssl098e-0.9.8e/INSTALL
+usr/share/doc/openssl098e-0.9.8e/LICENSE
+usr/share/doc/openssl098e-0.9.8e/NEWS
+usr/share/doc/openssl098e-0.9.8e/README
+usr/share/doc/openssl098e-0.9.8e/README.FIPS
diff --git a/security/linux-c6-openssl/distinfo.x86_64 b/security/linux-c6-openssl/distinfo.x86_64
new file mode 100644
index 000000000000..6107fef4afe8
--- /dev/null
+++ b/security/linux-c6-openssl/distinfo.x86_64
@@ -0,0 +1,4 @@
+SHA256 (rpm/x86_64/centos/6.6/openssl-1.0.1e-30.el6.11.x86_64.rpm) = 37d451930cd944d76e4d3633c2358c09f002bb728dd5242dabf7276cf19b08b7
+SIZE (rpm/x86_64/centos/6.6/openssl-1.0.1e-30.el6.11.x86_64.rpm) = 1592152
+SHA256 (rpm/x86_64/centos/6.6/openssl-1.0.1e-30.el6.11.src.rpm) = aac901f048953cae0a9d6962636edecb05142f577eca9b5eef37831be727e109
+SIZE (rpm/x86_64/centos/6.6/openssl-1.0.1e-30.el6.11.src.rpm) = 3204421
diff --git a/security/linux-c6-openssl/pkg-plist b/security/linux-c6-openssl/pkg-plist.i686
index dd9a2b7ae41c..dd9a2b7ae41c 100644
--- a/security/linux-c6-openssl/pkg-plist
+++ b/security/linux-c6-openssl/pkg-plist.i686
diff --git a/security/linux-c6-openssl/pkg-plist.x86_64 b/security/linux-c6-openssl/pkg-plist.x86_64
new file mode 100644
index 000000000000..851b8c2ed145
--- /dev/null
+++ b/security/linux-c6-openssl/pkg-plist.x86_64
@@ -0,0 +1,101 @@
+@comment file listing
+etc/pki/tls/certs/Makefile
+etc/pki/tls/certs/make-dummy-cert
+etc/pki/tls/certs/renew-dummy-cert
+etc/pki/tls/misc/CA
+etc/pki/tls/misc/c_hash
+etc/pki/tls/misc/c_info
+etc/pki/tls/misc/c_issuer
+etc/pki/tls/misc/c_name
+etc/pki/tls/openssl.cnf
+usr/lib64/libcrypto.so.%%PORTVERSION%%
+usr/lib64/libcrypto.so.10
+usr/lib64/libssl.so.%%PORTVERSION%%
+usr/lib64/libssl.so.10
+usr/lib64/.libcrypto.so.%%PORTVERSION%%.hmac
+usr/lib64/.libcrypto.so.10.hmac
+usr/lib64/.libssl.so.%%PORTVERSION%%.hmac
+usr/lib64/.libssl.so.10.hmac
+usr/bin/openssl
+usr/lib64/openssl/engines/lib4758cca.so
+usr/lib64/openssl/engines/libaep.so
+usr/lib64/openssl/engines/libatalla.so
+usr/lib64/openssl/engines/libcapi.so
+usr/lib64/openssl/engines/libchil.so
+usr/lib64/openssl/engines/libcswift.so
+usr/lib64/openssl/engines/libgmp.so
+usr/lib64/openssl/engines/libnuron.so
+usr/lib64/openssl/engines/libpadlock.so
+usr/lib64/openssl/engines/libsureware.so
+usr/lib64/openssl/engines/libubsec.so
+usr/share/doc/openssl-%%PORTVERSION%%/CHANGES
+usr/share/doc/openssl-%%PORTVERSION%%/FAQ
+usr/share/doc/openssl-%%PORTVERSION%%/INSTALL
+usr/share/doc/openssl-%%PORTVERSION%%/LICENSE
+usr/share/doc/openssl-%%PORTVERSION%%/NEWS
+usr/share/doc/openssl-%%PORTVERSION%%/README
+usr/share/doc/openssl-%%PORTVERSION%%/README.FIPS
+usr/share/doc/openssl-%%PORTVERSION%%/c-indentation.el
+usr/share/doc/openssl-%%PORTVERSION%%/openssl.txt
+usr/share/doc/openssl-%%PORTVERSION%%/openssl_button.gif
+usr/share/doc/openssl-%%PORTVERSION%%/openssl_button.html
+usr/share/doc/openssl-%%PORTVERSION%%/ssleay.txt
+usr/share/man/man1/asn1parse.1ssl.gz
+usr/share/man/man1/ca.1ssl.gz
+usr/share/man/man1/ciphers.1ssl.gz
+usr/share/man/man1/crl.1ssl.gz
+usr/share/man/man1/cms.1ssl.gz
+usr/share/man/man1/genpkey.1ssl.gz
+usr/share/man/man1/pkey.1ssl.gz
+usr/share/man/man1/pkeyparam.1ssl.gz
+usr/share/man/man1/pkeyutl.1ssl.gz
+usr/share/man/man1/ts.1ssl.gz
+usr/share/man/man1/tsget.1ssl.gz
+usr/share/man/man1/crl2pkcs7.1ssl.gz
+usr/share/man/man1/dgst.1ssl.gz
+usr/share/man/man1/dhparam.1ssl.gz
+usr/share/man/man1/dsa.1ssl.gz
+usr/share/man/man1/dsaparam.1ssl.gz
+usr/share/man/man1/ec.1ssl.gz
+usr/share/man/man1/ecparam.1ssl.gz
+usr/share/man/man1/enc.1ssl.gz
+usr/share/man/man1/errstr.1ssl.gz
+usr/share/man/man1/gendsa.1ssl.gz
+usr/share/man/man1/genrsa.1ssl.gz
+usr/share/man/man1/md2.1ssl.gz
+usr/share/man/man1/md4.1ssl.gz
+usr/share/man/man1/md5.1ssl.gz
+usr/share/man/man1/mdc2.1ssl.gz
+usr/share/man/man1/nseq.1ssl.gz
+usr/share/man/man1/ocsp.1ssl.gz
+usr/share/man/man1/openssl.1ssl.gz
+usr/share/man/man1/pkcs12.1ssl.gz
+usr/share/man/man1/pkcs7.1ssl.gz
+usr/share/man/man1/pkcs8.1ssl.gz
+usr/share/man/man1/req.1ssl.gz
+usr/share/man/man1/ripemd160.1ssl.gz
+usr/share/man/man1/rsa.1ssl.gz
+usr/share/man/man1/rsautl.1ssl.gz
+usr/share/man/man1/s_client.1ssl.gz
+usr/share/man/man1/s_server.1ssl.gz
+usr/share/man/man1/s_time.1ssl.gz
+usr/share/man/man1/sess_id.1ssl.gz
+usr/share/man/man1/sha.1ssl.gz
+usr/share/man/man1/sha1.1ssl.gz
+usr/share/man/man1/smime.1ssl.gz
+usr/share/man/man1/speed.1ssl.gz
+usr/share/man/man1/spkac.1ssl.gz
+usr/share/man/man1/sslpasswd.1ssl.gz
+usr/share/man/man1/sslrand.1ssl.gz
+usr/share/man/man1/verify.1ssl.gz
+usr/share/man/man1/version.1ssl.gz
+usr/share/man/man1/x509.1ssl.gz
+usr/share/man/man5/config.5ssl.gz
+usr/share/man/man5/openssl.cnf.5ssl.gz
+usr/share/man/man5/x509v3_config.5ssl.gz
+usr/share/man/man7/des_modes.7ssl.gz
+@dir etc/pki/CA/private
+@dir etc/pki/CA/certs
+@dir etc/pki/CA/crl
+@dir etc/pki/CA/newcerts
+@dir etc/pki/tls/private