Bug 169513 - [PATCH] devel/py-thrift: simplify Makefile and fix PLIST
Summary: [PATCH] devel/py-thrift: simplify Makefile and fix PLIST
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Po-Chuan Hsieh
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-06-28 10:00 UTC by Po-Chuan Hsieh
Modified: 2012-08-14 11:10 UTC (History)
1 user (show)

See Also:


Attachments
py27-thrift-0.8.0,1.patch (1.92 KB, patch)
2012-06-28 10:00 UTC, Po-Chuan Hsieh
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Po-Chuan Hsieh freebsd_committer freebsd_triage 2012-06-28 10:00:23 UTC
- 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)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-06-28 10:01:06 UTC
Responsible Changed
From-To: freebsd-ports-bugs->freebsd-python

freebsd-python@ wants this port PRs (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2012-06-28 10:01:10 UTC
Maintainer of devel/py-thrift,

Please note that PR ports/169513 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/169513

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2012-06-28 10:01:12 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 Po-Chuan Hsieh freebsd_committer freebsd_triage 2012-06-28 16:59:28 UTC
Responsible Changed
From-To: freebsd-python->sunpoet

I'll take it.
Comment 5 dfilter service freebsd_committer freebsd_triage 2012-08-14 11:06:59 UTC
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%%
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 6 Po-Chuan Hsieh freebsd_committer freebsd_triage 2012-08-14 11:09:49 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!