diff -curN py-protocols-devel/Makefile py-protocols-devel.new/Makefile
--- py-protocols-devel/Makefile 2008-12-21 16:16:43.000000000 +0800
+++ py-protocols-devel.new/Makefile 2009-01-04 17:09:33.000000000 +0800
@@ -6,39 +6,21 @@
#
PORTNAME= PyProtocols
-PORTVERSION= 1.0.a0.r2082
+PORTVERSION= 1.0.a0.r2302
CATEGORIES= devel python
-MASTER_SITES= http://peak.telecommunity.com/snapshots/ \
- http://dryice.name/computer/FreeBSD/distfiles/
+MASTER_SITES= http://files.turbogears.org/eggs/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= ${PORTNAME}-1.0a0dev_r2082
+DISTNAME= ${PORTNAME}-1.0a0dev-r2302
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= wenheping@gmail.com
COMMENT= Protocol Definition, Declaration, and Adaptation for Python
-BUILD_DEPENDS= easy_install:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS= ${BUILD_DEPENDS}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:${PORTSDIR}/devel/py-decoratortools
-NO_PACKAGE= not yet
-
-PLIST_FILES= ${PYTHON_SITELIBDIR:S,${PREFIX}/,,}/${PYPROTOCOLS_EGG}
-PLIST_SUB= PYPROTOCOLS_EGG="${PYPROTOCOLS_EGG}"
-
-SUB_FILES+= pkg-deinstall pkg-install
-SUB_LIST+= EGG="PyProtocols==${PYPROTOCOLS_VER}" \
- PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
-
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes
-PYDISTUTILS_PKGVERSION= 1.0a0
USE_ZIP= yes
+USE_PYTHON= yes
+USE_PYDISTUTILS= easy_install
+PYEASYINSTALL_ARCHDEP= yes
+PYDISTUTILS_PKGVERSION= 1.0a0dev-r2302
-PYDISTUTILS_NOEGGINFO= yes # XXX convert easy_install support to bsd.python.mk's
-PYPROTOCOLS_EGG= PyProtocols-${PYPROTOCOLS_VER}-py${PYTHON_VERSION:S/^python//}-${OPSYS:L}-${OSRELEASE}-${ARCH}.egg
-PYPROTOCOLS_VER?= 1.0a0
-
-.include <bsd.port.pre.mk>
-
-OSRELEASE!= /usr/bin/uname -r
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -curN py-protocols-devel/distinfo py-protocols-devel.new/distinfo
--- py-protocols-devel/distinfo 2007-01-04 21:48:50.000000000 +0800
+++ py-protocols-devel.new/distinfo 2009-01-04 17:09:22.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (PyProtocols-1.0a0dev_r2082.zip) = 11c5871560b65cf72b45845013297b94
-SHA256 (PyProtocols-1.0a0dev_r2082.zip) = fb8b9a3db25e0b447fbf327c26b859368cefdc14438b9752ab248b788f119016
-SIZE (PyProtocols-1.0a0dev_r2082.zip) = 124061
+MD5 (PyProtocols-1.0a0dev-r2302.zip) = 04ab0051ceb961919607b025a92671f7
+SHA256 (PyProtocols-1.0a0dev-r2302.zip) = b17f625fe6c2eb8a1ad4fefb0ac93edbf9267213f636132f1e094409931f1858
+SIZE (PyProtocols-1.0a0dev-r2302.zip) = 124071
diff -curN py-protocols-devel/files/pkg-deinstall.in py-protocols-devel.new/files/pkg-deinstall.in
--- py-protocols-devel/files/pkg-deinstall.in 2007-01-04 21:48:50.000000000 +0800
+++ py-protocols-devel.new/files/pkg-deinstall.in 1970-01-01 08:00:00.000000000 +0800
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $FreeBSD: ports/devel/py-protocols-devel/files/pkg-deinstall.in,v 1.1 2007/01/04 13:48:50 nivit Exp $
-PKGNAME=$1
-#
-case $2 in
- DEINSTALL)
- easy_install -q -m -x -S %%PYTHON_SITELIBDIR%% %%EGG%%
- ;;
- POST-DEINSTALL)
- exit 0
- ;;
- *)
- echo "Unexpected Argument $2!!!"
- exit 1
- ;;
-esac
-exit 0
diff -curN py-protocols-devel/files/pkg-install.in py-protocols-devel.new/files/pkg-install.in
--- py-protocols-devel/files/pkg-install.in 2007-01-04 21:48:50.000000000 +0800
+++ py-protocols-devel.new/files/pkg-install.in 1970-01-01 08:00:00.000000000 +0800
@@ -1,16 +0,0 @@
-#!/bin/sh
-# $FreeBSD: ports/devel/py-protocols-devel/files/pkg-install.in,v 1.1 2007/01/04 13:48:50 nivit Exp $
-PKGNAME=$1
-#
-case $2 in
- POST-INSTALL)
- easy_install -q -N -S %%PYTHON_SITELIBDIR%% %%EGG%%
- ;;
- PRE-INSTALL)
- ;;
- *)
- echo "Unexpected Argument $2!!!"
- exit 1
- ;;
-esac
-exit 0
diff -curN py-protocols-devel/pkg-plist py-protocols-devel.new/pkg-plist
--- py-protocols-devel/pkg-plist 1970-01-01 08:00:00.000000000 +0800
+++ py-protocols-devel.new/pkg-plist 2009-01-04 17:09:22.000000000 +0800
@@ -0,0 +1 @@
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%