2 files changed, 31 insertions, 45 deletions

diff --git a/www/trac-autocomplete/Makefile b/www/trac-autocomplete/Makefile
index 70335148117a..cc13d70c0297 100644
--- a/www/trac-autocomplete/Makefile
+++ b/www/trac-autocomplete/Makefile
@@ -1,40 +1,26 @@
-# New ports collection makefile for: trac-autocomplete
-# Date created:                      December 07, 2009
-# Whom:                              Eygene Ryabinkin <rea-fbsd@codelabs.ru>
-#
+# Created by: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	autocomplete
 PORTVERSION=	0.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www python
 MASTER_SITES=	http://dist.codelabs.ru/fbsd/
 PKGNAMEPREFIX=	trac-
 DISTNAME=	autocompleteusersplugin-r${REL}
 
 MAINTAINER=	rea@FreeBSD.org
-COMMENT=	A plugin for autocompletion of user names in ticket fields
+COMMENT=	Plugin for autocompletion of user names in ticket fields
 
-BUILD_DEPENDS+=	easy_install:${PORTSDIR}/devel/py-setuptools
 RUN_DEPENDS+=	trac>=0.11:${PORTSDIR}/www/trac
 
-USE_PYTHON=	2.5+
+USE_PYTHON=	-2.7
 USE_ZIP=	yes
-NO_BUILD=	yes
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	AutocompleteUsers
 PYDISTUTILS_NOEGGINFO=	yes
 WRKSRC=		${WRKDIR}/autocompleteusersplugin/0.11
 REL=		8451
-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:
diff --git a/www/trac-autocomplete/pkg-plist b/www/trac-autocomplete/pkg-plist
index fd06920ed0ec..ff81e6e7a3fc 100644
--- a/www/trac-autocomplete/pkg-plist
+++ b/www/trac-autocomplete/pkg-plist
@@ -1,26 +1,26 @@
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/autocompleteusers/__init__.py
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/autocompleteusers/autocompleteusers.py
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/autocompleteusers/__init__.pyc
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/autocompleteusers/autocompleteusers.pyc
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/autocompleteusers/__init__.pyo
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/autocompleteusers/autocompleteusers.pyo
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/autocompleteusers/htdocs/css/indicator.gif
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/autocompleteusers/htdocs/css/autocomplete.css
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/autocompleteusers/htdocs/js/autocomplete_ticket.js
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/autocompleteusers/htdocs/js/format_item.js
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/autocompleteusers/htdocs/js/autocomplete_ticket_cc.js
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/autocompleteusers/htdocs/js/autocomplete_newticket.js
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/autocompleteusers/htdocs/js/autocomplete.js
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/autocompleteusers/htdocs/js/autocomplete_newticket_cc.js
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/EGG-INFO/top_level.txt
-@dirrm %%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/autocompleteusers/htdocs/js
-@dirrm %%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/autocompleteusers/htdocs/css
-@dirrm %%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/autocompleteusers/htdocs
-@dirrm %%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/autocompleteusers
-@dirrm %%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/AutocompleteUsers-0.4.1-py%%PYTHON_VER%%.egg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/autocompleteusers.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/autocompleteusers.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/autocompleteusers.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/css/indicator.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/css/autocomplete.css
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/js/autocomplete_ticket.js
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/js/format_item.js
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/js/autocomplete_ticket_cc.js
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/js/autocomplete_newticket.js
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/js/autocomplete.js
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/js/autocomplete_newticket_cc.js
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/js
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs/css
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers/htdocs
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/autocompleteusers
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%