Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Aug 2012 10:06:49 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r302512 - head/devel/py-thrift
Message-ID:  <201208141006.q7EA6n1Z079231@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>

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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208141006.q7EA6n1Z079231>