Index: head/devel/libpff/files/patch-pypff_Makefile.in =================================================================== --- head/devel/libpff/files/patch-pypff_Makefile.in (revision 475497) +++ head/devel/libpff/files/patch-pypff_Makefile.in (nonexistent) @@ -1,13 +0,0 @@ -# Allow building when an older version of libpff is installed - ---- pypff/Makefile.in.orig 2016-11-21 07:14:34 UTC -+++ pypff/Makefile.in -@@ -203,7 +203,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 Property changes on: head/devel/libpff/files/patch-pypff_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/libpff/Makefile =================================================================== --- head/devel/libpff/Makefile (revision 475497) +++ head/devel/libpff/Makefile (revision 475498) @@ -1,38 +1,41 @@ # Created by: Antoine Brodin # $FreeBSD$ PORTNAME= libpff # If/When moving from experimental to alpha, switch to DISTVERSIONPREFIX to prevent PORTEPOCH -DISTVERSION= experimental-20161119 +DISTVERSION= experimental-20180714 CATEGORIES= devel MASTER_SITES= https://github.com/libyal/libpff/releases/download/${PORTVERSION:E}/ \ LOCAL/antoine MAINTAINER= antoine@FreeBSD.org COMMENT= Library and tools to access the PFF and the OFF formats LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfwnt.so:devel/libfwnt +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 --with-libfwnt=${LOCALBASE} -USES= libtool pathfix python +CONFIGURE_ARGS= --enable-python2 --enable-python3 --with-libfwnt=${LOCALBASE} +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= libtool pathfix USE_LDCONFIG= yes INSTALL_TARGET= install-strip 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 Index: head/devel/libpff/distinfo =================================================================== --- head/devel/libpff/distinfo (revision 475497) +++ head/devel/libpff/distinfo (revision 475498) @@ -1,3 +1,3 @@ -TIMESTAMP = 1480236027 -SHA256 (libpff-experimental-20161119.tar.gz) = d12e5e7c2682010a9f234e2961b09b3adf2c0ac20f06cbb0356f572bd024cc1e -SIZE (libpff-experimental-20161119.tar.gz) = 1961081 +TIMESTAMP = 1531686016 +SHA256 (libpff-experimental-20180714.tar.gz) = d9657aa592e2e155a5dbb49a019f99988e2347a8c7b939c21883e8be3003695b +SIZE (libpff-experimental-20180714.tar.gz) = 1991576 Index: head/devel/libpff/pkg-plist =================================================================== --- head/devel/libpff/pkg-plist (revision 475497) +++ head/devel/libpff/pkg-plist (revision 475498) @@ -1,20 +1,22 @@ bin/pffexport bin/pffinfo include/libpff.h include/libpff/codepage.h include/libpff/definitions.h include/libpff/error.h include/libpff/extern.h include/libpff/features.h include/libpff/mapi.h include/libpff/types.h lib/libpff.a lib/libpff.so lib/libpff.so.1 lib/libpff.so.1.0.0 -%%PYTHON_SITELIBDIR%%/pypff.a -%%PYTHON_SITELIBDIR%%/pypff.so +%%PYTHON2_SITELIBDIR%%/pypff.a +%%PYTHON2_SITELIBDIR%%/pypff.so +%%PYTHON3_SITELIBDIR%%/pypff.a +%%PYTHON3_SITELIBDIR%%/pypff.so libdata/pkgconfig/libpff.pc man/man1/pffexport.1.gz man/man1/pffinfo.1.gz man/man3/libpff.3.gz