Index: head/security/libdecaf/Makefile =================================================================== --- head/security/libdecaf/Makefile (revision 497006) +++ head/security/libdecaf/Makefile (revision 497007) @@ -1,30 +1,20 @@ # $FreeBSD$ PORTNAME= libdecaf PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/ed448goldilocks/ MAINTAINER= krion@FreeBSD.org 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 Index: head/security/libdecaf/files/patch-Makefile =================================================================== --- head/security/libdecaf/files/patch-Makefile (revision 497006) +++ head/security/libdecaf/files/patch-Makefile (nonexistent) @@ -1,54 +0,0 @@ ---- Makefile.orig 2018-08-15 16:19:30 UTC -+++ Makefile -@@ -19,7 +19,7 @@ BUILD_IBIN = build/obj/bin - - DOXYGEN ?= doxygen - --ifeq ($(UNAME),Darwin) -+ifeq ($(UNAME),FreeBSD) - CC ?= clang - CXX ?= clang++ - else -@@ -49,8 +49,6 @@ endif - - TODAY = $(shell date "+%Y-%m-%d") - --ARCHFLAGS ?= -march=native -- - ifeq ($(CC),clang) - WARNFLAGS_C += -Wgcc-compat - endif -@@ -97,14 +95,14 @@ scan: clean - - # Internal test programs, which are not part of the final build/bin directory. - $(BUILD_IBIN)/test: $(BUILD_OBJ)/test_decaf.o lib --ifeq ($(UNAME),Darwin) -+ifeq ($(UNAME),FreeBSD) - $(LDXX) $(LDFLAGS) -o $@ $< -L$(BUILD_LIB) -ldecaf - else - $(LDXX) $(LDFLAGS) -Wl,-rpath,`pwd`/$(BUILD_LIB) -o $@ $< -L$(BUILD_LIB) -ldecaf - endif - - $(BUILD_BIN)/ristretto: $(BUILD_OBJ)/ristretto.o lib --ifeq ($(UNAME),Darwin) -+ifeq ($(UNAME),FreeBSD) - $(LDXX) $(LDFLAGS) -o $@ $< -L$(BUILD_LIB) -ldecaf - else - $(LDXX) $(LDFLAGS) -Wl,-rpath,`pwd`/$(BUILD_LIB) -o $@ $< -L$(BUILD_LIB) -ldecaf -@@ -112,14 +110,14 @@ endif - - # Internal test programs, which are not part of the final build/bin directory. - $(BUILD_IBIN)/test_ct: $(BUILD_OBJ)/test_ct.o lib --ifeq ($(UNAME),Darwin) -+ifeq ($(UNAME),FreeBSD) - $(LDXX) $(LDFLAGS) -o $@ $< -L$(BUILD_LIB) -ldecaf - else - $(LDXX) $(LDFLAGS) -Wl,-rpath,`pwd`/$(BUILD_LIB) -o $@ $< -L$(BUILD_LIB) -ldecaf - endif - - $(BUILD_IBIN)/bench: $(BUILD_OBJ)/bench_decaf.o lib --ifeq ($(UNAME),Darwin) -+ifeq ($(UNAME),FreeBSD) - $(LDXX) $(LDFLAGS) -o $@ $< -L$(BUILD_LIB) -ldecaf - else - $(LDXX) $(LDFLAGS) -Wl,-rpath,`pwd`/$(BUILD_LIB) -o $@ $< -L$(BUILD_LIB) -ldecaf Property changes on: head/security/libdecaf/files/patch-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/libdecaf/files/patch-CMakeLists.txt =================================================================== --- head/security/libdecaf/files/patch-CMakeLists.txt (nonexistent) +++ head/security/libdecaf/files/patch-CMakeLists.txt (revision 497007) @@ -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 ) + Property changes on: head/security/libdecaf/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/libdecaf/files/patch-src_CMakeLists.txt =================================================================== --- head/security/libdecaf/files/patch-src_CMakeLists.txt (nonexistent) +++ head/security/libdecaf/files/patch-src_CMakeLists.txt (revision 497007) @@ -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 + ) Property changes on: head/security/libdecaf/files/patch-src_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/libdecaf/pkg-plist =================================================================== --- head/security/libdecaf/pkg-plist (revision 497006) +++ head/security/libdecaf/pkg-plist (revision 497007) @@ -1,23 +1,25 @@ -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 include/decaf/ed255.h include/decaf/ed255.hxx include/decaf/ed448.h include/decaf/ed448.hxx include/decaf/eddsa.hxx include/decaf/point_255.h include/decaf/point_255.hxx include/decaf/point_448.h include/decaf/point_448.hxx include/decaf/secure_buffer.hxx include/decaf/sha512.h include/decaf/sha512.hxx 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