Wed Sep 5 08:22:17 2018 UTC ()
Fix py-flup dependency


(adam)
diff -r1.20 -r1.21 pkgsrc/www/loggerhead/Makefile
diff -r1.18 -r1.19 pkgsrc/www/py-django14/Makefile
cvs diff -r1.20 -r1.21 pkgsrc/www/loggerhead/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/loggerhead/Attic/Makefile 2018/07/03 05:03:39 1.20
+++ pkgsrc/www/loggerhead/Attic/Makefile 2018/09/05 08:22:17 1.21
@@ -1,27 +1,25 @@ @@ -1,27 +1,25 @@
1# $NetBSD: Makefile,v 1.20 2018/07/03 05:03:39 adam Exp $ 1# $NetBSD: Makefile,v 1.21 2018/09/05 08:22:17 adam 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}-flup-[0-9]*:../../www/py-flup
15DEPENDS+= ${PYPKGPREFIX}-simplejson>=2.0:../../converters/py-simplejson 16DEPENDS+= ${PYPKGPREFIX}-simplejson>=2.0:../../converters/py-simplejson
16DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 17DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
17DEPENDS+= ${PYPKGPREFIX}-paste>=1.2:../../www/py-paste 18DEPENDS+= ${PYPKGPREFIX}-paste>=1.2:../../www/py-paste
18DEPENDS+= ${PYPKGPREFIX}-PasteDeploy>=1.3:../../www/py-PasteDeploy 19DEPENDS+= ${PYPKGPREFIX}-PasteDeploy>=1.3:../../www/py-PasteDeploy
19DEPENDS+= ${PYPKGPREFIX}-SimpleTAL>=4.1:../../www/py-simpletal 20DEPENDS+= ${PYPKGPREFIX}-SimpleTAL>=4.1:../../www/py-simpletal
20 21
21PYTHON_VERSIONED_DEPENDENCIES= flup 22PYTHON_VERSIONS_ACCEPTED= 27 # py-simpletal
22PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 37 # py-simpletal 
23 23
24.include "../../lang/python/application.mk" 
25.include "../../lang/python/distutils.mk" 24.include "../../lang/python/distutils.mk"
26.include "../../lang/python/versioned_dependencies.mk" 
27.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/www/py-django14/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/py-django14/Attic/Makefile 2017/12/25 09:20:27 1.18
+++ pkgsrc/www/py-django14/Attic/Makefile 2018/09/05 08:22:17 1.19
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: Makefile,v 1.18 2017/12/25 09:20:27 adam Exp $ 1# $NetBSD: Makefile,v 1.19 2018/09/05 08:22:17 adam Exp $
2 2
3DISTNAME= Django-1.4.22 3DISTNAME= Django-1.4.22
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
5CATEGORIES= www python 5CATEGORIES= www python
6MASTER_SITES= https://www.djangoproject.com/m/releases/${PKGVERSION_NOREV:R}/ 6MASTER_SITES= https://www.djangoproject.com/m/releases/${PKGVERSION_NOREV:R}/
7 7
8MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= https://www.djangoproject.com/ 9HOMEPAGE= https://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
13USE_LANGUAGES= # empty 13DEPENDS+= ${PYPKGPREFIX}-flup-[0-9]*:../../www/py-flup
 14
 15USE_LANGUAGES= # none
14REPLACE_PYTHON= django/bin/*.py 16REPLACE_PYTHON= django/bin/*.py
15REPLACE_PYTHON+= django/bin/profiling/*.py 17REPLACE_PYTHON+= django/bin/profiling/*.py
16REPLACE_PYTHON+= django/contrib/admin/bin/*.py 18REPLACE_PYTHON+= django/contrib/admin/bin/*.py
17REPLACE_PYTHON+= django/contrib/admin/static/admin/js/*.py 19REPLACE_PYTHON+= django/contrib/admin/static/admin/js/*.py
18REPLACE_PYTHON+= django/conf/project_template/*.py 20REPLACE_PYTHON+= django/conf/project_template/*.py
19 21
20PYTHON_VERSIONED_DEPENDENCIES= flup 
21PYTHON_VERSIONS_ACCEPTED= 27 # use py-django if you want python-3.x support 22PYTHON_VERSIONS_ACCEPTED= 27 # use py-django if you want python-3.x support
22 23
23.include "options.mk" 24.include "options.mk"
24 25
25pre-configure: 26pre-configure:
26.if empty(PKG_OPTIONS:Mmysql) 27.if empty(PKG_OPTIONS:Mmysql)
27 rm -r ${WRKSRC}/django/db/backends/mysql 28 rm -r ${WRKSRC}/django/db/backends/mysql
28.endif 29.endif
29.if empty(PKG_OPTIONS:Moracle) 30.if empty(PKG_OPTIONS:Moracle)
30 rm -r ${WRKSRC}/django/db/backends/oracle 31 rm -r ${WRKSRC}/django/db/backends/oracle
31.endif 32.endif
32.if empty(PKG_OPTIONS:Mpgsql) 33.if empty(PKG_OPTIONS:Mpgsql)
33 rm -r ${WRKSRC}/django/db/backends/postgresql_psycopg2 34 rm -r ${WRKSRC}/django/db/backends/postgresql_psycopg2
@@ -36,15 +37,14 @@ pre-configure: @@ -36,15 +37,14 @@ pre-configure:
36 rm -r ${WRKSRC}/django/db/backends/sqlite3 37 rm -r ${WRKSRC}/django/db/backends/sqlite3
37.endif 38.endif
38 39
39BACKEND_PATH= ${PYSITELIB}/django/db/backends 40BACKEND_PATH= ${PYSITELIB}/django/db/backends
40BACKEND_PATH_PLIST= $${PYSITELIB}/django/db/backends 41BACKEND_PATH_PLIST= $${PYSITELIB}/django/db/backends
41 42
42PRINT_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/") }
43PRINT_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/") }
44PRINT_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/") }
45PRINT_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/") }
46 47
47.include "../../lang/python/application.mk" 48.include "../../lang/python/application.mk"
48.include "../../lang/python/distutils.mk" 49.include "../../lang/python/distutils.mk"
49.include "../../lang/python/versioned_dependencies.mk" 
50.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"