Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 4 Jul 2018 09:09:01 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r473872 - in head/devel: libesedb libevtx libfsntfs libqcow libsigscan libvhdi libvmdk libvslvm
Message-ID:  <201807040909.w64991ZF070141@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Wed Jul  4 09:09:00 2018
New Revision: 473872
URL: https://svnweb.freebsd.org/changeset/ports/473872

Log:
  - Build python2 and python3 bindings
  - Remove DOCS option, the 2 text files do not carry useful information

Modified:
  head/devel/libesedb/Makefile
  head/devel/libesedb/pkg-plist
  head/devel/libevtx/Makefile
  head/devel/libevtx/pkg-plist
  head/devel/libfsntfs/Makefile
  head/devel/libfsntfs/pkg-plist
  head/devel/libqcow/Makefile
  head/devel/libqcow/pkg-plist
  head/devel/libsigscan/Makefile
  head/devel/libsigscan/pkg-plist
  head/devel/libvhdi/Makefile
  head/devel/libvhdi/pkg-plist
  head/devel/libvmdk/Makefile
  head/devel/libvmdk/pkg-plist
  head/devel/libvslvm/Makefile
  head/devel/libvslvm/pkg-plist

Modified: head/devel/libesedb/Makefile
==============================================================================
--- head/devel/libesedb/Makefile	Wed Jul  4 09:07:36 2018	(r473871)
+++ head/devel/libesedb/Makefile	Wed Jul  4 09:09:00 2018	(r473872)
@@ -4,6 +4,7 @@
 PORTNAME=	libesedb
 # If/When moving from experimental to alpha, switch to DISTVERSIONPREFIX to prevent PORTEPOCH
 DISTVERSION=	experimental-20170121
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libyal/libesedb/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
@@ -14,25 +15,28 @@ COMMENT=	Library and tools to access the ESEDB format
 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/.//}
 LIB_DEPENDS=	libfwnt.so:devel/libfwnt
 
 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 <bsd.port.mk>

Modified: head/devel/libesedb/pkg-plist
==============================================================================
--- head/devel/libesedb/pkg-plist	Wed Jul  4 09:07:36 2018	(r473871)
+++ head/devel/libesedb/pkg-plist	Wed Jul  4 09:09:00 2018	(r473872)
@@ -11,8 +11,10 @@ lib/libesedb.a
 lib/libesedb.so
 lib/libesedb.so.1
 lib/libesedb.so.1.0.0
-%%PYTHON_SITELIBDIR%%/pyesedb.a
-%%PYTHON_SITELIBDIR%%/pyesedb.so
+%%PYTHON2_SITELIBDIR%%/pyesedb.a
+%%PYTHON2_SITELIBDIR%%/pyesedb.so
+%%PYTHON3_SITELIBDIR%%/pyesedb.a
+%%PYTHON3_SITELIBDIR%%/pyesedb.so
 libdata/pkgconfig/libesedb.pc
 man/man1/esedbinfo.1.gz
 man/man3/libesedb.3.gz

Modified: head/devel/libevtx/Makefile
==============================================================================
--- head/devel/libevtx/Makefile	Wed Jul  4 09:07:36 2018	(r473871)
+++ head/devel/libevtx/Makefile	Wed Jul  4 09:09:00 2018	(r473872)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libevtx
 DISTVERSION=	alpha-20170122
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libyal/libevtx/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
@@ -13,27 +14,30 @@ COMMENT=	Library and tooling to access the Windows XML
 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/.//}
 LIB_DEPENDS=	libfwnt.so:devel/libfwnt \
 		libregf.so:devel/libregf
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-python \
+CONFIGURE_ARGS=	--enable-python2 --enable-python3 \
 		--with-libfwnt=${LOCALBASE} --with-libregf=${LOCALBASE}
-USES=		libtool pathfix python
+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 <bsd.port.mk>

