Attachment #203159 for bug #235376





PORTNAME=	libdecaf
PORTVERSION=	1.0.0
PORTREVISION=	1
CATEGORIES=	security
MASTER_SITES=	SF/ed448goldilocks/


LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/LICENSE.txt

USES=		cmake python:2.7 tar:tgz

USES=		gmake 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>

Line 0 Link Here

(-)files/patch-CMakeLists.txt (+11 lines)
	1	--- CMakeLists.txt.orig 2018-07-13 20:31:25 UTC
	2	+++ CMakeLists.txt
	3	@@ -8,7 +8,7 @@
	4	cmake_minimum_required(VERSION 3.0)
	5	project(DECAF VERSION 1.0 LANGUAGES C CXX)
	6
	7	-set(DECAF_SO_VERSION "0")
	8	+set(DECAF_SO_VERSION "1")
	9
	10	find_package( PythonInterp 2.7 REQUIRED )
	11




--- 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

Line 0 Link Here

(-)files/patch-src_CMakeLists.txt (+11 lines)
	1	--- src/CMakeLists.txt.orig 2018-06-05 22:25:08 UTC
	2	+++ src/CMakeLists.txt
	3	@@ -119,7 +119,7 @@ if(ENABLE_SHARED)
	4	endif()
	5
	6	install(DIRECTORY ${GSOURCE_PATH}/include/
	7	- DESTINATION include/decaf
	8	+ DESTINATION include
	9	FILES_MATCHING PATTERN ".h"
	10	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
	11	)

Lines 1-5 Link Here

(-)pkg-plist (-2 / +4 lines)
1	bin/ristretto	1	share/decaf/cmake/DecafConfig.cmake
2	bin/shakesum	2	share/decaf/cmake/DecafTargets-%%CMAKE_BUILD_TYPE%%.cmake
		3	share/decaf/cmake/DecafTargets.cmake
3	include/decaf.h	4	include/decaf.h
4	include/decaf.hxx	5	include/decaf.hxx
5	include/decaf/common.h	6	include/decaf/common.h
Lines 19-23 Link Here
19	include/decaf/shake.hxx	20	include/decaf/shake.hxx
20	include/decaf/spongerng.h	21	include/decaf/spongerng.h
21	include/decaf/spongerng.hxx	22	include/decaf/spongerng.hxx
		23	lib/libdecaf.a
22	lib/libdecaf.so	24	lib/libdecaf.so
23	lib/libdecaf.so.1	25	lib/libdecaf.so.1

Return to bug 235376

Lines 2-7 Link Here

(-)Makefile (-12 / +2 lines)
2		2
3	PORTNAME= libdecaf	3	PORTNAME= libdecaf
4	PORTVERSION= 1.0.0	4	PORTVERSION= 1.0.0
		5	PORTREVISION= 1
5	CATEGORIES= security	6	CATEGORIES= security
6	MASTER_SITES= SF/ed448goldilocks/	7	MASTER_SITES= SF/ed448goldilocks/
7		8
Lines 11-30 Link Here
11	LICENSE= MIT	12	LICENSE= MIT
12	LICENSE_FILE= ${WRKSRC}/LICENSE.txt	13	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
13		14
14	ONLY_FOR_ARCHS= amd64	15	USES= cmake python:2.7 tar:tgz
15
16	USES= gmake python:2.7 tar:tgz
17	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
18	CFLAGS+= -I${LOCALBASE}/include	17	CFLAGS+= -I${LOCALBASE}/include
19	LDFLAGS+= -L${LOCALBASE}/lib	18	LDFLAGS+= -L${LOCALBASE}/lib
20		19
21	post-patch:
22	@${REINPLACE_CMD} -e 's\|PYTHON ?= python\|PYTHON ?= ${PYTHON_CMD}\|g' \
23	${WRKSRC}/Makefile
24
25	do-install:
26	${INSTALL_PROGRAM} ${WRKSRC}/build/bin/* ${STAGEDIR}${PREFIX}/bin/
27	cd ${WRKSRC}/src/GENERATED/include && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/
28	${INSTALL_LIB} ${WRKSRC}/build/lib/* ${STAGEDIR}${PREFIX}/lib/
29
30	.include <bsd.port.mk>	20	.include <bsd.port.mk>

Lines 1-54 Link Here

(-)files/patch-Makefile (-54 lines)
1	--- Makefile.orig 2018-08-15 16:19:30 UTC
2	+++ Makefile
3	@@ -19,7 +19,7 @@ BUILD_IBIN = build/obj/bin
4
5	DOXYGEN ?= doxygen
6
7	-ifeq ($(UNAME),Darwin)
8	+ifeq ($(UNAME),FreeBSD)
9	CC ?= clang
10	CXX ?= clang++
11	else
12	@@ -49,8 +49,6 @@ endif
13
14	TODAY = $(shell date "+%Y-%m-%d")
15
16	-ARCHFLAGS ?= -march=native
17	-
18	ifeq ($(CC),clang)
19	WARNFLAGS_C += -Wgcc-compat
20	endif
21	@@ -97,14 +95,14 @@ scan: clean
22
23	# Internal test programs, which are not part of the final build/bin directory.
24	$(BUILD_IBIN)/test: $(BUILD_OBJ)/test_decaf.o lib
25	-ifeq ($(UNAME),Darwin)
26	+ifeq ($(UNAME),FreeBSD)
27	$(LDXX) $(LDFLAGS) -o $@ $< -L$(BUILD_LIB) -ldecaf
28	else
29	$(LDXX) $(LDFLAGS) -Wl,-rpath,`pwd`/$(BUILD_LIB) -o $@ $< -L$(BUILD_LIB) -ldecaf
30	endif
31
32	$(BUILD_BIN)/ristretto: $(BUILD_OBJ)/ristretto.o lib
33	-ifeq ($(UNAME),Darwin)
34	+ifeq ($(UNAME),FreeBSD)
35	$(LDXX) $(LDFLAGS) -o $@ $< -L$(BUILD_LIB) -ldecaf
36	else
37	$(LDXX) $(LDFLAGS) -Wl,-rpath,`pwd`/$(BUILD_LIB) -o $@ $< -L$(BUILD_LIB) -ldecaf
38	@@ -112,14 +110,14 @@ endif
39
40	# Internal test programs, which are not part of the final build/bin directory.
41	$(BUILD_IBIN)/test_ct: $(BUILD_OBJ)/test_ct.o lib
42	-ifeq ($(UNAME),Darwin)
43	+ifeq ($(UNAME),FreeBSD)
44	$(LDXX) $(LDFLAGS) -o $@ $< -L$(BUILD_LIB) -ldecaf
45	else
46	$(LDXX) $(LDFLAGS) -Wl,-rpath,`pwd`/$(BUILD_LIB) -o $@ $< -L$(BUILD_LIB) -ldecaf
47	endif
48
49	$(BUILD_IBIN)/bench: $(BUILD_OBJ)/bench_decaf.o lib
50	-ifeq ($(UNAME),Darwin)
51	+ifeq ($(UNAME),FreeBSD)
52	$(LDXX) $(LDFLAGS) -o $@ $< -L$(BUILD_LIB) -ldecaf
53	else
54	$(LDXX) $(LDFLAGS) -Wl,-rpath,`pwd`/$(BUILD_LIB) -o $@ $< -L$(BUILD_LIB) -ldecaf