Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Aug 2014 18:39:56 +0000 (UTC)
From:      Marcus von Appen <mva@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r365121 - head/devel/eblob
Message-ID:  <201408161839.s7GIdu3i095073@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mva
Date: Sat Aug 16 18:39:56 2014
New Revision: 365121
URL: http://svnweb.freebsd.org/changeset/ports/365121
QAT: https://qat.redports.org/buildarchive/r365121/

Log:
  - Enable stagedir support
  - Convert USE_PYTHON -> USES=python

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

Modified: head/devel/eblob/Makefile
==============================================================================
--- head/devel/eblob/Makefile	Sat Aug 16 18:38:25 2014	(r365120)
+++ head/devel/eblob/Makefile	Sat Aug 16 18:39:56 2014	(r365121)
@@ -6,7 +6,7 @@ PORTVERSION=	0.18.2
 PORTREVISION=	3
 CATEGORIES=	devel
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Append-only low-level I/O library
 
 LICENSE=	GPLv2
@@ -25,7 +25,6 @@ OPTIONS_DEFINE=	ASSERT PYTHON SNAPPY EXA
 OPTIONS_DEFAULT=PYTHON SNAPPY EXAMPLES TESTS
 TESTS_DESC=	Build tests
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MASSERT}
@@ -36,11 +35,9 @@ CMAKE_ARGS+=	-DWITH_ASSERTS=OFF
 
 .if ${PORT_OPTIONS:MPYTHON}
 LIB_DEPENDS+=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
-USE_PYTHON=	yes
+USES+=		python
 CMAKE_ARGS+=	-DWITH_PYTHON=ON
-INSTALLS_EGGINFO=	yes
-PYDISTUTILS_PKGVERSION=	0.0.1
-PLIST_SUB+=	PYTHON=""
+PLIST_SUB+=	PYTHON="" PYTHON_VER=${PYTHON_VER}
 .else
 CMAKE_ARGS+=	-DWITH_PYTHON=OFF
 PLIST_SUB+=	PYTHON="@comment "
@@ -70,6 +67,9 @@ CMAKE_ARGS+=	-DWITH_TESTS=OFF
 post-patch:
 .if ! ${PORT_OPTIONS:MPYTHON}
 	@${REINPLACE_CMD} -e 's, python),),' ${WRKSRC}/CMakeLists.txt
+.else
+	@${REINPLACE_CMD} -e 's,$$ENV{DESTDIR},${STAGEDIR},' \
+		${WRKSRC}/bindings/python/python/CMakeLists.txt
 .endif
 	@${REINPLACE_CMD} -e 's, -fstack-protector-all,,' \
 		${WRKSRC}/CMakeLists.txt

Modified: head/devel/eblob/pkg-plist
==============================================================================
--- head/devel/eblob/pkg-plist	Sat Aug 16 18:38:25 2014	(r365120)
+++ head/devel/eblob/pkg-plist	Sat Aug 16 18:39:56 2014	(r365121)
@@ -15,4 +15,5 @@ lib/libeblob_cpp.so.0.17.5
 %%PYTHON%%lib/libeblob_python.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/eblob.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/eblob.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/eblob-0.0.1-py%%PYTHON_VER%%.egg-info
 @dirrm include/eblob



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