3 files changed, 32 insertions, 32 deletions

diff --git a/security/linux-f10-openssl/Makefile b/security/linux-f10-openssl/Makefile
index c4b5d7e0f940..48cac87f85f6 100644
--- a/security/linux-f10-openssl/Makefile
+++ b/security/linux-f10-openssl/Makefile
@@ -1,25 +1,28 @@
-# New ports collection makefile for:	security/linux-f8-openssl
-# Date created:				2008-04-09
+# New ports collection makefile for:	security/linux-f10-openssl
+# Date created:				2009-05-03
 # Whom:					bsam
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openssl
-PORTVERSION=	0.9.8b
+PORTVERSION=	0.9.8g
 CATEGORIES=	security linux
-PKGNAMEPREFIX=	linux-f8-
+PKGNAMEPREFIX=	linux-f10-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	The OpenSSL toolkit (Linux Fedora 8)
+COMMENT=	The OpenSSL toolkit (Linux Fedora 10)
+
+CONFLICTS=	linux-openssl-[0-9]* linux-f8-openssl-[0-9]*
 
 USE_LINUX_RPM=	yes
-LINUX_DIST_VER=	8
-RPMVERSION=	17.fc8
+LINUX_DIST_VER=	10
+RPMVERSION=	12.fc10
 BRANDELF_FILES=	usr/bin/openssl
 USE_LDCONFIG=	yes
 
+PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/security/linux-f10-openssl/distinfo.i386 b/security/linux-f10-openssl/distinfo.i386
index 05e4bb254784..70ad27930b48 100644
--- a/security/linux-f10-openssl/distinfo.i386
+++ b/security/linux-f10-openssl/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/8/openssl-0.9.8b-17.fc8.i386.rpm) = e18d1bf8915814ce848c2e2acdfe2bfe
-SHA256 (rpm/i386/fedora/8/openssl-0.9.8b-17.fc8.i386.rpm) = d13ebc29346da570479a255e8cefd157763abc53280a66d412f5b1a334ab0a7d
-SIZE (rpm/i386/fedora/8/openssl-0.9.8b-17.fc8.i386.rpm) = 1511606
-MD5 (rpm/i386/fedora/8/openssl-0.9.8b-17.fc8.src.rpm) = 5929f4fa70274647c2de1be32e0c9fa4
-SHA256 (rpm/i386/fedora/8/openssl-0.9.8b-17.fc8.src.rpm) = 45f9c75a0a22276a57643402b46195102f304c9a6c2a2eedd1f36bafcc11ce2c
-SIZE (rpm/i386/fedora/8/openssl-0.9.8b-17.fc8.src.rpm) = 2897711
+MD5 (rpm/i386/fedora/10/openssl-0.9.8g-12.fc10.i386.rpm) = 1d340c3680be677fc4f8b28ff6769061
+SHA256 (rpm/i386/fedora/10/openssl-0.9.8g-12.fc10.i386.rpm) = b19e0a34a2035ea45ff4d412d0e81c5b8427bf6fb5dd71a62fa4df27b060c73a
+SIZE (rpm/i386/fedora/10/openssl-0.9.8g-12.fc10.i386.rpm) = 1371255
+MD5 (rpm/i386/fedora/10/openssl-0.9.8g-12.fc10.src.rpm) = 88f79e9e2fba2f523a2334efbf0a2f37
+SHA256 (rpm/i386/fedora/10/openssl-0.9.8g-12.fc10.src.rpm) = 48dd4d1696e54d9de58d3dde9d020fd40502791d6a86ef18fcbfd88ea6f0bd53
+SIZE (rpm/i386/fedora/10/openssl-0.9.8g-12.fc10.src.rpm) = 2745376
diff --git a/security/linux-f10-openssl/pkg-plist b/security/linux-f10-openssl/pkg-plist
index 58c9cc9e61f8..7bf7ebcc56c3 100644
--- a/security/linux-f10-openssl/pkg-plist
+++ b/security/linux-f10-openssl/pkg-plist
@@ -1,7 +1,5 @@
 @comment file listing
-etc/pki/tls/cert.pem
 etc/pki/tls/certs/Makefile
-etc/pki/tls/certs/ca-bundle.crt
 etc/pki/tls/certs/make-dummy-cert
 etc/pki/tls/misc/CA
 etc/pki/tls/misc/c_hash
@@ -9,10 +7,10 @@ etc/pki/tls/misc/c_info
 etc/pki/tls/misc/c_issuer
 etc/pki/tls/misc/c_name
 etc/pki/tls/openssl.cnf
-lib/libcrypto.so.0.9.8b
-lib/libcrypto.so.6
-lib/libssl.so.0.9.8b
-lib/libssl.so.6
+lib/libcrypto.so.%%PORTVERSION%%
+lib/libcrypto.so.7
+lib/libssl.so.%%PORTVERSION%%
+lib/libssl.so.7
 usr/bin/openssl
 usr/lib/openssl/engines/lib4758cca.so
 usr/lib/openssl/engines/libaep.so
@@ -23,17 +21,17 @@ usr/lib/openssl/engines/libgmp.so
 usr/lib/openssl/engines/libnuron.so
 usr/lib/openssl/engines/libsureware.so
 usr/lib/openssl/engines/libubsec.so
-usr/share/doc/openssl-0.9.8b/CHANGES
-usr/share/doc/openssl-0.9.8b/FAQ
-usr/share/doc/openssl-0.9.8b/INSTALL
-usr/share/doc/openssl-0.9.8b/LICENSE
-usr/share/doc/openssl-0.9.8b/NEWS
-usr/share/doc/openssl-0.9.8b/README
-usr/share/doc/openssl-0.9.8b/c-indentation.el
-usr/share/doc/openssl-0.9.8b/openssl.txt
-usr/share/doc/openssl-0.9.8b/openssl_button.gif
-usr/share/doc/openssl-0.9.8b/openssl_button.html
-usr/share/doc/openssl-0.9.8b/ssleay.txt
+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%%/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
@@ -79,7 +77,6 @@ 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/x509v3_config.5ssl.gz
-usr/share/man/man7/Modes_of_DES.7ssl.gz
 usr/share/man/man7/des_modes.7ssl.gz
 @comment deal with empty directories installed by the port
 @exec /bin/mkdir -p %D/etc/pki/CA/private
@@ -87,7 +84,7 @@ usr/share/man/man7/des_modes.7ssl.gz
 @exec /bin/mkdir -p %D/etc/pki/tls/private
 @dirrmtry etc/pki/tls/private
 @comment non-empty directory listing in revers order
-@dirrm usr/share/doc/openssl-0.9.8b
+@dirrm usr/share/doc/openssl-%%PORTVERSION%%
 @dirrm usr/lib/openssl/engines
 @dirrm usr/lib/openssl
 @dirrm etc/pki/tls/misc