Bug 173838 - www/trac-tickettemplate: do not directly depend on setuptools
Summary: www/trac-tickettemplate: do not directly depend on setuptools
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: Eygene Ryabinkin
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-11-22 15:30 UTC by Ruslan Makhmatkhanov
Modified: 2012-12-26 10:10 UTC (History)
0 users

See Also:


Attachments
file.diff (2.81 KB, patch)
2012-11-22 15:30 UTC, Ruslan Makhmatkhanov
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Ruslan Makhmatkhanov freebsd_committer freebsd_triage 2012-11-22 15:30:00 UTC
- do not directly depend on py-setuptools, use USE_DISTUTILS=easy_install instead
- bump PORTREVISION because of dependencies change
- trim Makefile header
- remove indefinite article from COMMENT
- limit python version to 2.x
- remove checks for deprecated python versions
- general Makefile clean-up
- move pkg-plist content into Makefile:PLIST_FILES

buildlog: http://people.freebsd.org/~rm/trac-tickettemplate-0.7_1.log

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-11-22 15:30:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->rea

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2012-12-26 10:05:00 UTC
Author: rm
Date: Wed Dec 26 10:04:46 2012
New Revision: 309511
URL: http://svnweb.freebsd.org/changeset/ports/309511

Log:
  - do not directly depend on py-setuptools, use USE_DISTUTILS=easy_install instead
  - bump PORTREVISION because of dependencies change
  - trim Makefile header
  - remove indefinite article from COMMENT
  - limit python version to 2.x
  - remove checks for deprecated python versions
  - general Makefile clean-up
  - move pkg-plist content into Makefile:PLIST_FILES
  
  PR:		173838
  Submitted by:	rm (myself)
  Approved by:	maintainer timeout (~2 months)

Deleted:
  head/www/trac-tickettemplate/pkg-plist
Modified:
  head/www/trac-tickettemplate/Makefile

Modified: head/www/trac-tickettemplate/Makefile
==============================================================================
--- head/www/trac-tickettemplate/Makefile	Wed Dec 26 10:03:58 2012	(r309510)
+++ head/www/trac-tickettemplate/Makefile	Wed Dec 26 10:04:46 2012	(r309511)
@@ -1,53 +1,26 @@
-# New ports collection makefile for: trac-autocomplete
-# Date created:                      August 18, 2011
-# Whom:                              Eygene Ryabinkin <rea@FreeBSD.org>
-#
+# Created by: Eygene Ryabinkin <rea@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	tickettemplate
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://dist.codelabs.ru/fbsd/trac-${PORTNAME}/
 PKGNAMEPREFIX=	trac-
 DISTNAME=	trac${PORTNAME}plugin-r${REL}
 
 MAINTAINER=	rea@FreeBSD.org
-COMMENT=	A plugin for making ticket templates
+COMMENT=	Plugin for making ticket templates
 
-BUILD_DEPENDS+=	easy_install:${PORTSDIR}/devel/py-setuptools
 RUN_DEPENDS+=	trac>=0.11:${PORTSDIR}/www/trac
 
-USE_PYTHON=	yes
-USE_ZIP=	yes
-NO_BUILD=	yes
-
-.include <bsd.port.pre.mk>
-
-# Python < 2.6 needs simplejson package.
-.if ${PYTHON_VER} == 2.4 || ${PYTHON_VER} == 2.5
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}simplejson:${PORTSDIR}/devel/py-simplejson
-.endif
-
-USE_PYDISTUTILS=	yes
+USE_PYTHON=	-2.7
+USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	TracTicketTemplate
-PYDISTUTILS_NOEGGINFO=	yes
+USE_ZIP=	yes
 
 WRKSRC=		${WRKDIR}/trac${PORTNAME}plugin/0.11
 REL=		10605
-PLIST_SUB+=	PYTHON_VER=${PYTHON_VER}
-
-# We must fix file permissions -- ZIP file have 0000 for every file.
-# Directory permissions are fine (they aren't stored inside ZIP
-# file), but we set them too -- just in case.
-post-extract:
-	@${FIND} ${WRKSRC} -type f | ${XARGS} ${CHMOD} 644
-	@${FIND} ${WRKSRC} -type d | ${XARGS} ${CHMOD} 755
-
-# Target to generate packaging list
-plist:
-	@${FIND} ${PYTHON_SITELIBDIR}/${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py${PYTHON_VER}.egg -type f | ${SED} -e's|^${PYTHON_SITELIBDIR}/|%%PYTHON_SITELIBDIR%%/|;s|/${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py[[:digit:]\.]*.egg|/${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py%%PYTHON_VER%%.egg|'
-	@${FIND} ${PYTHON_SITELIBDIR}/${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py${PYTHON_VER}.egg -type d -mindepth 1 | ${SORT} -r | ${SED} -e's|^${PYTHON_SITELIBDIR}/|@dirrm %%PYTHON_SITELIBDIR%%/|;s|/${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py[[:digit:]\.]*.egg|/${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py%%PYTHON_VER%%.egg|'
-	@[ -d ${PYTHON_SITELIBDIR}/${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py${PYTHON_VER}.egg ] && ${ECHO} '@dirrm %%PYTHON_SITELIBDIR%%/${PYDISTUTILS_PKGNAME}-${PORTVERSION}-py%%PYTHON_VER%%.egg'
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
_______________________________________________
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 3 Ruslan Makhmatkhanov freebsd_committer freebsd_triage 2012-12-26 10:06:01 UTC
State Changed
From-To: open->closed

Committed, thank you!