Date: Thu, 22 May 2014 15:40:01 GMT From: Neal Nelson <ports@nicandneal.net> To: freebsd-python@FreeBSD.org Subject: Re: ports/190076: x11-toolkits/py-wxPython28: Update py-wxPython28 Ports for staging Message-ID: <201405221540.s4MFe1Mt040378@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/190076; it has been noted by GNATS. From: Neal Nelson <ports@nicandneal.net> To: miwi@FreeBSD.org, bug-followup@FreeBSD.org Cc: Subject: Re: ports/190076: x11-toolkits/py-wxPython28: Update py-wxPython28 Ports for staging Date: Thu, 22 May 2014 17:30:48 +0200 This is a multi-part message in MIME format. --------------060400010303060604000808 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit On 05/22/14 08:55, miwi@FreeBSD.org wrote: > Synopsis: x11-toolkits/py-wxPython28: Update py-wxPython28 Ports for staging > > State-Changed-From-To: open->feedback > State-Changed-By: miwi > State-Changed-When: Thu May 22 06:55:00 UTC 2014 > State-Changed-Why: > Hi, the build fails right now > http://pkgdev.miwibox.org/data/84i386-default/2014-05-22_06h30m11s/logs/errors/py27-wxPython28-common-2.8.12.1_4.log > > http://www.freebsd.org/cgi/query-pr.cgi?pr=190076 > > !DSPAM:537d9f48169671815919449! > Oops, sorry. Attached is a new patch for x11-toolkits/py-wxPython28/Makefile I am also experiencing some problems with the x11-toolkits/py-wxPython28/pkg-plist for this port as at the moment the py-wxPython-common port installs various version files used by wxPython. Unfortunately by adding the changes to the pkg-plist attached to this pr, the ports now install files into the same place, whereas by leaving the pkg-plist as it is poudriere complains of orphaned files. --------------060400010303060604000808 Content-Type: text/plain; charset=us-ascii; name="Makefile.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="Makefile.patch" Index: Makefile =================================================================== --- Makefile (revision 354749) +++ Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= wxPython PORTVERSION= 2.8.12.1 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= x11-toolkits python MASTER_SITES= SF/wxpython/wxPython/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,7 +10,7 @@ PKGNAMESUFFIX= 28 DISTNAME= ${PORTNAME}-src-${PORTVERSION} -MAINTAINER= neal@nelson.name +MAINTAINER= ports@nicandneal.net COMMENT= Python bindings for the wxWidgets/GTK GUI toolkit RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}opengl>=0:${PORTSDIR}/graphics/py-opengl @@ -18,11 +18,10 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/wxPython DIST_SUBDIR= python -USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS= yes PLIST_SUB= PYTHON_VER=${PYTHON_VER} -USES= gettext gmake pkgconfig +USES= gettext gmake pkgconfig tar:bzip2 PYDISTUTILS_BUILDARGS= \ WX_CONFIG="${WX_CONFIG}" \ @@ -37,7 +36,6 @@ CONFIGURE_ARGS+= --enable-aui -NO_STAGE= yes post-extract: # only keep the scripts we need @${RM} ${WRKSRC}/scripts/*.py @@ -114,23 +112,23 @@ .if defined(WITH_COMMON_ONLY) do-install: # DEMO - @${MKDIR} ${DEMO_DIR} - @cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${DEMO_DIR} + @${MKDIR} ${STAGEDIR}/${DEMO_DIR} + @cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${STAGEDIR}/${DEMO_DIR} # header files - @${MKDIR} ${PREFIX}/include/wx-${WX_VERSION}/wx/wxPython/i_files + @${MKDIR} ${STAGEDIR}/${PREFIX}/include/wx-${WX_VERSION}/wx/wxPython/i_files .for glob in *.i *.py @${INSTALL_DATA} ${WRKSRC}/src/${glob} \ - ${PREFIX}/include/wx-${WX_VERSION}/wx/wxPython/i_files + ${STAGEDIR}/${PREFIX}/include/wx-${WX_VERSION}/wx/wxPython/i_files .endfor @${INSTALL_DATA} ${WRKSRC}/include/wx/wxPython/*.h \ - ${PREFIX}/include/wx-${WX_VERSION}/wx/wxPython + ${STAGEDIR}/${PREFIX}/include/wx-${WX_VERSION}/wx/wxPython # scripts - @${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${PREFIX}/bin + @${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${STAGEDIR}/${PREFIX}/bin ## wxversion - @${MKDIR} ${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@} + @${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@} # wxversion script @${INSTALL_DATA} ${WRKSRC}/wxversion/* \ - ${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@} + ${STAGEDIR}/${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@} .endif # defined(WITH_COMMON_ONLY) post-install: @@ -137,10 +135,10 @@ .if !defined(WITH_COMMON_ONLY) # fix installation permissions ${CHMOD} -R a+rX \ - ${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/${WX_PYTHON_DIR} + ${STAGEDIR}/${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/${WX_PYTHON_DIR} # Remove unwanted .egg-info - ${RM} -rf ${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/wxPython_common-*.egg-info - ${RM} -rf ${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/${WX_PYTHON_DIR}/*.egg-info + ${RM} -rf ${STAGEDIR}/${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/wxPython_common-*.egg-info + ${RM} -rf ${STAGEDIR}/${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/${WX_PYTHON_DIR}/*.egg-info .endif ## # wxversion wxPython available list @@ -148,9 +146,9 @@ .if !defined(WITH_COMMON_ONLY) # add ansi/unicode to the available list @${ECHO_CMD} ${WX_PYTHON_DIR} >> \ - ${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/wx.pth + ${STAGEDIR}/${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/wx.pth @${CHMOD} ${SHAREMODE} \ - ${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/wx.pth + ${STAGEDIR}/${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/wx.pth .endif .include <bsd.port.post.mk> --------------060400010303060604000808--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405221540.s4MFe1Mt040378>