svn commit: r478015 - in head/devel: libmsiecf libscca

[Antoine Brodin]

Author: antoine
Date: Sat Aug 25 08:32:59 2018
New Revision: 478015
URL: https://svnweb.freebsd.org/changeset/ports/478015

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

Modified:
  head/devel/libmsiecf/Makefile
  head/devel/libmsiecf/pkg-plist
  head/devel/libscca/Makefile
  head/devel/libscca/pkg-plist

Modified: head/devel/libmsiecf/Makefile
==============================================================================
--- head/devel/libmsiecf/Makefile	Sat Aug 25 08:27:04 2018	(r478014)
+++ head/devel/libmsiecf/Makefile	Sat Aug 25 08:32:59 2018	(r478015)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libmsiecf
 DISTVERSION=	alpha-20170116
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libyal/libmsiecf/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
@@ -13,23 +14,27 @@ COMMENT=	Library and tools to access the MSIE index.da
 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>

Modified: head/devel/libmsiecf/pkg-plist
==============================================================================
--- head/devel/libmsiecf/pkg-plist	Sat Aug 25 08:27:04 2018	(r478014)
+++ head/devel/libmsiecf/pkg-plist	Sat Aug 25 08:32:59 2018	(r478015)
@@ -11,8 +11,10 @@ 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

Modified: head/devel/libscca/Makefile
==============================================================================
--- head/devel/libscca/Makefile	Sat Aug 25 08:27:04 2018	(r478014)
+++ head/devel/libscca/Makefile	Sat Aug 25 08:32:59 2018	(r478015)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libscca
 DISTVERSION=	alpha-20170205
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libyal/libscca/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
@@ -13,25 +14,28 @@ COMMENT=	Library and tools to access the Windows Prefe
 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/libscca/pkg-plist
==============================================================================
--- head/devel/libscca/pkg-plist	Sat Aug 25 08:27:04 2018	(r478014)
+++ head/devel/libscca/pkg-plist	Sat Aug 25 08:32:59 2018	(r478015)
@@ -10,8 +10,10 @@ 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