Date: Sun, 26 Jan 2014 14:47: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: r341192 - in head/lang: python27 python31 python32 python33 Message-ID: <201401261447.s0QElu2K078974@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mva Date: Sun Jan 26 14:47:56 2014 New Revision: 341192 URL: http://svnweb.freebsd.org/changeset/ports/341192 QAT: https://qat.redports.org/buildarchive/r341192/ Log: - Enable stagedir support - Convert to new LIB_DEPENDS Modified: head/lang/python27/Makefile head/lang/python27/pkg-plist head/lang/python31/Makefile head/lang/python31/pkg-plist head/lang/python32/Makefile head/lang/python32/pkg-plist head/lang/python33/Makefile head/lang/python33/pkg-plist Modified: head/lang/python27/Makefile ============================================================================== --- head/lang/python27/Makefile Sun Jan 26 14:45:54 2014 (r341191) +++ head/lang/python27/Makefile Sun Jan 26 14:47:56 2014 (r341192) @@ -21,7 +21,6 @@ CONFIGURE_ENV= SVNVERSION="echo freebsd MAKE_ENV= VPATH="${PYTHON_WRKSRC}" INSTALL_TARGET= altinstall -MAN1= ${PYTHON_VERSION}.1 USE_LDCONFIG= yes USE_PYTHON= yes @@ -62,7 +61,6 @@ OPTIONS_SINGLE_UCS= UCS2 UCS4 NLS_DESC= Enable Gettext support for the locale module -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} @@ -93,8 +91,8 @@ PLIST_SUB+= THREADS="" .if ${PORT_OPTIONS:MPTH} CONFIGURE_ARGS+= --with-pth --with-system-ffi CONFIGURE_ENV+= ac_cv_pthread=no -LIB_DEPENDS+= pth:${PORTSDIR}/devel/pth \ - ffi:${PORTSDIR}/devel/libffi +LIB_DEPENDS+= libpth.so:${PORTSDIR}/devel/pth \ + libffi.so:${PORTSDIR}/devel/libffi _PTH_CPPFLAGS= "-I${LOCALBASE}/include/pth" _PTH_LDFLAGS= "-L${LOCALBASE}/lib/pth" CPPFLAGS:= ${_PTH_CPPFLAGS} ${CPPFLAGS} @@ -234,10 +232,10 @@ pre-build: pre-su-install: .for platform in ${PLATFORMS} - ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} + ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/${platform} .for file in IN.py regen ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ - ${PYTHONPREFIX_LIBDIR}/${platform}/ + ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/${platform}/ .endfor .endfor @@ -254,39 +252,37 @@ pre-install: post-install: @# install config providers - ${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION}-config ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION}-config \ + ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config \ + ${STAGEDIR}${PREFIX}/bin @# shared version of executable and library ${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \ - ${PREFIX}/lib - cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \ - lib${PYTHON_VERSION}.so - ${LN} -sf ${PREFIX}/lib/lib${PYTHON_VERSION}.so ${PYTHONPREFIX_LIBDIR}/config + ${STAGEDIR}${PREFIX}/lib + (cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \ + lib${PYTHON_VERSION}.so) + ${LN} -sf lib${PYTHON_VERSION}.so \ + ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/config ${INSTALL_PROGRAM} \ ${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \ - ${PREFIX}/bin + ${STAGEDIR}${PREFIX}/bin @# additional files installing by ports .for script in ${BIN_SCRIPTS} - ${INSTALL_SCRIPT} \ - ${WRKDIR}/`${ECHO_CMD} ${script} | ${SED} -E ${BINLINKS_SUB_PYTHON_VER}` \ - ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/`${ECHO_CMD} ${script} | ${SED} -E ${BINLINKS_SUB_PYTHON_VER}` \ + ${STAGEDIR}${PREFIX}/bin .endfor - @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ - ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 + ${STAGEDIR}${MAN1PREFIX}/man/man1/${PYTHON_VERSION}.1 .if !defined(NOPORTDATA) - @${MKDIR} ${DATADIR} - @cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \ - (cd ${DATADIR}; ${TAR} --no-same-owner -xf -) -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - @cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \ - (cd ${EXAMPLESDIR}; ${TAR} --no-same-owner -xf -) + @${MKDIR} ${STAGEDIR}${DATADIR} + @(cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | (cd ${STAGEDIR}${DATADIR}; ${TAR} --no-same-owner -xf -)) .endif + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @(cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \ + (cd ${STAGEDIR}${EXAMPLESDIR}; ${TAR} --no-same-owner -xf -)) @${CAT} ${PKGMESSAGE} Modified: head/lang/python27/pkg-plist ============================================================================== --- head/lang/python27/pkg-plist Sun Jan 26 14:45:54 2014 (r341191) +++ head/lang/python27/pkg-plist Sun Jan 26 14:47:56 2014 (r341192) @@ -1824,6 +1824,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/xmlrpclib.py %%PYTHON_LIBDIR%%/zipfile.py lib/libpython2.7.a +man/man1/python2.7.1.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cgi/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cgi/cgi0.sh Modified: head/lang/python31/Makefile ============================================================================== --- head/lang/python31/Makefile Sun Jan 26 14:45:54 2014 (r341191) +++ head/lang/python31/Makefile Sun Jan 26 14:47:56 2014 (r341192) @@ -26,7 +26,6 @@ CONFIGURE_ENV= OPT="" SVNVERSION="echo MAKE_ENV= VPATH="${PYTHON_WRKSRC}" INSTALL_TARGET= altinstall -MAN1= ${PYTHON_VERSION}.1 USE_LDCONFIG= yes USE_PYTHON= yes @@ -62,7 +61,6 @@ OPTIONS_DEFAULT= THREADS UCS4 PYMALLOC I NLS_DESC= Enable Gettext support for the locale module -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} @@ -179,10 +177,10 @@ pre-build: pre-su-install: .for platform in ${PLATFORMS} - ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} + ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/${platform} .for file in IN.py regen ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ - ${PYTHONPREFIX_LIBDIR}/${platform}/ + ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/${platform}/ .endfor .endfor @@ -199,39 +197,38 @@ pre-install: post-install: @# install config providers - ${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION}-config ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION}-config \ + ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config \ + ${STAGEDIR}${PREFIX}/bin @# shared version of executable and library ${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \ - ${PREFIX}/lib - cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \ - lib${PYTHON_VERSION}.so - ${LN} -sf ${PREFIX}/lib/lib${PYTHON_VERSION}.so ${PYTHONPREFIX_LIBDIR}/config + ${STAGEDIR}${PREFIX}/lib + (cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \ + lib${PYTHON_VERSION}.so) + ${LN} -sf lib${PYTHON_VERSION}.so ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/config ${INSTALL_PROGRAM} \ ${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \ - ${PREFIX}/bin + ${STAGEDIR}${PREFIX}/bin @# additional files installing by ports .for script in ${BIN_SCRIPTS} ${INSTALL_SCRIPT} \ ${WRKDIR}/`${ECHO_CMD} ${script} | ${SED} -E ${BINLINKS_SUB}` \ - ${PREFIX}/bin + ${STAGEDIR}${PREFIX}/bin .endfor - @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ - ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 + ${STAGEDIR}${MAN1PREFIX}/man/man1/${PYTHON_VERSION}.1 .if !defined(NOPORTDATA) - @${MKDIR} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} @cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \ - (cd ${DATADIR}; ${TAR} -xf -) + (cd ${STAGEDIR}${DATADIR}; ${TAR} -xf -) .endif -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \ - (cd ${EXAMPLESDIR}; ${TAR} -xf -) -.endif + (cd ${STAGEDIR}${EXAMPLESDIR}; ${TAR} -xf -) @${CAT} ${PKGMESSAGE} Modified: head/lang/python31/pkg-plist ============================================================================== --- head/lang/python31/pkg-plist Sun Jan 26 14:45:54 2014 (r341191) +++ head/lang/python31/pkg-plist Sun Jan 26 14:47:56 2014 (r341192) @@ -9,6 +9,7 @@ lib/lib%%PYTHON_VERSION%%.a lib/lib%%PYTHON_VERSION%%.so lib/lib%%PYTHON_VERSION%%.so.1 libdata/pkgconfig/python-3.1.pc +man/man1/python3.1.1.gz %%PYTHON_INCLUDEDIR%%/Python-ast.h %%PYTHON_INCLUDEDIR%%/Python.h %%PYTHON_INCLUDEDIR%%/abstract.h Modified: head/lang/python32/Makefile ============================================================================== --- head/lang/python32/Makefile Sun Jan 26 14:45:54 2014 (r341191) +++ head/lang/python32/Makefile Sun Jan 26 14:47:56 2014 (r341192) @@ -20,7 +20,6 @@ CONFIGURE_ENV= OPT="" SVNVERSION="echo MAKE_ENV= VPATH="${PYTHON_WRKSRC}" INSTALL_TARGET= altinstall -MAN1= ${PYTHON_VERSION}.1 USE_LDCONFIG= yes USE_PYTHON= yes @@ -57,7 +56,6 @@ OPTIONS_DEFAULT= THREADS UCS4 PYMALLOC I NLS_DESC= Enable Gettext support for the locale module -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} @@ -181,42 +179,44 @@ pre-build: pre-su-install: .for platform in ${PLATFORMS} - ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} + ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/${platform} .for file in IN.py regen ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ - ${PYTHONPREFIX_LIBDIR}/${platform}/ + ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/${platform}/ .endfor .endfor post-install: @# install config providers - ${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION}-config ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION}-config \ + ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config \ + ${STAGEDIR}${PREFIX}/bin @# shared version of executable and library ${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}${PYABIVER}.so.1 \ - ${PREFIX}/lib - cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}${PYABIVER}.so.1 \ - lib${PYTHON_VERSION}${PYABIVER}.so - ${LN} -sf ${PREFIX}/lib/lib${PYTHON_VERSION}${PYABIVER}.so ${PYTHONPREFIX_LIBDIR}/config + ${STAGEDIR}${PREFIX}/lib + (cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}${PYABIVER}.so.1 \ + lib${PYTHON_VERSION}${PYABIVER}.so) + ${LN} -sf lib${PYTHON_VERSION}${PYABIVER}.so \ + ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/config ${INSTALL_PROGRAM} \ ${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \ - ${PREFIX}/bin + ${STAGEDIR}${PREFIX}/bin @# additional files installing by ports .for script in ${BIN_SCRIPTS} ${INSTALL_SCRIPT} \ ${WRKDIR}/`${ECHO_CMD} ${script} | ${SED} -E ${BINLINKS_SUB}` \ - ${PREFIX}/bin + ${STAGEDIR}${PREFIX}/bin .endfor - @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ - ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 + ${STAGEDIR}${MAN1PREFIX}/man/man1/${PYTHON_VERSION}.1 .if !defined(NOPORTDATA) - @${MKDIR} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} @cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \ - (cd ${DATADIR}; ${TAR} -xf -) + (cd ${STAGEDIR}${DATADIR}; ${TAR} -xf -) .endif @${CAT} ${PKGMESSAGE} Modified: head/lang/python32/pkg-plist ============================================================================== --- head/lang/python32/pkg-plist Sun Jan 26 14:45:54 2014 (r341191) +++ head/lang/python32/pkg-plist Sun Jan 26 14:47:56 2014 (r341192) @@ -11,6 +11,7 @@ lib/lib%%PYTHON_VERSION%%%%PYABIVER%%.a lib/lib%%PYTHON_VERSION%%%%PYABIVER%%.so lib/lib%%PYTHON_VERSION%%%%PYABIVER%%.so.1 libdata/pkgconfig/python-3.2.pc +man/man1/python3.2.1.gz %%PYTHON_INCLUDEDIR%%%%PYABIVER%%/accu.h %%PYTHON_INCLUDEDIR%%%%PYABIVER%%/Python-ast.h %%PYTHON_INCLUDEDIR%%%%PYABIVER%%/Python.h Modified: head/lang/python33/Makefile ============================================================================== --- head/lang/python33/Makefile Sun Jan 26 14:45:54 2014 (r341191) +++ head/lang/python33/Makefile Sun Jan 26 14:47:56 2014 (r341192) @@ -20,7 +20,6 @@ CONFIGURE_ENV= OPT="" SVNVERSION="echo MAKE_ENV= VPATH="${PYTHON_WRKSRC}" INSTALL_TARGET= altinstall -MAN1= ${PYTHON_VERSION}.1 USES= gmake USE_LDCONFIG= yes @@ -58,7 +57,6 @@ OPTIONS_DEFAULT= THREADS PYMALLOC IPV6 NLS_DESC= Enable Gettext support for the locale module -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} @@ -173,42 +171,44 @@ pre-build: pre-su-install: .for platform in ${PLATFORMS} - ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} + ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/${platform} .for file in IN.py regen ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ - ${PYTHONPREFIX_LIBDIR}/${platform}/ + ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/${platform}/ .endfor .endfor post-install: @# install config providers - ${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION}-config ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION}-config \ + ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/${PYTHON_VERSION:S/thon/thon-shared/}-config \ + ${STAGEDIR}${PREFIX}/bin @# shared version of executable and library ${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}${PYABIVER}.so.1 \ - ${PREFIX}/lib - cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}${PYABIVER}.so.1 \ - lib${PYTHON_VERSION}${PYABIVER}.so - ${LN} -sf ${PREFIX}/lib/lib${PYTHON_VERSION}${PYABIVER}.so ${PYTHONPREFIX_LIBDIR}/config + ${STAGEDIR}${PREFIX}/lib + (cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}${PYABIVER}.so.1 \ + lib${PYTHON_VERSION}${PYABIVER}.so) + ${LN} -sf lib${PYTHON_VERSION}${PYABIVER}.so \ + ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/config ${INSTALL_PROGRAM} \ ${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \ - ${PREFIX}/bin + ${STAGEDIR}${PREFIX}/bin @# additional files installing by ports .for script in ${BIN_SCRIPTS} ${INSTALL_SCRIPT} \ ${WRKDIR}/`${ECHO_CMD} ${script} | ${SED} -E ${BINLINKS_SUB}` \ - ${PREFIX}/bin + ${STAGEDIR}${PREFIX}/bin .endfor - @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ - ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 + ${STAGEDIR}${MAN1PREFIX}/man/man1/${PYTHON_VERSION}.1 .if !defined(NOPORTDATA) - @${MKDIR} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} @cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \ - (cd ${DATADIR}; ${TAR} -xf -) + (cd ${STAGEDIR}${DATADIR}; ${TAR} -xf -) .endif @${CAT} ${PKGMESSAGE} Modified: head/lang/python33/pkg-plist ============================================================================== --- head/lang/python33/pkg-plist Sun Jan 26 14:45:54 2014 (r341191) +++ head/lang/python33/pkg-plist Sun Jan 26 14:47:56 2014 (r341192) @@ -11,6 +11,7 @@ lib/lib%%PYTHON_VERSION%%%%PYABIVER%%.a lib/lib%%PYTHON_VERSION%%%%PYABIVER%%.so lib/lib%%PYTHON_VERSION%%%%PYABIVER%%.so.1 libdata/pkgconfig/python-%%PYVER%%.pc +man/man1/python3.3.1.gz %%PYTHON_INCLUDEDIR%%%%PYABIVER%%/accu.h %%PYTHON_INCLUDEDIR%%%%PYABIVER%%/Python-ast.h %%PYTHON_INCLUDEDIR%%%%PYABIVER%%/Python.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401261447.s0QElu2K078974>