Date: Tue, 19 Jan 2016 09:51:13 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r406679 - in branches/2016Q1/net: libproxy libproxy-python Message-ID: <201601190951.u0J9pDwR034839@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Tue Jan 19 09:51:13 2016 New Revision: 406679 URL: https://svnweb.freebsd.org/changeset/ports/406679 Log: MFH: r406678 Modernize net/libproxy-python and fix dependencies. In preparation for updating the libproxy ports to 0.4.12, first land some changes that also apply to 0.4.6 and can be MFH'ed. - Make net/libproxy a run-time dependency: we only install .py files in this port, and they only load libproxy.so when being run. Consequently, also set NO_ARCH=yes. - Set NO_BUILD=yes and modernize the installation. Instead of having an empty do-build target and invoking Python's compileall.py in post-build, do it like most other ports and call it in post-install (this requires guarding the post-install target in net/libproxy's Makefile). We also pass -d to compileall.py to avoid having ${STAGEDIR} in the .pyc and .pyo files (and shown in exception tracebacks). - Let the port handle installation instead of defining do-install. We just need to set INSTALL_WRKSRC appropriately to avoid installing more files than we want. Approved by: gnome (kwm) Approved by: portmgr blanket approval Modified: branches/2016Q1/net/libproxy-python/Makefile branches/2016Q1/net/libproxy-python/pkg-plist branches/2016Q1/net/libproxy/Makefile Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/net/libproxy-python/Makefile ============================================================================== --- branches/2016Q1/net/libproxy-python/Makefile Tue Jan 19 09:50:10 2016 (r406678) +++ branches/2016Q1/net/libproxy-python/Makefile Tue Jan 19 09:51:13 2016 (r406679) @@ -2,36 +2,32 @@ # $FreeBSD$ # $MCom: ports/net/libproxy-python/Makefile,v 1.1 2011/01/12 13:10:54 kwm Exp $ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net lang PKGNAMESUFFIX= -python MAINTAINER= gnome@FreeBSD.org COMMENT= python binding for libproxy -LIB_DEPENDS= libproxy.so:${PORTSDIR}/net/libproxy +RUN_DEPENDS= libproxy>=${PORTVERSION}:${PORTSDIR}/net/libproxy MASTERDIR= ${.CURDIR}/../libproxy DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist -USES+= python -LIBPROXY_SLAVE= python +INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}/bindings/python +NO_ARCH= yes +NO_BUILD= yes +USES= python -do-build: -# empty +LIBPROXY_SLAVE= python -post-build: - ${PYTHON_CMD} -Qold ${PYTHON_LIBDIR}/compileall.py \ - ${WRKSRC}/bindings/python +post-install: + ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -f -d ${PYTHONPREFIX_SITELIBDIR} \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ - ${WRKSRC}/bindings/python - -do-install: - @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} -.for file in libproxy.py libproxy.pyc libproxy.pyo - ${INSTALL_DATA} ${WRKSRC}/bindings/python/${file} \ - ${STAGEDIR}${PYTHON_SITELIBDIR} -.endfor + -f -d ${PYTHONPREFIX_SITELIBDIR} \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} .include "${MASTERDIR}/Makefile" Modified: branches/2016Q1/net/libproxy-python/pkg-plist ============================================================================== --- branches/2016Q1/net/libproxy-python/pkg-plist Tue Jan 19 09:50:10 2016 (r406678) +++ branches/2016Q1/net/libproxy-python/pkg-plist Tue Jan 19 09:51:13 2016 (r406679) @@ -1,4 +1,3 @@ %%PYTHON_SITELIBDIR%%/libproxy.py %%PYTHON_SITELIBDIR%%/libproxy.pyc %%PYTHON_SITELIBDIR%%/libproxy.pyo -@dir lib/libproxy/%%VERSION%%/modules Modified: branches/2016Q1/net/libproxy/Makefile ============================================================================== --- branches/2016Q1/net/libproxy/Makefile Tue Jan 19 09:50:10 2016 (r406678) +++ branches/2016Q1/net/libproxy/Makefile Tue Jan 19 09:51:13 2016 (r406679) @@ -66,7 +66,10 @@ CMAKE_ARGS+= -DWITH_MOZJS:BOOL=OFF . endif .endif +# This will be removed after the update to 0.4.12. +.if !target(post-install) post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/libproxy/${PORTVERSION}/modules/ +.endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601190951.u0J9pDwR034839>