[Midnightbsd-cvs] mports [20700] trunk/security/openssl: force disable cross compile until we can figure out what changed

[laffer1 at midnightbsd.org]

Revision: 20700
          http://svnweb.midnightbsd.org/mports/?rev=20700
Author:   laffer1
Date:     2015-11-08 11:32:57 -0500 (Sun, 08 Nov 2015)
Log Message:
-----------
force disable cross compile until we can figure out what changed

Modified Paths:
--------------
    trunk/security/openssl/Makefile
    trunk/security/openssl/pkg-plist

Modified: trunk/security/openssl/Makefile
===================================================================
--- trunk/security/openssl/Makefile	2015-11-08 16:13:48 UTC (rev 20699)
+++ trunk/security/openssl/Makefile	2015-11-08 16:32:57 UTC (rev 20700)
@@ -21,8 +21,8 @@
 
 CONFLICTS?=	libressl-*
 
-OPTIONS_DEFINE=	SHARED THREADS I386 SSE2 ASM PADLOCK ZLIB GMP SCTP SSL2 SSL3 RFC3779 MD2 RC5 EXPCIPHERS DOCS
-OPTIONS_DEFAULT=SHARED THREADS SSE2 SCTP SSL2 SSL3 MD2
+OPTIONS_DEFINE=	SHARED THREADS I386 SSE2 ASM PADLOCK ZLIB GMP SCTP SSL2 SSL3 RFC3779 MD2 RC5 EXPCIPHERS DOCS MAN3
+OPTIONS_DEFAULT=SHARED THREADS SSE2 SCTP SSL2 SSL3 MD2 MAN3
 .for a in amd64 ia64
 OPTIONS_DEFINE_${a}=	EC
 OPTIONS_DEFAULT_${a}=	EC
@@ -49,6 +49,7 @@
 RC5_DESC?=	RC5 cipher (patented)
 EXPCIPHERS_DESC?=	Include experimental ciphers
 EC_DESC?=	Optimize NIST elliptic curves
+MAN3_DESC?=	Install API manpages (section 3)
 
 GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
 
@@ -64,30 +65,10 @@
 
 CPE_VERSION=	${PORTVERSION}${DISTVERSIONSUFFIX}
 
-FIX_POD=apps/cms.pod \
-	apps/smime.pod \
-	ssl/SSL_COMP_add_compression_method.pod \
-	ssl/SSL_CTX_add_session.pod \
-	ssl/SSL_CTX_load_verify_locations.pod \
-	ssl/SSL_CTX_set_client_CA_list.pod \
-	ssl/SSL_CTX_set_session_id_context.pod \
-	ssl/SSL_CTX_set_ssl_version.pod \
-	ssl/SSL_CTX_use_psk_identity_hint.pod \
-	ssl/SSL_accept.pod \
-	ssl/SSL_clear.pod \
-	ssl/SSL_connect.pod \
-	ssl/SSL_do_handshake.pod \
-	ssl/SSL_read.pod \
-	ssl/SSL_session_reused.pod \
-	ssl/SSL_set_fd.pod \
-	ssl/SSL_set_session.pod \
-	ssl/SSL_shutdown.pod \
-	ssl/SSL_write.pod
-
 .include <bsd.port.pre.mk>
 
 .if ${PREFIX} == /usr
-IGNORE=	OpenSSL can not be installed over the base version
+IGNORE=	OpenSSL can not be installed over the base version.
 .endif
 
 OPENSSLDIR?=	${PREFIX}/openssl
@@ -175,7 +156,7 @@
 
 .if ${PORT_OPTIONS:MGMP}
 EXTRACONFIGURE+=	enable-gmp -I${LOCALBASE}/include
-IGNORE=	GMP is LGPLv3 and can not be linked
+IGNORE=	GMP is LGPLv3 and can not be linked.
 .else
 EXTRACONFIGURE+=	no-gmp
 .endif
@@ -204,8 +185,6 @@
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -E -e 's|^=item ([0-9])[[:blank:]]*$$|=item Z<>\1|' \
-		${FIX_POD:S,^,${WRKSRC}/doc/,}
 	${REINPLACE_CMD} -e 's|m4 -B 8192|m4|g' \
 		${WRKSRC}/crypto/des/Makefile
 	${REINPLACE_CMD} -e 's|SHLIB_VERSION_NUMBER "1.0.0"|SHLIB_VERSION_NUMBER "${OPENSSL_SHLIBVER}"|' \
@@ -237,6 +216,7 @@
 		-e 's|^MANDIR=.*$$|MANDIR=$$(TRUE_PREFIX)/man|' \
 		-e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \
 		-e 's|LIBVERSION=[^ ]* |LIBVERSION=$(OPENSSL_SHLIBVER) |' \
+		-e 's|CROSS_COMPILE= 1|CROSS_COMPILE=|' \
 		${WRKSRC}/Makefile
 
 post-install:
@@ -250,6 +230,10 @@
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/openssl.txt ${STAGEDIR}${DOCSDIR}/
 .endif
+.if empty(PORT_OPTIONS:MMAN3)
+	${RM} -rf ${STAGEDIR}/${PREFIX}/man/man3
+	${REINPLACE_CMD} -e 's|^man/man3/.*||' ${TMPPLIST}
+.endif
 	${SED} -e 's|/usr/local|${PREFIX}|g' ${PKGMESSAGE}
 
 test: build

Modified: trunk/security/openssl/pkg-plist
===================================================================
--- trunk/security/openssl/pkg-plist	2015-11-08 16:13:48 UTC (rev 20699)
+++ trunk/security/openssl/pkg-plist	2015-11-08 16:32:57 UTC (rev 20700)
@@ -98,7 +98,6 @@
 libdata/pkgconfig/libcrypto.pc
 libdata/pkgconfig/libssl.pc
 libdata/pkgconfig/openssl.pc
-%%SHARED%%@dirrm lib/engines
 man/man1/CA.pl.1.gz
 man/man1/asn1parse.1.gz
 man/man1/c_rehash.1.gz
@@ -1650,9 +1649,5 @@
 %%OPENSSLDIR%%/misc/tsget
 %%OPENSSLDIR%%/openssl.cnf.sample
 %%PORTDOCS%%%%DOCSDIR%%/openssl.txt
- at dirrm include/openssl
- at dirrmtry %%OPENSSLDIR%%/certs
- at dirrm %%OPENSSLDIR%%/misc
- at dirrmtry %%OPENSSLDIR%%/private
- at dirrm %%OPENSSLDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dir %%OPENSSLDIR%%/private
+ at dir %%OPENSSLDIR%%/certs