svn commit: r419472 - head/security/linux-c6-openssl-compat

[Tijl Coosemans]

Author: tijl
Date: Tue Aug  2 10:09:54 2016
New Revision: 419472
URL: https://svnweb.freebsd.org/changeset/ports/419472

Log:
  In the 64 bit case create lib/libssl.so.7 instead of lib64/libssl.so.7.
  The symlink exists for libflashsupport.so in linux-c6-flashplugin11, a
  32 bit library.

Modified:
  head/security/linux-c6-openssl-compat/Makefile
  head/security/linux-c6-openssl-compat/pkg-plist.x86_64

Modified: head/security/linux-c6-openssl-compat/Makefile
==============================================================================
--- head/security/linux-c6-openssl-compat/Makefile	Tue Aug  2 09:51:04 2016	(r419471)
+++ head/security/linux-c6-openssl-compat/Makefile	Tue Aug  2 10:09:54 2016	(r419472)
@@ -3,7 +3,7 @@
 
 PORTNAME=	openssl-compat
 PORTVERSION=	0.9.8e
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security linux
 DISTNAME=	openssl098e-${PORTVERSION}-${RPMVERSION}
 
@@ -25,10 +25,7 @@ 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
+# For libflashsupport.so in www/linux-c6-flashplugin11.
+	${LN} -sf libssl.so.6 ${STAGEDIR}${PREFIX}/usr/lib/libssl.so.7
 
 .include <bsd.port.mk>

Modified: head/security/linux-c6-openssl-compat/pkg-plist.x86_64
==============================================================================
--- head/security/linux-c6-openssl-compat/pkg-plist.x86_64	Tue Aug  2 09:51:04 2016	(r419471)
+++ head/security/linux-c6-openssl-compat/pkg-plist.x86_64	Tue Aug  2 10:09:54 2016	(r419472)
@@ -6,6 +6,7 @@ usr/lib/libcrypto.so.%%PORTVERSION%%
 usr/lib/libcrypto.so.6
 usr/lib/libssl.so.%%PORTVERSION%%
 usr/lib/libssl.so.6
+usr/lib/libssl.so.7
 usr/lib/openssl098e/engines/lib4758cca.so
 usr/lib/openssl098e/engines/libaep.so
 usr/lib/openssl098e/engines/libatalla.so
@@ -23,7 +24,6 @@ usr/lib64/libcrypto.so.%%PORTVERSION%%
 usr/lib64/libcrypto.so.6
 usr/lib64/libssl.so.%%PORTVERSION%%
 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