Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 Dec 2017 09:22:24 +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: r457031 - head/devel/libregf
Message-ID:  <201712230922.vBN9MOSJ063096@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Sat Dec 23 09:22:24 2017
New Revision: 457031
URL: https://svnweb.freebsd.org/changeset/ports/457031

Log:
  - Build python2 and python3 bindings (fixes py36 flavor of py-dfwinreg at
    runtime)
  - Remove DOCS option, the 2 text files do not carry useful information

Modified:
  head/devel/libregf/Makefile
  head/devel/libregf/pkg-plist

Modified: head/devel/libregf/Makefile
==============================================================================
--- head/devel/libregf/Makefile	Sat Dec 23 09:17:49 2017	(r457030)
+++ head/devel/libregf/Makefile	Sat Dec 23 09:22:24 2017	(r457031)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libregf
 DISTVERSION=	alpha-20170130
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libyal/libregf/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
@@ -13,26 +14,30 @@ COMMENT=	Library and tools to support the Windows NT R
 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 \
 		libfwsi.so:devel/libfwsi
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-python --with-libfwnt=${LOCALBASE} --with-libfwsi=${LOCALBASE}
-USES=		fuse libtool pathfix pkgconfig python
+CONFIGURE_ARGS=	--enable-python2 --enable-python3 \
+		--with-libfwnt=${LOCALBASE} --with-libfwsi=${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=		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
 
-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/libregf/pkg-plist
==============================================================================
--- head/devel/libregf/pkg-plist	Sat Dec 23 09:17:49 2017	(r457030)
+++ head/devel/libregf/pkg-plist	Sat Dec 23 09:22:24 2017	(r457031)
@@ -12,8 +12,10 @@ lib/libregf.a
 lib/libregf.so
 lib/libregf.so.1
 lib/libregf.so.1.0.0
-%%PYTHON_SITELIBDIR%%/pyregf.a
-%%PYTHON_SITELIBDIR%%/pyregf.so
+%%PYTHON2_SITELIBDIR%%/pyregf.a
+%%PYTHON2_SITELIBDIR%%/pyregf.so
+%%PYTHON3_SITELIBDIR%%/pyregf.a
+%%PYTHON3_SITELIBDIR%%/pyregf.so
 libdata/pkgconfig/libregf.pc
 man/man1/regfinfo.1.gz
 man/man3/libregf.3.gz



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