Apply modified patch sent by palo@ in private mail. This brings all these

packages to version 3.4.x. May this not break anything (although i feel it
might).

3 files changed, 26 insertions, 17 deletions

diff --git a/geography/py-trytond-country/Makefile b/geography/py-trytond-country/Makefile
index 706e295d113..3a51162872b 100644
--- a/geography/py-trytond-country/Makefile
+++ b/geography/py-trytond-country/Makefile
@@ -1,10 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2014/06/25 06:05:32 richard Exp $
-
+# $NetBSD: Makefile,v 1.7 2015/03/15 00:17:35 rodent Exp $
+TRYTON_MODULE_NAME=	trytond_country
 .include "../../devel/py-trytond/Makefile.common"
-DISTNAME=	trytond_country-${TRYTOND_VERSION}
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/_/-/1}
 CATEGORIES=	geography python
-MASTER_SITES=	${TRYTON_SITES}
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://www.tryton.org/
@@ -17,6 +14,13 @@ USE_LANGUAGES=	# none
 
 REPLACE_PYTHON+=	tests/test_country.py
 
+PY_PATCHPLIST=			yes
+PLIST_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX}
+
+post-install:
+	${MV} ${DESTDIR}${PREFIX}/bin/trytond_import_zip \
+		${DESTDIR}${PREFIX}/bin/trytond${PYVERSSUFFIX}_import_zip
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/py-trytond-country/PLIST b/geography/py-trytond-country/PLIST
index ffea75124fa..b5de65584bf 100644
--- a/geography/py-trytond-country/PLIST
+++ b/geography/py-trytond-country/PLIST
@@ -1,4 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2014/02/01 18:10:53 rodent Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/03/15 00:17:35 rodent Exp $
+bin/trytond${PYVERSSUFFIX}_import_zip
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/trytond/modules/country/__init__.py
 ${PYSITELIB}/trytond/modules/country/__init__.pyc
 ${PYSITELIB}/trytond/modules/country/__init__.pyo
@@ -12,8 +20,10 @@ ${PYSITELIB}/trytond/modules/country/locale/cs_CZ.po
 ${PYSITELIB}/trytond/modules/country/locale/de_DE.po
 ${PYSITELIB}/trytond/modules/country/locale/es_AR.po
 ${PYSITELIB}/trytond/modules/country/locale/es_CO.po
+${PYSITELIB}/trytond/modules/country/locale/es_EC.po
 ${PYSITELIB}/trytond/modules/country/locale/es_ES.po
 ${PYSITELIB}/trytond/modules/country/locale/fr_FR.po
+${PYSITELIB}/trytond/modules/country/locale/lt_LT.po
 ${PYSITELIB}/trytond/modules/country/locale/nl_NL.po
 ${PYSITELIB}/trytond/modules/country/locale/ru_RU.po
 ${PYSITELIB}/trytond/modules/country/locale/sl_SI.po
@@ -28,10 +38,5 @@ ${PYSITELIB}/trytond/modules/country/view/country_form.xml
 ${PYSITELIB}/trytond/modules/country/view/country_tree.xml
 ${PYSITELIB}/trytond/modules/country/view/subdivision_form.xml
 ${PYSITELIB}/trytond/modules/country/view/subdivision_tree.xml
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/trytond/modules/country/view/zip_form.xml
+${PYSITELIB}/trytond/modules/country/view/zip_list.xml
diff --git a/geography/py-trytond-country/distinfo b/geography/py-trytond-country/distinfo
index 24e440e883d..58cd5c66e82 100644
--- a/geography/py-trytond-country/distinfo
+++ b/geography/py-trytond-country/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2014/05/03 13:31:06 rodent Exp $
+$NetBSD: distinfo,v 1.3 2015/03/15 00:17:35 rodent Exp $
 
-SHA1 (trytond_country-3.2.0.tar.gz) = f421e0267a093d1f0e7175d9e140271c89c58828
-RMD160 (trytond_country-3.2.0.tar.gz) = 2d9d9a69ba3eefafec064a72d8a4f0940ab6db47
-Size (trytond_country-3.2.0.tar.gz) = 858631 bytes
+SHA1 (tryton-3.4/trytond_country-3.4.1.tar.gz) = e6c3c2052596e0568df485072bf24936340e2d64
+RMD160 (tryton-3.4/trytond_country-3.4.1.tar.gz) = fa5e1de7fbe71d3bd3479128c0b37c80f8d05213
+Size (tryton-3.4/trytond_country-3.4.1.tar.gz) = 1004548 bytes