Modified: head/devel/libevtx/pkg-plist
==============================================================================
--- head/devel/libevtx/pkg-plist	Wed Jul  4 09:07:36 2018	(r473871)
+++ head/devel/libevtx/pkg-plist	Wed Jul  4 09:09:00 2018	(r473872)
@@ -11,8 +11,10 @@ lib/libevtx.a
 lib/libevtx.so
 lib/libevtx.so.1
 lib/libevtx.so.1.0.0
-%%PYTHON_SITELIBDIR%%/pyevtx.a
-%%PYTHON_SITELIBDIR%%/pyevtx.so
+%%PYTHON2_SITELIBDIR%%/pyevtx.a
+%%PYTHON2_SITELIBDIR%%/pyevtx.so
+%%PYTHON3_SITELIBDIR%%/pyevtx.a
+%%PYTHON3_SITELIBDIR%%/pyevtx.so
 libdata/pkgconfig/libevtx.pc
 man/man1/evtxexport.1.gz
 man/man1/evtxinfo.1.gz

Modified: head/devel/libfsntfs/Makefile
==============================================================================
--- head/devel/libfsntfs/Makefile	Wed Jul  4 09:07:36 2018	(r473871)
+++ head/devel/libfsntfs/Makefile	Wed Jul  4 09:09:00 2018	(r473872)
@@ -4,6 +4,7 @@
 PORTNAME=	libfsntfs
 # If/When moving from experimental to alpha, switch to DISTVERSIONPREFIX to prevent PORTEPOCH
 DISTVERSION=	experimental-20170315
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libyal/libfsntfs/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
@@ -14,25 +15,29 @@ COMMENT=	Library and tools to access the New Technolog
 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/.//}
 LIB_DEPENDS=	libfwnt.so:devel/libfwnt
 
 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 <bsd.port.mk>

Modified: head/devel/libfsntfs/pkg-plist
==============================================================================
--- head/devel/libfsntfs/pkg-plist	Wed Jul  4 09:07:36 2018	(r473871)
+++ head/devel/libfsntfs/pkg-plist	Wed Jul  4 09:09:00 2018	(r473872)
@@ -10,8 +10,10 @@ lib/libfsntfs.a
 lib/libfsntfs.so
 lib/libfsntfs.so.1
 lib/libfsntfs.so.1.0.0
-%%PYTHON_SITELIBDIR%%/pyfsntfs.a
-%%PYTHON_SITELIBDIR%%/pyfsntfs.so
+%%PYTHON2_SITELIBDIR%%/pyfsntfs.a
+%%PYTHON2_SITELIBDIR%%/pyfsntfs.so
+%%PYTHON3_SITELIBDIR%%/pyfsntfs.a
+%%PYTHON3_SITELIBDIR%%/pyfsntfs.so
 libdata/pkgconfig/libfsntfs.pc
 man/man1/fsntfsinfo.1.gz
 man/man3/libfsntfs.3.gz

Modified: head/devel/libqcow/Makefile
==============================================================================
--- head/devel/libqcow/Makefile	Wed Jul  4 09:07:36 2018	(r473871)
+++ head/devel/libqcow/Makefile	Wed Jul  4 09:09:00 2018	(r473872)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libqcow
 DISTVERSION=	alpha-20170222
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libyal/libqcow/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
@@ -13,24 +14,28 @@ COMMENT=	Library and tooling to access the QEMU Copy-O
 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>

Modified: head/devel/libqcow/pkg-plist
==============================================================================
--- head/devel/libqcow/pkg-plist	Wed Jul  4 09:07:36 2018	(r473871)
+++ head/devel/libqcow/pkg-plist	Wed Jul  4 09:09:00 2018	(r473872)
@@ -11,8 +11,10 @@ lib/libqcow.a
 lib/libqcow.so
 lib/libqcow.so.1
 lib/libqcow.so.1.0.0
