Date: Thu, 28 Jun 2012 16:54:37 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: komarov@valerka.net Subject: ports/169513: [PATCH] devel/py-thrift: simplify Makefile and fix PLIST Message-ID: <3WNFDF23WGzBnD@sunpoet.net> Resent-Message-ID: <201206280900.q5S90O32025888@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 169513
>Category: ports
>Synopsis: [PATCH] devel/py-thrift: simplify Makefile and fix PLIST
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jun 28 09:00:23 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 9.0-STABLE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 9.0-STABLE FreeBSD 9.0-STABLE #0: Sat Jun 23 18:28:28 CST 2012
>Description:
- 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
Port maintainer (komarov@valerka.net) is cc'd.
Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: CVS)
>How-To-Repeat:
>Fix:
--- py27-thrift-0.8.0,1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/py-thrift/Makefile,v
retrieving revision 1.14
diff -u -u -r1.14 Makefile
--- Makefile 23 May 2012 00:23:12 -0000 1.14
+++ Makefile 28 Jun 2012 08:54:13 -0000
@@ -9,27 +9,20 @@
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>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/py-thrift/pkg-plist,v
retrieving revision 1.7
diff -u -u -r1.7 pkg-plist
--- pkg-plist 6 Jan 2012 01:12:29 -0000 1.7
+++ pkg-plist 28 Jun 2012 08:54:13 -0000
@@ -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%%
--- py27-thrift-0.8.0,1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3WNFDF23WGzBnD>