svn commit: r497007 - in head/security/libdecaf: . files

Kirill Ponomarev krion at FreeBSD.org
Thu Mar 28 09:28:53 UTC 2019


Author: krion
Date: Thu Mar 28 09:28:51 2019
New Revision: 497007
URL: https://svnweb.freebsd.org/changeset/ports/497007

Log:
  Change from gmake to cmake to support more ARCHs.
  
  PR:		235376
  Submitted by:	Ralf van der Enden <tremere at cainites_net>

Added:
  head/security/libdecaf/files/patch-CMakeLists.txt   (contents, props changed)
  head/security/libdecaf/files/patch-src_CMakeLists.txt   (contents, props changed)
Deleted:
  head/security/libdecaf/files/patch-Makefile
Modified:
  head/security/libdecaf/Makefile
  head/security/libdecaf/pkg-plist

Modified: head/security/libdecaf/Makefile
==============================================================================
--- head/security/libdecaf/Makefile	Thu Mar 28 09:01:07 2019	(r497006)
+++ head/security/libdecaf/Makefile	Thu Mar 28 09:28:51 2019	(r497007)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libdecaf
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF/ed448goldilocks/
 
@@ -11,20 +12,9 @@ COMMENT=	Implementation of elliptic curve cryptography
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-ONLY_FOR_ARCHS=	amd64
-
-USES=		gmake python:2.7 tar:tgz
+USES=		cmake python:2.7 tar:tgz
 USE_LDCONFIG=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|PYTHON ?= python|PYTHON ?= ${PYTHON_CMD}|g' \
-		${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/build/bin/* ${STAGEDIR}${PREFIX}/bin/
-	cd ${WRKSRC}/src/GENERATED/include && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/
-	${INSTALL_LIB} ${WRKSRC}/build/lib/* ${STAGEDIR}${PREFIX}/lib/
 
 .include <bsd.port.mk>

Added: head/security/libdecaf/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/libdecaf/files/patch-CMakeLists.txt	Thu Mar 28 09:28:51 2019	(r497007)
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2018-07-13 20:31:25 UTC
++++ CMakeLists.txt
+@@ -8,7 +8,7 @@
+ cmake_minimum_required(VERSION 3.0)
+ project(DECAF VERSION 1.0 LANGUAGES C CXX)
+ 
+-set(DECAF_SO_VERSION "0")
++set(DECAF_SO_VERSION "1")
+ 
+ find_package( PythonInterp 2.7 REQUIRED )
+ 

Added: head/security/libdecaf/files/patch-src_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/libdecaf/files/patch-src_CMakeLists.txt	Thu Mar 28 09:28:51 2019	(r497007)
@@ -0,0 +1,11 @@
+--- src/CMakeLists.txt.orig	2018-06-05 22:25:08 UTC
++++ src/CMakeLists.txt
+@@ -119,7 +119,7 @@ if(ENABLE_SHARED)
+ endif()
+ 
+ install(DIRECTORY ${GSOURCE_PATH}/include/
+-	DESTINATION include/decaf
++	DESTINATION include
+ 	FILES_MATCHING PATTERN "*.h*"
+ 	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+ )

Modified: head/security/libdecaf/pkg-plist
==============================================================================
--- head/security/libdecaf/pkg-plist	Thu Mar 28 09:01:07 2019	(r497006)
+++ head/security/libdecaf/pkg-plist	Thu Mar 28 09:28:51 2019	(r497007)
@@ -1,5 +1,6 @@
-bin/ristretto
-bin/shakesum
+share/decaf/cmake/DecafConfig.cmake
+share/decaf/cmake/DecafTargets-%%CMAKE_BUILD_TYPE%%.cmake
+share/decaf/cmake/DecafTargets.cmake
 include/decaf.h
 include/decaf.hxx
 include/decaf/common.h
@@ -19,5 +20,6 @@ include/decaf/shake.h
 include/decaf/shake.hxx
 include/decaf/spongerng.h
 include/decaf/spongerng.hxx
+lib/libdecaf.a
 lib/libdecaf.so
 lib/libdecaf.so.1


More information about the svn-ports-all mailing list