diff options
| -rw-r--r-- | devel/libbde/Makefile | 24 | ||||
| -rw-r--r-- | devel/libbde/distinfo | 6 | ||||
| -rw-r--r-- | devel/libbde/files/patch-pybde_Makefile.in | 13 | ||||
| -rw-r--r-- | devel/libbde/pkg-plist | 6 |
4 files changed, 21 insertions, 28 deletions
diff --git a/devel/libbde/Makefile b/devel/libbde/Makefile index f308743827e1..ef341cea9a7d 100644 --- a/devel/libbde/Makefile +++ b/devel/libbde/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libbde -DISTVERSION= alpha-20170204 +DISTVERSION= alpha-20170902 CATEGORIES= devel MASTER_SITES= https://github.com/libyal/libbde/releases/download/${PORTVERSION:E}/ \ LOCAL/antoine @@ -13,24 +13,28 @@ COMMENT= Library and tools to access the BitLocker Drive Encryption volumes LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= python${PYTHON2_DEFAULT}:lang/python${PYTHON2_DEFAULT:S/.//} \ + python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//} +RUN_DEPENDS= python${PYTHON2_DEFAULT}:lang/python${PYTHON2_DEFAULT:S/.//} \ + python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//} + GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-python -USES= fuse libtool pathfix pkgconfig python ssl +CONFIGURE_ARGS= --enable-python2 --enable-python3 +CONFIGURE_ENV= PYTHON2_CONFIG=${LOCALBASE}/bin/python${PYTHON2_DEFAULT}-config \ + PYTHON3=${LOCALBASE}/bin/python${PYTHON3_DEFAULT} \ + PYTHON3_CONFIG=${LOCALBASE}/bin/python${PYTHON3_DEFAULT}-config +USES= fuse libtool pathfix pkgconfig ssl USE_LDCONFIG= yes INSTALL_TARGET= install-strip LIBS+= -L${OPENSSLLIB} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:E} +PLIST_SUB= PYTHON2_SITELIBDIR=lib/python${PYTHON2_DEFAULT}/site-packages \ + PYTHON3_SITELIBDIR=lib/python${PYTHON3_DEFAULT}/site-packages -OPTIONS_DEFINE= DOCS NLS +OPTIONS_DEFINE= NLS NLS_USES= gettext NLS_CONFIGURE_ON= --with-libintl-prefix=${LOCALBASE} NLS_CONFIGURE_OFF= --disable-nls -PORTDOCS= AUTHORS ChangeLog - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} - .include <bsd.port.mk> diff --git a/devel/libbde/distinfo b/devel/libbde/distinfo index 7ddfad6e5e08..621023f1ec8e 100644 --- a/devel/libbde/distinfo +++ b/devel/libbde/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1486311298 -SHA256 (libbde-alpha-20170204.tar.gz) = 5a23a6a602993a74f60af724a31241ded051a65f6715d38afd8a67c1fe05d0ad -SIZE (libbde-alpha-20170204.tar.gz) = 1656035 +TIMESTAMP = 1504352091 +SHA256 (libbde-alpha-20170902.tar.gz) = d8953b967f70227c3aa14d981f73f08408ac5d49ceb3ab6e72c88b2df12b7cfe +SIZE (libbde-alpha-20170902.tar.gz) = 1657181 diff --git a/devel/libbde/files/patch-pybde_Makefile.in b/devel/libbde/files/patch-pybde_Makefile.in deleted file mode 100644 index e5a91d4dbfe6..000000000000 --- a/devel/libbde/files/patch-pybde_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -# Allow building when an older version of libbde is installed - ---- pybde/Makefile.in.orig 2017-02-05 12:42:14 UTC -+++ pybde/Makefile.in -@@ -191,7 +191,7 @@ AM_V_at = $(am__v_at_@AM_V@) - am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) - am__v_at_0 = @ - am__v_at_1 = --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/common -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/common -I$(top_builddir)/include - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f diff --git a/devel/libbde/pkg-plist b/devel/libbde/pkg-plist index c9ddd17ee991..087496a10f23 100644 --- a/devel/libbde/pkg-plist +++ b/devel/libbde/pkg-plist @@ -11,8 +11,10 @@ lib/libbde.a lib/libbde.so lib/libbde.so.1 lib/libbde.so.1.0.0 -%%PYTHON_SITELIBDIR%%/pybde.a -%%PYTHON_SITELIBDIR%%/pybde.so +%%PYTHON2_SITELIBDIR%%/pybde.a +%%PYTHON2_SITELIBDIR%%/pybde.so +%%PYTHON3_SITELIBDIR%%/pybde.a +%%PYTHON3_SITELIBDIR%%/pybde.so libdata/pkgconfig/libbde.pc man/man1/bdeinfo.1.gz man/man1/bdemount.1.gz |