Index: head/devel/libmsiecf/Makefile
===================================================================
--- head/devel/libmsiecf/Makefile	(revision 478014)
+++ head/devel/libmsiecf/Makefile	(revision 478015)
@@ -1,35 +1,40 @@
 # Created by: Antoine Brodin <antoine@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libmsiecf
 DISTVERSION=	alpha-20170116
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libyal/libmsiecf/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
 
 MAINTAINER=	antoine@FreeBSD.org
 COMMENT=	Library and tools to access the MSIE index.dat files
 
 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}
 
 .include <bsd.port.mk>
Index: head/devel/libmsiecf/pkg-plist
===================================================================
--- head/devel/libmsiecf/pkg-plist	(revision 478014)
+++ head/devel/libmsiecf/pkg-plist	(revision 478015)
@@ -1,19 +1,21 @@
 bin/msiecfexport
 bin/msiecfinfo
 include/libmsiecf.h
 include/libmsiecf/codepage.h
 include/libmsiecf/definitions.h
 include/libmsiecf/error.h
 include/libmsiecf/extern.h
 include/libmsiecf/features.h
 include/libmsiecf/types.h
 lib/libmsiecf.a
 lib/libmsiecf.so
 lib/libmsiecf.so.1
 lib/libmsiecf.so.1.0.0
-%%PYTHON_SITELIBDIR%%/pymsiecf.a
-%%PYTHON_SITELIBDIR%%/pymsiecf.so
+%%PYTHON2_SITELIBDIR%%/pymsiecf.a
+%%PYTHON2_SITELIBDIR%%/pymsiecf.so
+%%PYTHON3_SITELIBDIR%%/pymsiecf.a
+%%PYTHON3_SITELIBDIR%%/pymsiecf.so
 libdata/pkgconfig/libmsiecf.pc
 man/man1/msiecfexport.1.gz
 man/man1/msiecfinfo.1.gz
 man/man3/libmsiecf.3.gz
Index: head/devel/libscca/Makefile
===================================================================
--- head/devel/libscca/Makefile	(revision 478014)
+++ head/devel/libscca/Makefile	(revision 478015)
@@ -1,37 +1,41 @@
 # Created by: Antoine Brodin <antoine@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libscca
 DISTVERSION=	alpha-20170205
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libyal/libscca/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
 
 MAINTAINER=	antoine@FreeBSD.org
 COMMENT=	Library and tools to access the Windows Prefetch File (SCCA) 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>
Index: head/devel/libscca/pkg-plist
===================================================================
--- head/devel/libscca/pkg-plist	(revision 478014)
+++ head/devel/libscca/pkg-plist	(revision 478015)
@@ -1,17 +1,19 @@
 bin/sccainfo
 include/libscca.h
 include/libscca/codepage.h
 include/libscca/definitions.h
 include/libscca/error.h
 include/libscca/extern.h
 include/libscca/features.h
 include/libscca/types.h
 lib/libscca.a
 lib/libscca.so
 lib/libscca.so.1
 lib/libscca.so.1.0.0
-%%PYTHON_SITELIBDIR%%/pyscca.a
-%%PYTHON_SITELIBDIR%%/pyscca.so
+%%PYTHON2_SITELIBDIR%%/pyscca.a
+%%PYTHON2_SITELIBDIR%%/pyscca.so
+%%PYTHON3_SITELIBDIR%%/pyscca.a
+%%PYTHON3_SITELIBDIR%%/pyscca.so
 libdata/pkgconfig/libscca.pc
 man/man1/sccainfo.1.gz
 man/man3/libscca.3.gz