6 files changed, 33 insertions, 42 deletions

diff --git a/security/linux-c6-openssl/Makefile b/security/linux-c6-openssl/Makefile
index 63d57c8aca9a..9e14c4a2ae25 100644
--- a/security/linux-c6-openssl/Makefile
+++ b/security/linux-c6-openssl/Makefile
@@ -9,14 +9,10 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	OpenSSL toolkit (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-f10-openssl-[0-9]*
-
-USES=		linux:c6
-USE_LINUX_RPM=	yes
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 RPMVERSION=	48.el6_8.3
+USES=		linux:c6
 USE_LDCONFIG=	yes
-
-PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+USE_LINUX_RPM=	yes
 
 .include <bsd.port.mk>
diff --git a/security/linux-c6-openssl/distinfo b/security/linux-c6-openssl/distinfo
new file mode 100644
index 000000000000..9f27c6a09752
--- /dev/null
+++ b/security/linux-c6-openssl/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485620921
+SHA256 (centos/openssl-1.0.1e-48.el6_8.3.i686.rpm) = 9874c5eca9551dfddb6ed3ca0ef22d2a18ebd841357efde25a2ff666ed2fef40
+SIZE (centos/openssl-1.0.1e-48.el6_8.3.i686.rpm) = 1590452
+SHA256 (centos/openssl-1.0.1e-48.el6_8.3.x86_64.rpm) = 1df60e7215f4ef3aba3dfc49dd58f8b7aa74338dff8d3f43fc010a0588edaaff
+SIZE (centos/openssl-1.0.1e-48.el6_8.3.x86_64.rpm) = 1598920
+SHA256 (centos/openssl-1.0.1e-48.el6_8.3.src.rpm) = 5c25d5c38f69cfd74a758396335c606b0c3ad094d84a3b1927f4d5a672facfe1
+SIZE (centos/openssl-1.0.1e-48.el6_8.3.src.rpm) = 3264783
diff --git a/security/linux-c6-openssl/distinfo.i386 b/security/linux-c6-openssl/distinfo.i386
deleted file mode 100644
index b55a19cdd42a..000000000000
--- a/security/linux-c6-openssl/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1475153503
-SHA256 (rpm/i686/centos/6.8/openssl-1.0.1e-48.el6_8.3.i686.rpm) = 9874c5eca9551dfddb6ed3ca0ef22d2a18ebd841357efde25a2ff666ed2fef40
-SIZE (rpm/i686/centos/6.8/openssl-1.0.1e-48.el6_8.3.i686.rpm) = 1590452
-SHA256 (rpm/i686/centos/6.8/openssl-1.0.1e-48.el6_8.3.src.rpm) = 5c25d5c38f69cfd74a758396335c606b0c3ad094d84a3b1927f4d5a672facfe1
-SIZE (rpm/i686/centos/6.8/openssl-1.0.1e-48.el6_8.3.src.rpm) = 3264783
diff --git a/security/linux-c6-openssl/distinfo.x86_64 b/security/linux-c6-openssl/distinfo.x86_64
deleted file mode 100644
index 11ecb0fa5ff6..000000000000
--- a/security/linux-c6-openssl/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1475153489
-SHA256 (rpm/x86_64/centos/6.8/openssl-1.0.1e-48.el6_8.3.i686.rpm) = 9874c5eca9551dfddb6ed3ca0ef22d2a18ebd841357efde25a2ff666ed2fef40
-SIZE (rpm/x86_64/centos/6.8/openssl-1.0.1e-48.el6_8.3.i686.rpm) = 1590452
-SHA256 (rpm/x86_64/centos/6.8/openssl-1.0.1e-48.el6_8.3.x86_64.rpm) = 1df60e7215f4ef3aba3dfc49dd58f8b7aa74338dff8d3f43fc010a0588edaaff
-SIZE (rpm/x86_64/centos/6.8/openssl-1.0.1e-48.el6_8.3.x86_64.rpm) = 1598920
-SHA256 (rpm/x86_64/centos/6.8/openssl-1.0.1e-48.el6_8.3.src.rpm) = 5c25d5c38f69cfd74a758396335c606b0c3ad094d84a3b1927f4d5a672facfe1
-SIZE (rpm/x86_64/centos/6.8/openssl-1.0.1e-48.el6_8.3.src.rpm) = 3264783
diff --git a/security/linux-c6-openssl/pkg-plist.x86_64 b/security/linux-c6-openssl/pkg-plist.amd64
index f9bbd54019d2..2a64ab46a3d2 100644
--- a/security/linux-c6-openssl/pkg-plist.x86_64
+++ b/security/linux-c6-openssl/pkg-plist.amd64
@@ -8,13 +8,13 @@ etc/pki/tls/misc/c_issuer
 etc/pki/tls/misc/c_name
 etc/pki/tls/openssl.cnf
 usr/bin/openssl
-usr/lib/.libcrypto.so.%%PORTVERSION%%.hmac
+usr/lib/.libcrypto.so.1.0.1e.hmac
 usr/lib/.libcrypto.so.10.hmac
-usr/lib/.libssl.so.%%PORTVERSION%%.hmac
+usr/lib/.libssl.so.1.0.1e.hmac
 usr/lib/.libssl.so.10.hmac
-usr/lib/libcrypto.so.%%PORTVERSION%%
+usr/lib/libcrypto.so.1.0.1e
 usr/lib/libcrypto.so.10
-usr/lib/libssl.so.%%PORTVERSION%%
+usr/lib/libssl.so.1.0.1e
 usr/lib/libssl.so.10
 usr/lib/openssl/engines/lib4758cca.so
 usr/lib/openssl/engines/libaep.so
@@ -27,13 +27,13 @@ usr/lib/openssl/engines/libnuron.so
 usr/lib/openssl/engines/libpadlock.so
 usr/lib/openssl/engines/libsureware.so
 usr/lib/openssl/engines/libubsec.so
-usr/lib64/.libcrypto.so.%%PORTVERSION%%.hmac
+usr/lib64/.libcrypto.so.1.0.1e.hmac
 usr/lib64/.libcrypto.so.10.hmac
-usr/lib64/.libssl.so.%%PORTVERSION%%.hmac
+usr/lib64/.libssl.so.1.0.1e.hmac
 usr/lib64/.libssl.so.10.hmac
-usr/lib64/libcrypto.so.%%PORTVERSION%%
+usr/lib64/libcrypto.so.1.0.1e
 usr/lib64/libcrypto.so.10
-usr/lib64/libssl.so.%%PORTVERSION%%
+usr/lib64/libssl.so.1.0.1e
 usr/lib64/libssl.so.10
 usr/lib64/openssl/engines/lib4758cca.so
 usr/lib64/openssl/engines/libaep.so
diff --git a/security/linux-c6-openssl/pkg-plist.i386 b/security/linux-c6-openssl/pkg-plist.i386
index 8af38af21c68..a479595c21f2 100644
--- a/security/linux-c6-openssl/pkg-plist.i386
+++ b/security/linux-c6-openssl/pkg-plist.i386
@@ -7,15 +7,15 @@ etc/pki/tls/misc/c_info
 etc/pki/tls/misc/c_issuer
 etc/pki/tls/misc/c_name
 etc/pki/tls/openssl.cnf
-usr/lib/libcrypto.so.%%PORTVERSION%%
-usr/lib/libcrypto.so.10
-usr/lib/libssl.so.%%PORTVERSION%%
-usr/lib/libssl.so.10
-usr/lib/.libcrypto.so.%%PORTVERSION%%.hmac
+usr/bin/openssl
+usr/lib/.libcrypto.so.1.0.1e.hmac
 usr/lib/.libcrypto.so.10.hmac
-usr/lib/.libssl.so.%%PORTVERSION%%.hmac
+usr/lib/.libssl.so.1.0.1e.hmac
 usr/lib/.libssl.so.10.hmac
-usr/bin/openssl
+usr/lib/libcrypto.so.1.0.1e
+usr/lib/libcrypto.so.10
+usr/lib/libssl.so.1.0.1e
+usr/lib/libssl.so.10
 usr/lib/openssl/engines/lib4758cca.so
 usr/lib/openssl/engines/libaep.so
 usr/lib/openssl/engines/libatalla.so
@@ -42,14 +42,8 @@ usr/lib/openssl/engines/libubsec.so
 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/crl.1ssl.gz
 usr/share/man/man1/crl2pkcs7.1ssl.gz
 usr/share/man/man1/dgst.1ssl.gz
 usr/share/man/man1/dhparam.1ssl.gz
@@ -60,6 +54,7 @@ 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/genpkey.1ssl.gz
 usr/share/man/man1/genrsa.1ssl.gz
 usr/share/man/man1/md2.1ssl.gz
 usr/share/man/man1/md4.1ssl.gz
@@ -71,6 +66,9 @@ 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/pkey.1ssl.gz
+usr/share/man/man1/pkeyparam.1ssl.gz
+usr/share/man/man1/pkeyutl.1ssl.gz
 usr/share/man/man1/req.1ssl.gz
 usr/share/man/man1/ripemd160.1ssl.gz
 usr/share/man/man1/rsa.1ssl.gz
@@ -86,6 +84,8 @@ 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/ts.1ssl.gz
+usr/share/man/man1/tsget.1ssl.gz
 usr/share/man/man1/verify.1ssl.gz
 usr/share/man/man1/version.1ssl.gz
 usr/share/man/man1/x509.1ssl.gz
@@ -93,8 +93,8 @@ 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/CA/private
 @dir etc/pki/tls/private