Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Jul 2020 10:13:27 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r541740 - head/devel/libopkele
Message-ID:  <202007091013.069ADRdw045669@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Thu Jul  9 10:13:27 2020
New Revision: 541740
URL: https://svnweb.freebsd.org/changeset/ports/541740

Log:
  - Unbreak the build against modern versions of OpenSSL
  - While at it, define LICENSE (MIT) and LICENSE_FILE
  
  PR:	245265

Modified:
  head/devel/libopkele/Makefile
  head/devel/libopkele/distinfo

Modified: head/devel/libopkele/Makefile
==============================================================================
--- head/devel/libopkele/Makefile	Thu Jul  9 10:09:40 2020	(r541739)
+++ head/devel/libopkele/Makefile	Thu Jul  9 10:13:27 2020	(r541740)
@@ -7,9 +7,15 @@ PORTREVISION=	18
 CATEGORIES=	devel
 MASTER_SITES=	http://kin.klever.net/dist/
 
+PATCH_SITES=	https://github.com/hacker/libopkele/commit/
+PATCHFILES=	62f3ba4ecb92.diff:-p1
+
 MAINTAINER=	zhoushuqun@gmail.com
 COMMENT=	C++ implementation of an OpenID decentralized identity system
 
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 RUN_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 LIB_DEPENDS=	libcurl.so:ftp/curl \
@@ -18,9 +24,6 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libtidy.so:www/tidy-lib \
 		libxslt.so:textproc/libxslt
 
-BROKEN_SSL=	openssl
-BROKEN_SSL_REASON_openssl=	member access into incomplete type 'DH' (aka 'dh_st')
-
 USES=		gmake libtool localbase:ldflags pathfix \
 		pkgconfig ssl
 USE_LDCONFIG=	yes
@@ -28,18 +31,4 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	"OPENSSL_CFLAGS=${CFLAGS} -l${OPENSSLINC}" \
 		OPENSSL_LIBS=-L${OPENSSLLIB}
 
-.include <bsd.port.pre.mk>
-
-# If we use the base OpenSSL either by default or
-# by design, we need to remove the openssl dependency
-# in pkgconfig/libopkele.pc.
-
-.if ${SSL_DEFAULT} == base
-BROKEN_FreeBSD_12=	error: member access into incomplete type 'DH' (aka 'dh_st')
-BROKEN_FreeBSD_13=	error: member access into incomplete type 'DH' (aka 'dh_st')
-
-post-patch:
-	@ ${REINPLACE_CMD} -e "s|Requires: openssl|Requires:|" ${WRKSRC}/libopkele.pc.in
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/libopkele/distinfo
==============================================================================
--- head/devel/libopkele/distinfo	Thu Jul  9 10:09:40 2020	(r541739)
+++ head/devel/libopkele/distinfo	Thu Jul  9 10:13:27 2020	(r541740)
@@ -1,2 +1,5 @@
+TIMESTAMP = 1298297231
 SHA256 (libopkele-2.0.4.tar.gz) = 57a5bc753b7e80c5ece1e5968b2051b0ce7ed9ce4329d17122c61575a9ea7648
 SIZE (libopkele-2.0.4.tar.gz) = 391054
+SHA256 (62f3ba4ecb92.diff) = 0a2d255f3f040de1fed6e1ac39c836f45217cd8e24a4ea6b965d1b2ec3d591c5
+SIZE (62f3ba4ecb92.diff) = 3354



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007091013.069ADRdw045669>