On Wed, Jan 10, 2018 at 10:24:45PM +0100, Rafael Sadowski wrote:
> -MAINTAINER = Alexander Bluhm <bl...@openbsd.org>
> +MAINTAINER = Alexander Bluhm <bl...@openbsd.org>
Makefile.template has two tabs here.
> Index: patches/patch-src_build-data_cc_gcc_txt
> ===================================================================
> RCS file: /cvs/ports/security/botan2/patches/patch-src_build-data_cc_gcc_txt,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-src_build-data_cc_gcc_txt
> --- patches/patch-src_build-data_cc_gcc_txt 13 Mar 2017 15:00:39 -0000
> 1.1.1.1
> +++ patches/patch-src_build-data_cc_gcc_txt 10 Jan 2018 21:20:28 -0000
> @@ -1,20 +1,13 @@
> $OpenBSD: patch-src_build-data_cc_gcc_txt,v 1.1.1.1 2017/03/13 15:00:39
> bluhm Exp $
> ---- src/build-data/cc/gcc.txt.orig Tue Jan 10 04:21:31 2017
> -+++ src/build-data/cc/gcc.txt Mon Mar 13 07:14:45 2017
> -@@ -1,6 +1,6 @@
> - macro_name GCC
> +Index: src/build-data/cc/gcc.txt
> +--- src/build-data/cc/gcc.txt.orig
> ++++ src/build-data/cc/gcc.txt
> +@@ -9,7 +9,7 @@ warning_flags "-Wall -Wextra -Wpedantic -Wstrict-alias
>
> --binary_name g++
> -+binary_name ${CXX}
Why do you remove this?
> + maintainer_warning_flags "-Wstrict-overflow=5 -Wold-style-cast
> -Wsuggest-override -Wshadow -Werror -Wno-error=strict-overflow
> -Wno-error=deprecated-declarations"
>
> - output_to_option "-o "
> - add_include_dir_option -I
> -@@ -16,7 +16,7 @@ maintainer_warning_flags "-Wold-style-cast -Wsuggest-o
> -
> - compile_flags "-c"
> - debug_info_flags "-g"
> -optimization_flags "-O3"
> -+optimization_flags "${CXXFLAGS}"
> ++optimization_flags ""
Should this be ${CXXFLAGS}? Have you tested it on a non clang
architecture?
> Index: patches/patch-src_lib_prov_openssl_openssl_rsa_cpp
> ===================================================================
> RCS file:
> /cvs/ports/security/botan2/patches/patch-src_lib_prov_openssl_openssl_rsa_cpp,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-src_lib_prov_openssl_openssl_rsa_cpp
> --- patches/patch-src_lib_prov_openssl_openssl_rsa_cpp 9 Oct 2017
> 20:05:07 -0000 1.1
> +++ patches/patch-src_lib_prov_openssl_openssl_rsa_cpp 10 Jan 2018
> 21:20:28 -0000
> @@ -12,4 +12,4 @@ Index: src/lib/prov/openssl/openssl_rsa.
> +#include <cstdlib>
> #include <functional>
> #include <memory>
> -
> + #include <cstdlib>
Do we need cstdlib twice? I think you should remove this patch.
bluhm
