Date: Wed, 21 May 2014 15:49:03 GMT From: Neal Nelson <ports@nicandneal.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190076: Update py-wxPython28 Ports for staging Message-ID: <201405211549.s4LFn3ho040538@cgiserv.freebsd.org> Resent-Message-ID: <201405211550.s4LFo0gF099602@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190076
>Category: ports
>Synopsis: Update py-wxPython28 Ports for staging
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed May 21 15:50:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Neal Nelson
>Release: 10.0
>Organization:
>Environment:
>Description:
Update x11-toolkits/py-wxPython28, x11-toolkits/py-wxPython28-common and x11-toolkits/py-wxPython28-unicode ports to use staging.
Also update maintainer email address.
>How-To-Repeat:
>Fix:
- x11-toolkits/py-wxPython28
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
@@ -115,22 +113,22 @@
do-install:
# DEMO
@${MKDIR} ${DEMO_DIR}
- @cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${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>
Index: pkg-plist
===================================================================
--- pkg-plist (revision 354749)
+++ pkg-plist (working copy)
@@ -2428,6 +2428,10 @@
%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/xrc.py
%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/xrc.pyc
%%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/xrc.pyo
+%%PYTHON_SITELIBDIR%%/wx.pth
+%%PYTHON_SITELIBDIR%%/wxversion.py
+%%PYTHON_SITELIBDIR%%/wxversion.pyc
+%%PYTHON_SITELIBDIR%%/wxversion.pyo
@dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/tools
@dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/lib/mixins
@dirrm %%PYTHON_SITELIBDIR%%/%%WX_PYTHON_DIR%%/wxPython/lib/editor
- x11-toolkits/py-wxPython28-common
Index: Makefile
===================================================================
--- Makefile (revision 354749)
+++ Makefile (working copy)
@@ -1,7 +1,7 @@
# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 3
+PORTREVISION= 4
WITH_COMMON_ONLY= yes
@@ -9,5 +9,4 @@
PLIST= ${.CURDIR}/pkg-plist
-NO_STAGE= yes
.include "${MASTERDIR}/Makefile"
- x11-toolkits/py-wxPython28-unicode
Index: Makefile
===================================================================
--- Makefile (revision 354749)
+++ Makefile (working copy)
@@ -1,9 +1,10 @@
# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
# $FreeBSD$
+PORTREVISION= 1
+
WITH_WXPYTHON_UNICODE= yes
MASTERDIR= ${.CURDIR}/../py-wxPython28
-NO_STAGE= yes
.include "${MASTERDIR}/Makefile"
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405211549.s4LFn3ho040538>