From 24d0db6a9fc40321ea42c8e91a0043c5e35816ac Mon Sep 17 00:00:00 2001 From: rpointel Date: Tue, 17 Mar 2020 21:01:34 +0000 Subject: [PATCH] switch to the legacy version of libewf, and use python3. --- security/libewf/Makefile | 17 +++++++++-------- security/libewf/distinfo | 4 ++-- security/libewf/pkg/PLIST | 6 +++--- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/security/libewf/Makefile b/security/libewf/Makefile index 614dc6cf153..8a07aef67c2 100644 --- a/security/libewf/Makefile +++ b/security/libewf/Makefile @@ -1,16 +1,16 @@ -# $OpenBSD: Makefile,v 1.11 2019/07/12 20:49:04 sthen Exp $ +# $OpenBSD: Makefile,v 1.12 2020/03/17 21:01:34 rpointel Exp $ COMMENT = access the Expert Witness Compression Format -VERSION = 20171104 -DISTNAME = libewf-experimental-${VERSION} -PKGNAME = libewf-${VERSION} +VERSION = 20140808 +DISTNAME = libewf-${VERSION} +EPOCH = 0 SHARED_LIBS += ewf 1.0 # 3.0 CATEGORIES = security -HOMEPAGE = https://github.com/libyal/libewf +HOMEPAGE = https://github.com/libyal/libewf-legacy/ MAINTAINER = Remi Pointel @@ -21,9 +21,10 @@ WANTLIB = ${MODPY_WANTLIB} WANTLIB += bfio bz2 c crypto fuse iconv intl m pthread smdev smraw util WANTLIB += z -MASTER_SITES = https://github.com/libyal/libewf/releases/download/${VERSION}/ +MASTER_SITES = https://github.com/libyal/libewf-legacy/releases/download/${VERSION}/ MODULES = lang/python +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3} BUILD_DEPENDS = devel/gettext,-tools @@ -35,8 +36,8 @@ LIB_DEPENDS += devel/libbfio \ CONFIGURE_STYLE = simple CONFIGURE_ARGS += --prefix='${PREFIX}' \ --mandir=${PREFIX}/man \ - --enable-python \ - --with-pyprefix=${LOCALBASE} \ + --enable-python3 \ + --with-pythondir3=${MODPY_SITEPKG} \ --with-libuuid=no \ AWK=/usr/bin/awk \ MKDIR_P='/bin/mkdir -p' diff --git a/security/libewf/distinfo b/security/libewf/distinfo index b03d7aca5f5..6138dfc9421 100644 --- a/security/libewf/distinfo +++ b/security/libewf/distinfo @@ -1,2 +1,2 @@ -SHA256 (libewf-experimental-20171104.tar.gz) = zzbTuvOpbb5Wb95Vrn15/C57mYgGqxPg9pkVeZ8Z4EA= -SIZE (libewf-experimental-20171104.tar.gz) = 2243405 +SHA256 (libewf-20140808.tar.gz) = 3+KbXy8YQf8f4Rl5eA1xCmYNvEcnr4LsOR85jmtJ5f0= +SIZE (libewf-20140808.tar.gz) = 2258165 diff --git a/security/libewf/pkg/PLIST b/security/libewf/pkg/PLIST index 44e3f779733..d04428480fc 100644 --- a/security/libewf/pkg/PLIST +++ b/security/libewf/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2016/10/26 05:45:26 rpointel Exp $ +@comment $OpenBSD: PLIST,v 1.2 2020/03/17 21:01:34 rpointel Exp $ @bin bin/ewfacquire @bin bin/ewfacquirestream @bin bin/ewfdebug @@ -15,13 +15,13 @@ include/libewf/error.h include/libewf/extern.h include/libewf/features.h include/libewf/types.h -lib/libewf.a +@static-lib lib/libewf.a lib/libewf.la @lib lib/libewf.so.${LIBewf_VERSION} lib/pkgconfig/libewf.pc lib/python${MODPY_VERSION}/site-packages/pyewf.a lib/python${MODPY_VERSION}/site-packages/pyewf.la -lib/python${MODPY_VERSION}/site-packages/pyewf.so +@so lib/python${MODPY_VERSION}/site-packages/pyewf.so @man man/man1/ewfacquire.1 @man man/man1/ewfacquirestream.1 @man man/man1/ewfexport.1