Sat Jan 18 19:07:57 2014 UTC ()
Use versioned_dependencies.mk for flup.


(wiz)
diff -r1.11 -r1.12 pkgsrc/www/loggerhead/Makefile
diff -r1.47 -r1.48 pkgsrc/www/py-django/Makefile
diff -r1.1 -r1.2 pkgsrc/www/py-django14/Makefile
cvs diff -r1.11 -r1.12 pkgsrc/www/loggerhead/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/loggerhead/Attic/Makefile 2012/10/28 06:30:21 1.11
+++ pkgsrc/www/loggerhead/Attic/Makefile 2014/01/18 19:07:57 1.12
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1# $NetBSD: Makefile,v 1.11 2012/10/28 06:30:21 asau Exp $ 1# $NetBSD: Makefile,v 1.12 2014/01/18 19:07:57 wiz Exp $
2 2
3DISTNAME= loggerhead-${VER} 3DISTNAME= loggerhead-${VER}
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= www scm 5CATEGORIES= www scm
6MASTER_SITES= http://launchpad.net/loggerhead/1.18/${VER}/+download/ 6MASTER_SITES= http://launchpad.net/loggerhead/1.18/${VER}/+download/
7VER= 1.18.1 7VER= 1.18.1
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://launchpad.net/loggerhead 10HOMEPAGE= https://launchpad.net/loggerhead
11COMMENT= Web viewer for Bazaar branches 11COMMENT= Web viewer for Bazaar branches
12LICENSE= gnu-gpl-v2 # or later 12LICENSE= gnu-gpl-v2 # or later
13 13
14DEPENDS+= bzr>=1.17:../../devel/bzr 14DEPENDS+= bzr>=1.17:../../devel/bzr
15DEPENDS+= ${PYPKGPREFIX}-simplejson>=2.0:../../converters/py-simplejson 15DEPENDS+= ${PYPKGPREFIX}-simplejson>=2.0:../../converters/py-simplejson
16DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 16DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
17DEPENDS+= ${PYPKGPREFIX}-Paste>=1.2:../../www/py-paste 17DEPENDS+= ${PYPKGPREFIX}-Paste>=1.2:../../www/py-paste
18DEPENDS+= ${PYPKGPREFIX}-PasteDeploy>=1.3:../../www/py-PasteDeploy 18DEPENDS+= ${PYPKGPREFIX}-PasteDeploy>=1.3:../../www/py-PasteDeploy
19DEPENDS+= ${PYPKGPREFIX}-SimpleTAL>=4.1:../../www/py-simpletal 19DEPENDS+= ${PYPKGPREFIX}-SimpleTAL>=4.1:../../www/py-simpletal
20DEPENDS+= ${PYPKGPREFIX}-flup-[0-9]*:../../www/py-flup 
21 20
22.include "../../lang/python/pyversion.mk" 21PYTHON_VERSIONED_DEPENDENCIES= flup
 22
23.include "../../lang/python/application.mk" 23.include "../../lang/python/application.mk"
24.include "../../lang/python/distutils.mk" 24.include "../../lang/python/distutils.mk"
 25.include "../../lang/python/versioned_dependencies.mk"
25.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.47 -r1.48 pkgsrc/www/py-django/Makefile (expand / switch to unified diff)

