6 files changed, 106 insertions, 1 deletions

diff --git a/devel/codeville/Makefile b/devel/codeville/Makefile
index f771831303b8..8c717d29f305 100644
--- a/devel/codeville/Makefile
+++ b/devel/codeville/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	codeville
 PORTVERSION=	0.1.13
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://codeville.org/download/
 DISTNAME=	Codeville-${PORTVERSION}
@@ -37,4 +38,28 @@ post-install:
 . endfor
 .endif
 
-.include <bsd.port.mk>
+pre-everything::
+.ifndef(WITHOUT_PSYCO)
+	@${ECHO_MSG} '===> Define WITHOUT_PSYCO to disable devel/py-psyco optimization'
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} != "i386"
+WITHOUT_PSYCO=  yes
+.endif
+
+.ifndef(WITHOUT_PSYCO)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
+
+. for patch in \
+		cdv \
+		cdv-agent \
+		cdvpasswd \
+		cdvserver \
+		cdvupgrade
+EXTRA_PATCHES+= ${FILESDIR}/extra-psyco-patch-${patch}
+. endfor
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/codeville/files/extra-psyco-patch-cdv b/devel/codeville/files/extra-psyco-patch-cdv
new file mode 100644
index 000000000000..48728791e74c
--- /dev/null
+++ b/devel/codeville/files/extra-psyco-patch-cdv
@@ -0,0 +1,16 @@
+--- cdv	Sat Jul 16 16:35:44 2005
++++ cdv	Mon Oct 10 00:01:53 2005
+@@ -6,6 +6,13 @@
+ # Setup import path in case we can't find codeville in standard places
+ 
+ try:
++ import psyco
++ assert psyco.__version__ >= 0x010300f0
++ psyco.full()
++except:
++ pass
++
++try:
+     import Codeville.db
+ except ImportError:
+     import sys, os.path
diff --git a/devel/codeville/files/extra-psyco-patch-cdv-agent b/devel/codeville/files/extra-psyco-patch-cdv-agent
new file mode 100644
index 000000000000..f0bb3f7f21ab
--- /dev/null
+++ b/devel/codeville/files/extra-psyco-patch-cdv-agent
@@ -0,0 +1,16 @@
+--- cdv-agent	Fri Jul 15 14:42:58 2005
++++ cdv-agent	Mon Oct 10 00:01:53 2005
+@@ -4,6 +4,13 @@
+ # See LICENSE.txt for license information.
+ 
+ try:
++ import psyco
++ assert psyco.__version__ >= 0x010300f0
++ psyco.full()
++except:
++ pass
++
++try:
+     import Codeville.db
+ except ImportError:
+     import sys, os.path
diff --git a/devel/codeville/files/extra-psyco-patch-cdvpasswd b/devel/codeville/files/extra-psyco-patch-cdvpasswd
new file mode 100644
index 000000000000..9c81db09187a
--- /dev/null
+++ b/devel/codeville/files/extra-psyco-patch-cdvpasswd
@@ -0,0 +1,16 @@
+--- cdvpasswd	Fri Jul 15 14:42:58 2005
++++ cdvpasswd	Mon Oct 10 00:01:53 2005
+@@ -4,6 +4,13 @@
+ # See LICENSE.txt for license information
+ 
+ try:
++ import psyco
++ assert psyco.__version__ >= 0x010300f0
++ psyco.full()
++except:
++ pass
++
++try:
+     import Codeville.db
+ except ImportError:
+     import sys, os.path
diff --git a/devel/codeville/files/extra-psyco-patch-cdvserver b/devel/codeville/files/extra-psyco-patch-cdvserver
new file mode 100644
index 000000000000..6c57b4b74b67
--- /dev/null
+++ b/devel/codeville/files/extra-psyco-patch-cdvserver
@@ -0,0 +1,16 @@
+--- cdvserver	Fri Jul 15 14:42:58 2005
++++ cdvserver	Mon Oct 10 00:01:53 2005
+@@ -4,6 +4,13 @@
+ # See LICENSE.TXT for license information.
+ 
+ try:
++ import psyco
++ assert psyco.__version__ >= 0x010300f0
++ psyco.full()
++except:
++ pass
++
++try:
+     import Codeville.db
+ except ImportError:
+     import sys, os.path
diff --git a/devel/codeville/files/extra-psyco-patch-cdvupgrade b/devel/codeville/files/extra-psyco-patch-cdvupgrade
new file mode 100644
index 000000000000..297bfe9ab426
--- /dev/null
+++ b/devel/codeville/files/extra-psyco-patch-cdvupgrade
@@ -0,0 +1,16 @@
+--- cdvupgrade	Fri Jul 15 14:42:58 2005
++++ cdvupgrade	Mon Oct 10 00:01:53 2005
+@@ -4,6 +4,13 @@
+ # see LICENSE.txt for license information
+ 
+ try:
++ import psyco
++ assert psyco.__version__ >= 0x010300f0
++ psyco.full()
++except:
++ pass
++
++try:
+     import Codeville.db
+ except ImportError:
+     import sys, os.path