diff --git a/security/veracrypt/Makefile b/security/veracrypt/Makefile index bff420f19edd..e98c0017f7da 100644 --- a/security/veracrypt/Makefile +++ b/security/veracrypt/Makefile @@ -1,48 +1,50 @@ PORTNAME= veracrypt PORTVERSION= 1.25.9 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME:S/v/V/:S/c/C/}%20${PORTVERSION}/Source%20Code DISTNAME= ${PORTNAME:S/v/V/:S/c/C/}_${PORTVERSION}_Source MAINTAINER= acm@FreeBSD.org COMMENT= Open-source disk encryption software based on Truecrypt WWW= https://www.veracrypt.fr/ BUILD_DEPENDS= yasm:devel/yasm RUN_DEPENDS= ${LOCALBASE}/bin/sudo:security/sudo LICENSE_FILE= ${DOCSDIR}/LICENSE USES= compiler:c++11-lang cpe desktop-file-utils fuse gmake iconv pkgconfig tar:bz2 CPE_VENDOR= idrix +USE_CXXSTD= c++11 USE_WX= 3.0+ NO_WRKSUBDIR= yes BUILD_WRKSRC= ${WRKSRC}/src ALL_TARGET= # DOCSDIR= ${PREFIX}/share/doc/${PORTNAME} SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS .include .if ${ARCH} == "i386" MAKE_ENV+= LFLAGS=-Wl,-z,notext .endif post-patch: ${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|g' ${WRKSRC}/src/Makefile ${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|g' -e \ 's|Icon=veracrypt|Icon=VeraCrypt-16x16|g' ${WRKSRC}/src/Setup/FreeBSD/veracrypt.desktop do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/Main/veracrypt ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/src/Setup/FreeBSD/veracrypt.desktop ${STAGEDIR}${PREFIX}/share/applications/ cd ${WRKSRC}/src/Resources/Icons && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/pixmaps "-name *\.xpm" do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/html ${INSTALL_DATA} ${WRKSRC}/License.txt ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html .include diff --git a/security/veracrypt/files/patch-src_Makefile b/security/veracrypt/files/patch-src_Makefile index cc0748da2b1b..a34d55e3efbd 100644 --- a/security/veracrypt/files/patch-src_Makefile +++ b/security/veracrypt/files/patch-src_Makefile @@ -1,11 +1,15 @@ ---- src/Makefile 2019-09-04 22:50:16.539918000 -0500 -+++ src/Makefile 2019-09-04 22:50:32.706875000 -0500 -@@ -46,7 +46,7 @@ - export CXXFLAGS := -Wall -Wno-unused-parameter +--- src/Makefile 2022-02-19 18:16:01.000000000 -0500 ++++ src/Makefile 2023-07-17 18:16:43.271921000 -0500 +@@ -44,10 +44,10 @@ + export RANLIB ?= ranlib + + export CFLAGS := -Wall +-export CXXFLAGS := -Wall -Wno-unused-parameter ++export CXXFLAGS ?= -Wall -Wno-unused-parameter C_CXX_FLAGS := -MMD -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES -I$(BASE_DIR) -I$(BASE_DIR)/Crypto export ASFLAGS := -D __GNUC__ -D __YASM__ -export LFLAGS := +export LFLAGS ?= export PKG_CONFIG_PATH ?= /usr/local/lib/pkgconfig