- update to 1.4.12

- switch master sites to CHEESESHOP
- trim Makefile header

while here:
- shorten COMMENT (portlint warning)
- limit python version to 2.x only (except)
- do not install *.orig files
- general cleanup
- tab -> space change in pkg-descr:WWW

PR:		174973
Submitted by:	Kevin Golding <ports@caomhin.org> (maintainer)

4 files changed, 23 insertions, 21 deletions

diff --git a/www/py-django-livesettings/Makefile b/www/py-django-livesettings/Makefile
index f778ed8191f3..4121b6dcb527 100644
--- a/www/py-django-livesettings/Makefile
+++ b/www/py-django-livesettings/Makefile
@@ -1,31 +1,27 @@
-# New ports collection makefile for:	py-django-livesettings
-# Date created:				19 May 2010
-# Whom:					Kevin Golding <ports@caomhin.org>
-#
+# Created by: Kevin Golding <ports@caomhin.org>
 # $FreeBSD$
-#
 
 PORTNAME=	django-livesettings
-PORTVERSION=	1.4.9
-PORTREVISION=	1
+DISTVERSION=	1.4-12
 CATEGORIES=	www python
-MASTER_SITES=	http://www.caomhin.org/ports/
+MASTER_SITES=	CHEESESHOP
+MASTER_SITE_SUBDIR=	source/d/${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@caomhin.org
-COMMENT=	Configure settings via Django admin interface rather than by editing settings.py
+COMMENT=	Configure Django project settings via admin interface
 
 LICENSE=	BSD
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:${PORTSDIR}/devel/py-setuptools_hg
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:${PORTSDIR}/www/py-django
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django>0:${PORTSDIR}/www/py-django
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_PYTHON=	yes
+USE_PYTHON=	-2.7
 USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_NOEGGINFO=	yes
-PYEASYINSTALL_EGG=	${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PORTVERSION:C/([[:digit:]]\.[[:digit:]])\./\1_/g}-${PYTHON_VERSION:S/thon//}${PYEASYINSTALL_OSARCH}.egg
-PYEASYINSTALL_UNINSTALLARGS=	-q -m -S ${PYTHON_SITELIBDIR} \
-				${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION:C/([[:digit:]]\.[[:digit:]])\./\1_/g}
+PYDISTUTILS_PKGNAME=	${PORTNAME:S/-/_/}
+PYDISTUTILS_PKGVERSION=	${DISTVERSION:S/-/_/}
+
+post-patch:
+	@${FIND} ${WRKSRC} -type f -name "*.orig" -delete
 
 .include <bsd.port.mk>
diff --git a/www/py-django-livesettings/distinfo b/www/py-django-livesettings/distinfo
index 220cf3d32e19..352c0e5ebf69 100644
--- a/www/py-django-livesettings/distinfo
+++ b/www/py-django-livesettings/distinfo
@@ -1,2 +1,2 @@
-SHA256 (django-livesettings-1.4.9.tar.gz) = 9ce6d4f29876bee06930cb643137a37b7fd2773314e081a422b1f427e5c3c326
-SIZE (django-livesettings-1.4.9.tar.gz) = 45241
+SHA256 (django-livesettings-1.4-12.tar.gz) = c3fbb39fbe8b9e3c54a9621666a2aedf095d8215c8cb5b52fe87eb870d5d44aa
+SIZE (django-livesettings-1.4-12.tar.gz) = 50254
diff --git a/www/py-django-livesettings/pkg-descr b/www/py-django-livesettings/pkg-descr
index bb9d36f58c4f..a640e401ccdf 100644
--- a/www/py-django-livesettings/pkg-descr
+++ b/www/py-django-livesettings/pkg-descr
@@ -1,5 +1,5 @@
-Django-Livesettings is a project split from the 'Satchmo Project'. It provides 
-the ability to configure settings via an admin interface, rather than by 
+Django-Livesettings is a project split from the 'Satchmo Project'. It provides
+the ability to configure settings via an admin interface, rather than by
 editing "settings.py".
 
-WWW:    http://bitbucket.org/bkroeze/django-livesettings/
+WWW: http://bitbucket.org/bkroeze/django-livesettings/
diff --git a/www/py-django-livesettings/pkg-plist b/www/py-django-livesettings/pkg-plist
index 0844ff4e2164..739cefc4903f 100644
--- a/www/py-django-livesettings/pkg-plist
+++ b/www/py-django-livesettings/pkg-plist
@@ -21,6 +21,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/livesettings/signals.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/livesettings/signals.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/livesettings/signals.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/livesettings/test_urls.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/livesettings/test_urls.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/livesettings/test_urls.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/livesettings/tests.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/livesettings/tests.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/livesettings/tests.pyo
@@ -93,6 +96,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/livesettings/test_app/localsite/views.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/livesettings/test_app/localsite/views.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/livesettings/test_app/localsite/views.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/livesettings/test_app/localsite/templates/myapp/index.html
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/livesettings/test_app/localsite/templates/myapp
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/livesettings/test_app/localsite/templates
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/livesettings/test_app/localsite
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/livesettings/test_app
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/livesettings/templatetags