CVS commit: pkgsrc/www

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Sep  5 08:22:17 UTC 2018

Modified Files:
        pkgsrc/www/loggerhead: Makefile
        pkgsrc/www/py-django14: Makefile

Log Message:
Fix py-flup dependency


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/loggerhead/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/www/py-django14/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/loggerhead/Makefile
diff -u pkgsrc/www/loggerhead/Makefile:1.20 pkgsrc/www/loggerhead/Makefile:1.21
--- pkgsrc/www/loggerhead/Makefile:1.20 Tue Jul  3 05:03:39 2018
+++ pkgsrc/www/loggerhead/Makefile      Wed Sep  5 08:22:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/07/03 05:03:39 adam Exp $
+# $NetBSD: Makefile,v 1.21 2018/09/05 08:22:17 adam Exp $
 
 DISTNAME=      loggerhead-${VER}
 PKGREVISION=   1
@@ -12,16 +12,14 @@ COMMENT=    Web viewer for Bazaar branches
 LICENSE=       gnu-gpl-v2 # or later
 
 DEPENDS+=      bzr>=1.17:../../devel/bzr
+DEPENDS+=      ${PYPKGPREFIX}-flup-[0-9]*:../../www/py-flup
 DEPENDS+=      ${PYPKGPREFIX}-simplejson>=2.0:../../converters/py-simplejson
 DEPENDS+=      ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 DEPENDS+=      ${PYPKGPREFIX}-paste>=1.2:../../www/py-paste
 DEPENDS+=      ${PYPKGPREFIX}-PasteDeploy>=1.3:../../www/py-PasteDeploy
 DEPENDS+=      ${PYPKGPREFIX}-SimpleTAL>=4.1:../../www/py-simpletal
 
-PYTHON_VERSIONED_DEPENDENCIES= flup
-PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 37 # py-simpletal
+PYTHON_VERSIONS_ACCEPTED=      27 # py-simpletal
 
-.include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-django14/Makefile
diff -u pkgsrc/www/py-django14/Makefile:1.18 pkgsrc/www/py-django14/Makefile:1.19
--- pkgsrc/www/py-django14/Makefile:1.18        Mon Dec 25 09:20:27 2017
+++ pkgsrc/www/py-django14/Makefile     Wed Sep  5 08:22:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2017/12/25 09:20:27 adam Exp $
+# $NetBSD: Makefile,v 1.19 2018/09/05 08:22:17 adam Exp $
 
 DISTNAME=      Django-1.4.22
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -10,14 +10,15 @@ HOMEPAGE=   https://www.djangoproject.com/
 COMMENT=       Django, a high-level Python Web framework (LTS version)
 LICENSE=       modified-bsd
 
-USE_LANGUAGES=         # empty
+DEPENDS+=      ${PYPKGPREFIX}-flup-[0-9]*:../../www/py-flup
+
+USE_LANGUAGES=         # none
 REPLACE_PYTHON=                django/bin/*.py
 REPLACE_PYTHON+=       django/bin/profiling/*.py
 REPLACE_PYTHON+=       django/contrib/admin/bin/*.py
 REPLACE_PYTHON+=       django/contrib/admin/static/admin/js/*.py
 REPLACE_PYTHON+=       django/conf/project_template/*.py
 
-PYTHON_VERSIONED_DEPENDENCIES= flup
 PYTHON_VERSIONS_ACCEPTED=      27 # use py-django if you want python-3.x support
 
 .include "options.mk"
@@ -46,5 +47,4 @@ PRINT_PLIST_AWK+=     { gsub("^${BACKEND_PAT
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"