--- pkgsrc/www/py-django/Makefile 2013/12/31 12:02:53 1.47
+++ pkgsrc/www/py-django/Makefile 2014/01/18 19:07:57 1.48
@@ -1,40 +1,37 @@ @@ -1,40 +1,37 @@
1# $NetBSD: Makefile,v 1.47 2013/12/31 12:02:53 adam Exp $ 1# $NetBSD: Makefile,v 1.48 2014/01/18 19:07:57 wiz Exp $
2 2
3DISTNAME= Django-1.6.1 3DISTNAME= Django-1.6.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
5CATEGORIES= www python 5CATEGORIES= www python
6MASTER_SITES= http://www.djangoproject.com/m/releases/${PKGVERSION_NOREV:R}/ 6MASTER_SITES= http://www.djangoproject.com/m/releases/${PKGVERSION_NOREV:R}/
7 7
8MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://www.djangoproject.com/ 9HOMEPAGE= http://www.djangoproject.com/
10COMMENT= Django, a high-level Python Web framework 10COMMENT= Django, a high-level Python Web framework
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13PREV_PKGPATH= www/py-django-devel 13PREV_PKGPATH= www/py-django-devel
14 14
15# depends are not ready for Python 3.x 
16#PYTHON_VERSIONS_INCLUDE_3X= yes 
17 
18PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} 15PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
19 16
20USE_LANGUAGES= # empty 17USE_LANGUAGES= # empty
21REPLACE_PYTHON= ${WRKSRC}/django/bin/*.py 18REPLACE_PYTHON= ${WRKSRC}/django/bin/*.py
22REPLACE_PYTHON+= ${WRKSRC}/django/bin/profiling/*.py 19REPLACE_PYTHON+= ${WRKSRC}/django/bin/profiling/*.py
23REPLACE_PYTHON+= ${WRKSRC}/django/contrib/admin/bin/*.py 20REPLACE_PYTHON+= ${WRKSRC}/django/contrib/admin/bin/*.py
24REPLACE_PYTHON+= ${WRKSRC}/django/contrib/admin/static/admin/js/*.py 21REPLACE_PYTHON+= ${WRKSRC}/django/contrib/admin/static/admin/js/*.py
25REPLACE_PYTHON+= ${WRKSRC}/django/conf/project_template/*.py 22REPLACE_PYTHON+= ${WRKSRC}/django/conf/project_template/*.py
26 23
27DEPENDS+= ${PYPKGPREFIX}-flup-[0-9]*:../../www/py-flup 24PYTHON_VERSIONED_DEPENDENCIES= flup
28 25
29.include "options.mk" 26.include "options.mk"
30 27
31pre-configure: 28pre-configure:
32.if empty(PKG_OPTIONS:Mmysql) 29.if empty(PKG_OPTIONS:Mmysql)
33 rm -r ${WRKSRC}/django/db/backends/mysql 30 rm -r ${WRKSRC}/django/db/backends/mysql
34.endif 31.endif
35.if empty(PKG_OPTIONS:Moracle) 32.if empty(PKG_OPTIONS:Moracle)
36 rm -r ${WRKSRC}/django/db/backends/oracle 33 rm -r ${WRKSRC}/django/db/backends/oracle
37.endif 34.endif
38.if empty(PKG_OPTIONS:Mpgsql) 35.if empty(PKG_OPTIONS:Mpgsql)
39 rm -r ${WRKSRC}/django/db/backends/postgresql_psycopg2 36 rm -r ${WRKSRC}/django/db/backends/postgresql_psycopg2
40.endif 37.endif
@@ -42,14 +39,15 @@ pre-configure: @@ -42,14 +39,15 @@ pre-configure:
42 rm -r ${WRKSRC}/django/db/backends/sqlite3 39 rm -r ${WRKSRC}/django/db/backends/sqlite3
43.endif 40.endif
44 41
45BACKEND_PATH= ${PYSITELIB}/django/db/backends 42BACKEND_PATH= ${PYSITELIB}/django/db/backends
46BACKEND_PATH_PLIST= $${PYSITELIB}/django/db/backends 43BACKEND_PATH_PLIST= $${PYSITELIB}/django/db/backends
47 44
48PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/mysql/", "$${PLIST.mysql}${BACKEND_PATH_PLIST}/mysql/") } 45PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/mysql/", "$${PLIST.mysql}${BACKEND_PATH_PLIST}/mysql/") }
49PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/oracle/", "$${PLIST.oracle}${BACKEND_PATH_PLIST}/oracle/") } 46PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/oracle/", "$${PLIST.oracle}${BACKEND_PATH_PLIST}/oracle/") }
50PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/postgresql_psycopg2/", "$${PLIST.pgsql}${BACKEND_PATH_PLIST}/postgresql_psycopg2/") } 47PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/postgresql_psycopg2/", "$${PLIST.pgsql}${BACKEND_PATH_PLIST}/postgresql_psycopg2/") }
51PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/sqlite3/", "$${PLIST.sqlite}${BACKEND_PATH_PLIST}/sqlite3/") } 48PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/sqlite3/", "$${PLIST.sqlite}${BACKEND_PATH_PLIST}/sqlite3/") }
52 49
53.include "../../lang/python/application.mk" 50.include "../../lang/python/application.mk"
54.include "../../lang/python/distutils.mk" 51.include "../../lang/python/distutils.mk"
 52.include "../../lang/python/versioned_dependencies.mk"
55.include "../../mk/bsd.pkg.mk" 53.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/www/py-django14/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/py-django14/Attic/Makefile 2013/11/14 21:27:01 1.1
+++ pkgsrc/www/py-django14/Attic/Makefile 2014/01/18 19:07:57 1.2
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: Makefile,v 1.1 2013/11/14 21:27:01 joerg Exp $ 1# $NetBSD: Makefile,v 1.2 2014/01/18 19:07:57 wiz Exp $
2 2
3DISTNAME= Django-1.4.10 3DISTNAME= Django-1.4.10
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
5CATEGORIES= www python 5CATEGORIES= www python
6MASTER_SITES= http://www.djangoproject.com/m/releases/1.4/ 6MASTER_SITES= http://www.djangoproject.com/m/releases/1.4/
7 7
8MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://www.djangoproject.com/ 9HOMEPAGE= http://www.djangoproject.com/
10COMMENT= Django, a high-level Python Web framework (LTS version) 10COMMENT= Django, a high-level Python Web framework (LTS version)
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} 13PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
14 14
15USE_LANGUAGES= # empty 15USE_LANGUAGES= # empty
16REPLACE_PYTHON= ${WRKSRC}/django/bin/*.py 16REPLACE_PYTHON= ${WRKSRC}/django/bin/*.py
17REPLACE_PYTHON+= ${WRKSRC}/django/bin/profiling/*.py 17REPLACE_PYTHON+= ${WRKSRC}/django/bin/profiling/*.py
18REPLACE_PYTHON+= ${WRKSRC}/django/contrib/admin/bin/*.py 18REPLACE_PYTHON+= ${WRKSRC}/django/contrib/admin/bin/*.py
19REPLACE_PYTHON+= ${WRKSRC}/django/contrib/admin/static/admin/js/*.py 19REPLACE_PYTHON+= ${WRKSRC}/django/contrib/admin/static/admin/js/*.py
20REPLACE_PYTHON+= ${WRKSRC}/django/conf/project_template/*.py 20REPLACE_PYTHON+= ${WRKSRC}/django/conf/project_template/*.py
21 21
22DEPENDS+= ${PYPKGPREFIX}-flup-[0-9]*:../../www/py-flup 22PYTHON_VERSIONED_DEPENDENCIES= flup
23 23
24.include "options.mk" 24.include "options.mk"
25 25
26pre-configure: 26pre-configure:
27.if empty(PKG_OPTIONS:Mmysql) 27.if empty(PKG_OPTIONS:Mmysql)
28 rm -r ${WRKSRC}/django/db/backends/mysql 28 rm -r ${WRKSRC}/django/db/backends/mysql
29.endif 29.endif
30.if empty(PKG_OPTIONS:Moracle) 30.if empty(PKG_OPTIONS:Moracle)
31 rm -r ${WRKSRC}/django/db/backends/oracle 31 rm -r ${WRKSRC}/django/db/backends/oracle
32.endif 32.endif
33.if empty(PKG_OPTIONS:Mpgsql) 33.if empty(PKG_OPTIONS:Mpgsql)
34 rm -r ${WRKSRC}/django/db/backends/postgresql_psycopg2 34 rm -r ${WRKSRC}/django/db/backends/postgresql_psycopg2
35.endif 35.endif
@@ -37,14 +37,15 @@ pre-configure: @@ -37,14 +37,15 @@ pre-configure:
37 rm -r ${WRKSRC}/django/db/backends/sqlite3 37 rm -r ${WRKSRC}/django/db/backends/sqlite3
38.endif 38.endif
39 39
40BACKEND_PATH= ${PYSITELIB}/django/db/backends 40BACKEND_PATH= ${PYSITELIB}/django/db/backends
41BACKEND_PATH_PLIST= $${PYSITELIB}/django/db/backends 41BACKEND_PATH_PLIST= $${PYSITELIB}/django/db/backends
42 42
43PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/mysql/", "$${PLIST.mysql}${BACKEND_PATH_PLIST}/mysql/") } 43PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/mysql/", "$${PLIST.mysql}${BACKEND_PATH_PLIST}/mysql/") }
44PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/oracle/", "$${PLIST.oracle}${BACKEND_PATH_PLIST}/oracle/") } 44PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/oracle/", "$${PLIST.oracle}${BACKEND_PATH_PLIST}/oracle/") }
45PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/postgresql_psycopg2/", "$${PLIST.pgsql}${BACKEND_PATH_PLIST}/postgresql_psycopg2/") } 45PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/postgresql_psycopg2/", "$${PLIST.pgsql}${BACKEND_PATH_PLIST}/postgresql_psycopg2/") }
46PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/sqlite3/", "$${PLIST.sqlite}${BACKEND_PATH_PLIST}/sqlite3/") } 46PRINT_PLIST_AWK+= { gsub("^${BACKEND_PATH}/sqlite3/", "$${PLIST.sqlite}${BACKEND_PATH_PLIST}/sqlite3/") }
47 47
48.include "../../lang/python/application.mk" 48.include "../../lang/python/application.mk"
49.include "../../lang/python/distutils.mk" 49.include "../../lang/python/distutils.mk"
 50.include "../../lang/python/versioned_dependencies.mk"
50.include "../../mk/bsd.pkg.mk" 51.include "../../mk/bsd.pkg.mk"