From owner-svn-ports-head@FreeBSD.ORG Sat Jun 21 20:18:34 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 76FE0C0F; Sat, 21 Jun 2014 20:18:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 585A82FB7; Sat, 21 Jun 2014 20:18:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5LKIYii075409; Sat, 21 Jun 2014 20:18:34 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5LKIY19075408; Sat, 21 Jun 2014 20:18:34 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201406212018.s5LKIY19075408@svn.freebsd.org> From: Marcus von Appen Date: Sat, 21 Jun 2014 20:18:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358740 - head/net-im/pwytter X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2014 20:18:34 -0000 Author: mva Date: Sat Jun 21 20:18:33 2014 New Revision: 358740 URL: http://svnweb.freebsd.org/changeset/ports/358740 QAT: https://qat.redports.org/buildarchive/r358740/ Log: - Enable stagedir support - Fix shebang for the client script - Fix DOS line endings to avoid script execution issues - Remove easy_install dependency - Convert to PYDISTUTILS_AUTOPLIST - Bump PORTREVISION to enforce a cleanup for the easy_install references With hat: python@ Approved by: portmgr (implicit) Deleted: head/net-im/pwytter/pkg-plist Modified: head/net-im/pwytter/Makefile Modified: head/net-im/pwytter/Makefile ============================================================================== --- head/net-im/pwytter/Makefile Sat Jun 21 19:24:50 2014 (r358739) +++ head/net-im/pwytter/Makefile Sat Jun 21 20:18:33 2014 (r358740) @@ -3,7 +3,7 @@ PORTNAME= pwytter PORTVERSION= 0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im www python MASTER_SITES= GOOGLE_CODE DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -19,31 +19,33 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tk RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= gettext zip -USE_PYTHON= 2 -USE_PYDISTUTILS= easy_install +USES= gettext zip dos2unix +USE_PYTHON= 2 +USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -post-patch: .SILENT - ${RM} -r ${WRKSRC}/twclient/simplejson -# Prefer system-wide `simplejson' module; fix for broken `setup.py': include -# `pwCache.py' in sources list, adjust locale data path - ${REINPLACE_CMD} -e "s|'simplejson|}, #&|" \ - -e "s|pwParam|pwCache','&|" ${WRKSRC}/setup.py - ${REINPLACE_CMD} -e 's|locale_path =|& "${PYEASYINSTALL_SITELIBDIR}/${PYEASYINSTALL_EGG}/locale" #|' \ +DOS2UNIX_GLOB = *.py + +post-patch: + @${RM} -rf ${WRKSRC}/twclient/simplejson + @${REINPLACE_CMD} -e "s|'simplejson|}, #&|" \ + -e "s|pwParam|pwCache','&|" \ + -e "s|d\[p\]|d\['share/'+p\]|g" \ + -e 's|text",|${DATADIR_REL}/text",|' \ + -e 's|media",|${DATADIR_REL}/media",|' \ + -e 's|theme",|${DATADIR_REL}/theme",|' \ + -e 's|\\\\|/|' \ + -e "/import ez_setup/d" \ + -e "/ez_setup.use_setuptools()/d" ${WRKSRC}/setup.py + @${REINPLACE_CMD} \ + -e 's|locale_path = .*|locale_path = "${PREFIX}/share/locale"|' \ + -e '1,3d' \ + -e 's|/usr/bin/python|${PYTHON_CMD}|' \ ${WRKSRC}/pwytter.py -# Adjust paths for themes and media (don't assume they are relative to .) - ${REINPLACE_CMD} -e 's|media"|${DATADIR}/&|' ${WRKSRC}/pwytter.py \ + @${REINPLACE_CMD} -e 's|media"|${DATADIR}/&|' ${WRKSRC}/pwytter.py \ ${WRKSRC}/twclient/__init__.py - ${REINPLACE_CMD} -e "s|theme'|${DATADIR}/&|" ${WRKSRC}/pwTheme.py -# Remove gettext `.po' files: not needed when we have them precompiled - ${FIND} ${WRKSRC}/locale -name pwytter.po -delete - -NO_STAGE= yes -post-install: -# Install themes and media files where they belong - @${MKDIR} ${DATADIR}/media ${DATADIR}/theme - ${INSTALL_DATA} ${WRKSRC}/media/* ${DATADIR}/media - ${INSTALL_DATA} ${WRKSRC}/theme/* ${DATADIR}/theme + @${REINPLACE_CMD} -e "s|theme'|${DATADIR}/&|" ${WRKSRC}/pwTheme.py + @${FIND} ${WRKSRC}/locale -name pwytter.po -delete .include