From 1a8881e2ecbfda46e1d691c77e50f84a42ffa16c Mon Sep 17 00:00:00 2001 From: Ruslan Makhmatkhanov Date: Fri, 12 Oct 2012 07:08:52 +0000 Subject: [PATCH] - convert Makefile header to new two-line format - add dns/py-dnspython to RUN_DEPENDS too, because easyzone will not work w/o it - remove some redundant python specific knobs: PYDISTUTILS_NOEGGINFO, PYDISTUTILS_PKGNAME - use PYEASYINSTALL_EGG in pkg-plist instead of redundant passing PORTVERSION and PYTHON_VER there - bump PORTREVISION because of dependencies change PR: 172446 Submitted by: rm (myself) Approved by: Attila Nagy (maintainer, by mail) Feature safe: yes --- dns/py-easyzone/Makefile | 12 +++-------- dns/py-easyzone/pkg-plist | 44 +++++++++++++++++++-------------------- 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/dns/py-easyzone/Makefile b/dns/py-easyzone/Makefile index a5ad0ef5d5b1..34d3938196c4 100644 --- a/dns/py-easyzone/Makefile +++ b/dns/py-easyzone/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: py-easyzone -# Date created: 10 February 2012 -# Whom: Attila Nagy -# +# Created by: Attila Nagy # $FreeBSD$ -# PORTNAME= easyzone PORTVERSION= 1.2.2 +PORTREVISION= 1 CATEGORIES= dns python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,12 +14,9 @@ COMMENT= DNS Zone abstraction module for Python LICENSE= MIT BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython +RUN_DEPENDS:= ${BUILD_DEPENDS} USE_PYTHON= yes USE_PYDISTUTILS= easy_install -PYDISTUTILS_NOEGGINFO= yes -PYDISTUTILS_PKGNAME= easyzone -PLIST_SUB+= PORTVERSION=${PORTVERSION} \ - PYTHON_VER=${PYTHON_VER} .include diff --git a/dns/py-easyzone/pkg-plist b/dns/py-easyzone/pkg-plist index 4e5e7a61e4b3..7f34e9226d13 100644 --- a/dns/py-easyzone/pkg-plist +++ b/dns/py-easyzone/pkg-plist @@ -1,22 +1,22 @@ -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/EGG-INFO/PKG-INFO -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/EGG-INFO/SOURCES.txt -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/EGG-INFO/dependency_links.txt -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/EGG-INFO/entry_points.txt -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/EGG-INFO/not-zip-safe -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/EGG-INFO/requires.txt -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/EGG-INFO/top_level.txt -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/easyzone/__init__.py -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/easyzone/__init__.pyc -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/easyzone/__init__.pyo -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/easyzone/easyzone.py -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/easyzone/easyzone.pyc -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/easyzone/easyzone.pyo -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/easyzone/zone_check.py -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/easyzone/zone_check.pyc -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/easyzone/zone_check.pyo -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/easyzone/zone_reload.py -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/easyzone/zone_reload.pyc -%%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/easyzone/zone_reload.pyo -@dirrm %%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/easyzone -@dirrm %%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg/EGG-INFO -@dirrm %%PYTHON_SITELIBDIR%%/easyzone-%%PORTVERSION%%-py%%PYTHON_VER%%.egg +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/easyzone/__init__.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/easyzone/__init__.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/easyzone/__init__.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/easyzone/easyzone.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/easyzone/easyzone.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/easyzone/easyzone.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/easyzone/zone_check.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/easyzone/zone_check.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/easyzone/zone_check.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/easyzone/zone_reload.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/easyzone/zone_reload.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/easyzone/zone_reload.pyo +@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/easyzone +@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO +@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%