-%%PYTHON_SITELIBDIR%%/pyqcow.a
-%%PYTHON_SITELIBDIR%%/pyqcow.so
+%%PYTHON2_SITELIBDIR%%/pyqcow.a
+%%PYTHON2_SITELIBDIR%%/pyqcow.so
+%%PYTHON3_SITELIBDIR%%/pyqcow.a
+%%PYTHON3_SITELIBDIR%%/pyqcow.so
 libdata/pkgconfig/libqcow.pc
 man/man1/qcowinfo.1.gz
 man/man3/libqcow.3.gz

Modified: head/devel/libsigscan/Makefile
==============================================================================
--- head/devel/libsigscan/Makefile	Wed Jul  4 09:07:36 2018	(r473871)
+++ head/devel/libsigscan/Makefile	Wed Jul  4 09:09:00 2018	(r473872)
@@ -4,6 +4,7 @@
 PORTNAME=	libsigscan
 # If/When moving from experimental to alpha, switch to DISTVERSIONPREFIX to prevent PORTEPOCH
 DISTVERSION=	experimental-20170124
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libyal/libsigscan/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
@@ -14,24 +15,28 @@ COMMENT=	Library for binary signature scanning
 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=		libtool pathfix python
+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=		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}
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/etc/sigscan.conf ${STAGEDIR}${PREFIX}/etc/sigscan.conf.sample

Modified: head/devel/libsigscan/pkg-plist
==============================================================================
--- head/devel/libsigscan/pkg-plist	Wed Jul  4 09:07:36 2018	(r473871)
+++ head/devel/libsigscan/pkg-plist	Wed Jul  4 09:09:00 2018	(r473872)
@@ -11,8 +11,10 @@ lib/libsigscan.a
 lib/libsigscan.so
 lib/libsigscan.so.1
 lib/libsigscan.so.1.0.0
-%%PYTHON_SITELIBDIR%%/pysigscan.a
-%%PYTHON_SITELIBDIR%%/pysigscan.so
+%%PYTHON2_SITELIBDIR%%/pysigscan.a
+%%PYTHON2_SITELIBDIR%%/pysigscan.so
+%%PYTHON3_SITELIBDIR%%/pysigscan.a
+%%PYTHON3_SITELIBDIR%%/pysigscan.so
 libdata/pkgconfig/libsigscan.pc
 man/man1/sigscan.1.gz
 man/man3/libsigscan.3.gz

Modified: head/devel/libvhdi/Makefile
==============================================================================
--- head/devel/libvhdi/Makefile	Wed Jul  4 09:07:36 2018	(r473871)
+++ head/devel/libvhdi/Makefile	Wed Jul  4 09:09:00 2018	(r473872)
@@ -4,6 +4,7 @@
 PORTNAME=	libvhdi
 PORTVERSION=	20170223
 DISTVERSIONPREFIX=	alpha-
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libyal/libvhdi/releases/download/${PORTVERSION}/ \
 		LOCAL/antoine
@@ -14,23 +15,27 @@ COMMENT=	Library and tools to access the Virtual Hard 
 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
+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
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+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>

Modified: head/devel/libvhdi/pkg-plist
==============================================================================
--- head/devel/libvhdi/pkg-plist	Wed Jul  4 09:07:36 2018	(r473871)
+++ head/devel/libvhdi/pkg-plist	Wed Jul  4 09:09:00 2018	(r473872)
@@ -11,8 +11,10 @@ lib/libvhdi.a
 lib/libvhdi.so
 lib/libvhdi.so.1
 lib/libvhdi.so.1.0.0
-%%PYTHON_SITELIBDIR%%/pyvhdi.a
-%%PYTHON_SITELIBDIR%%/pyvhdi.so
+%%PYTHON2_SITELIBDIR%%/pyvhdi.a
+%%PYTHON2_SITELIBDIR%%/pyvhdi.so
+%%PYTHON3_SITELIBDIR%%/pyvhdi.a
+%%PYTHON3_SITELIBDIR%%/pyvhdi.so
 libdata/pkgconfig/libvhdi.pc
 man/man1/vhdiinfo.1.gz
 man/man3/libvhdi.3.gz

