From owner-svn-ports-all@FreeBSD.ORG Tue Aug 14 10:06:49 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6E062106566B; Tue, 14 Aug 2012 10:06:49 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3F2038FC08; Tue, 14 Aug 2012 10:06:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7EA6nP3079234; Tue, 14 Aug 2012 10:06:49 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7EA6n1Z079231; Tue, 14 Aug 2012 10:06:49 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201208141006.q7EA6n1Z079231@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Tue, 14 Aug 2012 10:06:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302512 - head/devel/py-thrift X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Aug 2012 10:06:49 -0000 Author: sunpoet Date: Tue Aug 14 10:06:48 2012 New Revision: 302512 URL: http://svn.freebsd.org/changeset/ports/302512 Log: - Simplify Makefile: - Add MASTER_SITES and DISTINFO_FILE - Remove DISTFILES, FETCH_DEPENDS, post-extract: and no-op do-patch: - Fix PLIST: - Fix make package when setuptools was installed - Remove duplicated PYDISTUTILS_EGGINFO - Remove dirrmtry PYTHON_SITELIBDIR PR: ports/169513 Submitted by: sunpoet (myself) Approved by: maintainer (timeout, 47 days) Modified: head/devel/py-thrift/Makefile (contents, props changed) head/devel/py-thrift/pkg-plist (contents, props changed) Modified: head/devel/py-thrift/Makefile ============================================================================== --- head/devel/py-thrift/Makefile Tue Aug 14 10:01:36 2012 (r302511) +++ head/devel/py-thrift/Makefile Tue Aug 14 10:06:48 2012 (r302512) @@ -9,27 +9,20 @@ PORTNAME= thrift PORTVERSION= ${THRIFT_PORTVERSION} # to keep in sync with thrift PORTEPOCH= 1 CATEGORIES= devel python +MASTER_SITES= APACHE/thrift/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTFILES= MAINTAINER= komarov@valerka.net COMMENT= Python interface to Thrift -FETCH_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/devel/thrift:extract +DISTINFO_FILE= ${.CURDIR}/../thrift/distinfo -USE_PYTHON= yes +USE_PYTHON= yes USE_PYDISTUTILS= yes +WRKSRC= ${WRKDIR}/${DISTNAME}/lib/py -PLIST_SUB+= PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO} -post-extract: - @${LN} -sfh \ - `cd ${PORTSDIR}/devel/thrift && ${MAKE} -V WRKSRC`/lib/py ${WRKSRC} - -do-patch: - ${REINPLACE_CMD} "/name = '/s/Thrift/thrift/" \ - ${WRKSRC}/setup.py - ${REINPLACE_CMD} "/version = '/s/0\.1/${PORTVERSION}/" \ - ${WRKSRC}/setup.py +post-patch: + @${REINPLACE_CMD} -e 's|setuptools|do_not_use_&|' ${WRKSRC}/${PYSETUP} .include "../thrift/bsd.thrift.mk" .include Modified: head/devel/py-thrift/pkg-plist ============================================================================== --- head/devel/py-thrift/pkg-plist Tue Aug 14 10:01:36 2012 (r302511) +++ head/devel/py-thrift/pkg-plist Tue Aug 14 10:06:48 2012 (r302512) @@ -62,9 +62,7 @@ %%PYTHON_SITELIBDIR%%/thrift/transport/__init__.py %%PYTHON_SITELIBDIR%%/thrift/transport/__init__.pyc %%PYTHON_SITELIBDIR%%/thrift/transport/__init__.pyo -%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%% @dirrm %%PYTHON_SITELIBDIR%%/thrift/transport @dirrm %%PYTHON_SITELIBDIR%%/thrift/server @dirrm %%PYTHON_SITELIBDIR%%/thrift/protocol @dirrm %%PYTHON_SITELIBDIR%%/thrift -@dirrmtry %%PYTHON_SITELIBDIR%%