Modified: head/devel/libvmdk/Makefile
==============================================================================
--- head/devel/libvmdk/Makefile	Wed Jul  4 09:07:36 2018	(r473871)
+++ head/devel/libvmdk/Makefile	Wed Jul  4 09:09:00 2018	(r473872)
@@ -4,6 +4,7 @@
 PORTNAME=	libvmdk
 PORTVERSION=	20170226
 DISTVERSIONPREFIX=	alpha-
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libyal/libvmdk/releases/download/${PORTVERSION}/ \
 		LOCAL/antoine
@@ -14,23 +15,27 @@ COMMENT=	Library and tools to access the VMware Virtua
 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
+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
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+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>

Modified: head/devel/libvmdk/pkg-plist
==============================================================================
--- head/devel/libvmdk/pkg-plist	Wed Jul  4 09:07:36 2018	(r473871)
+++ head/devel/libvmdk/pkg-plist	Wed Jul  4 09:09:00 2018	(r473872)
@@ -11,8 +11,10 @@ lib/libvmdk.a
 lib/libvmdk.so
 lib/libvmdk.so.1
 lib/libvmdk.so.1.0.0
-%%PYTHON_SITELIBDIR%%/pyvmdk.a
-%%PYTHON_SITELIBDIR%%/pyvmdk.so
+%%PYTHON2_SITELIBDIR%%/pyvmdk.a
+%%PYTHON2_SITELIBDIR%%/pyvmdk.so
+%%PYTHON3_SITELIBDIR%%/pyvmdk.a
+%%PYTHON3_SITELIBDIR%%/pyvmdk.so
 libdata/pkgconfig/libvmdk.pc
 man/man1/vmdkinfo.1.gz
 man/man3/libvmdk.3.gz

Modified: head/devel/libvslvm/Makefile
==============================================================================
--- head/devel/libvslvm/Makefile	Wed Jul  4 09:07:36 2018	(r473871)
+++ head/devel/libvslvm/Makefile	Wed Jul  4 09:09:00 2018	(r473872)
@@ -4,6 +4,7 @@
 PORTNAME=	libvslvm
 # If/When moving from experimental to alpha, switch to DISTVERSIONPREFIX to prevent PORTEPOCH
 DISTVERSION=	experimental-20160110
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libyal/libvslvm/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
@@ -14,19 +15,27 @@ COMMENT=	Library and tools to access the LVM volume sy
 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 --with-libintl-prefix=${LOCALBASE}
-USES=		fuse gettext libtool pathfix pkgconfig python
+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
 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
 
-PORTDOCS=	AUTHORS ChangeLog
+OPTIONS_DEFINE=	NLS
 
-OPTIONS_DEFINE=	DOCS
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+NLS_USES=	gettext
+NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
+NLS_CONFIGURE_OFF=	--disable-nls
 
 .include <bsd.port.mk>

Modified: head/devel/libvslvm/pkg-plist
==============================================================================
--- head/devel/libvslvm/pkg-plist	Wed Jul  4 09:07:36 2018	(r473871)
+++ head/devel/libvslvm/pkg-plist	Wed Jul  4 09:09:00 2018	(r473872)
@@ -11,8 +11,10 @@ lib/libvslvm.a
 lib/libvslvm.so
 lib/libvslvm.so.1
 lib/libvslvm.so.1.0.0
-%%PYTHON_SITELIBDIR%%/pyvslvm.a
-%%PYTHON_SITELIBDIR%%/pyvslvm.so
+%%PYTHON2_SITELIBDIR%%/pyvslvm.a
+%%PYTHON2_SITELIBDIR%%/pyvslvm.so
+%%PYTHON3_SITELIBDIR%%/pyvslvm.a
+%%PYTHON3_SITELIBDIR%%/pyvslvm.so
 libdata/pkgconfig/libvslvm.pc
 man/man1/vslvminfo.1.gz
 man/man3/libvslvm.3.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807040909.w64991ZF070141>