Revive devel/codeville and assign new maintainer

This port was removed in September 2010 because the project (python VCS)
had been abandoned for at least 3 years.  The submitter adopted the
project and updated it without changing the version number (hence the
port revision bump).  The submitter naturally becomes the new maintainer.
Psyco support has been removed since psyco report no longer exists.

PR:		188995
Submitted by:	Chris Hutchison

8 files changed, 176 insertions, 1 deletions

diff --git a/MOVED b/MOVED
index 27d8f6a2ed1a..363c2982f4d6 100644
--- a/MOVED
+++ b/MOVED
@@ -1234,7 +1234,6 @@ www/tdiary-devel||2010-09-12|Removed
 multimedia/playd2|multimedia/playd|2010-09-13|Has expired: Use multimedia/playd instead
 mail/mailscanner-devel|mail/mailscanner|2010-09-14|Removed, mail/mailscanner is newer
 databases/sqlite-ext-inet||2010-09-14|Has expired: Please install databases/sqlite-ext-mobigroup instead
-devel/codeville||2010-09-14|Has expired: Dead project
 editors/koffice-kde4-l10n-fy||2010-09-14|Has expired
 editors/koffice-kde4-l10n-hne||2010-09-14|Has expired
 graphics/xaralx-devel||2010-09-14|Has expired: Does not compile with png-1.4 and latest version is from Aug 2006
diff --git a/devel/Makefile b/devel/Makefile
index 8290b3a896a0..40b5e287a385 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -251,6 +251,7 @@
     SUBDIR += cocaine-core
     SUBDIR += coccinelle
     SUBDIR += codeblocks
+    SUBDIR += codeville
     SUBDIR += codeworker
     SUBDIR += colorgcc
     SUBDIR += colormake
diff --git a/devel/codeville/Makefile b/devel/codeville/Makefile
new file mode 100644
index 000000000000..155846f52124
--- /dev/null
+++ b/devel/codeville/Makefile
@@ -0,0 +1,40 @@
+# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	codeville
+PORTVERSION=	0.1.16
+PORTREVISION=	2
+CATEGORIES=	devel python
+MASTER_SITES=	http://bsdforge.com/projects/source/devel/codeville/
+DISTNAME=	Codeville-${PORTVERSION}
+
+MAINTAINER=	portmaster@bsdforge.com
+COMMENT=	Anarchic control version system without unnecessary re-merges
+
+LICENSE=	BSD3CLAUSE
+
+USES=		tar:xz
+USE_PYTHON=	yes
+
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
+PYDISTUTILS_PKGNAME=	Codeville
+
+PORTDOCS=	LICENSE.txt
+EXAMPLE_FILES=	cdvserver.conf.sample
+
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+post-install:
+# examples
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${EXAMPLE_FILES} ${STAGEDIR}${EXAMPLESDIR}
+# documentation
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+.endif
+
+.include <bsd.port.mk>
diff --git a/devel/codeville/distinfo b/devel/codeville/distinfo
new file mode 100644
index 000000000000..d8a777a2c6b3
--- /dev/null
+++ b/devel/codeville/distinfo
@@ -0,0 +1,2 @@
+SHA256 (Codeville-0.1.16.tar.xz) = b5cf02fa1846498c23c7d910b1b971793e173b00df9944593ed3c6357b9fdecb
+SIZE (Codeville-0.1.16.tar.xz) = 70360
diff --git a/devel/codeville/files/patch-MANIFEST.in b/devel/codeville/files/patch-MANIFEST.in
new file mode 100644
index 000000000000..0d00f3b527b0
--- /dev/null
+++ b/devel/codeville/files/patch-MANIFEST.in
@@ -0,0 +1,8 @@
+--- MANIFEST.in.orig	2014-06-20 11:53:26.000000000 -0700
++++ MANIFEST.in	2014-06-20 11:53:44.000000000 -0700
+@@ -1,4 +1,4 @@
+-recursive-include Codeville *.py *.pyd
++recursive-include Codeville *.py
+ include cdv cdvserver cdvpasswd cdv-agent cdvupgrade LICENSE.txt
+ include cdvserver.conf.sample
+ include src/winrand.c
diff --git a/devel/codeville/files/patch-setup.py b/devel/codeville/files/patch-setup.py
new file mode 100644
index 000000000000..d9918a556a33
--- /dev/null
+++ b/devel/codeville/files/patch-setup.py
@@ -0,0 +1,10 @@
+--- setup.py.orig	2014-06-20 11:45:12.000000000 -0700
++++ setup.py	2014-06-20 12:03:29.000000000 -0700
+@@ -44,6 +44,5 @@
+     packages = ["Codeville", "Codeville/old"],
+     ext_modules = plat_ext,
+ 
+-    scripts = scripts,
+-    data_files = data_files
++    scripts = scripts
+     )
diff --git a/devel/codeville/pkg-descr b/devel/codeville/pkg-descr
new file mode 100644
index 000000000000..ec24d7f237c5
--- /dev/null
+++ b/devel/codeville/pkg-descr
@@ -0,0 +1,17 @@
+Codeville is a distributed version control system. It began with a novel
+idea for a merge algorithm and has grown from there. It is designed to
+be easy to use and scale from small personal projects to very large
+distributed ones. If you'd like to know why there is a need for new
+merge algorithms, consider what the lead monotone developer had to say:
+http://article.gmane.org/gmane.comp.version-control.monotone.devel/3264
+
+Codeville works by creating an identifier for each change which is
+done, and remembering the list of all changes which have been applied
+to each file and the last change which modified each line in each
+file. When there's a conflict, it checks to see if one of the two
+sides has already been applied to the other one, and if so makes
+the other side win automatically. When there's an actual not
+automatically mergeable version conflict, Codeville behaves in
+almost exactly the same way as CVS.
+
+WWW: http://bsdforge.com/projects/devel/codeville/
diff --git a/devel/codeville/pkg-plist b/devel/codeville/pkg-plist
new file mode 100644
index 000000000000..a1adc7627cc0
--- /dev/null
+++ b/devel/codeville/pkg-plist
@@ -0,0 +1,98 @@
+bin/cdv
+bin/cdv-agent
+bin/cdvpasswd
+bin/cdvserver
+bin/cdvupgrade
+%%PYTHON_SITELIBDIR%%/Codeville/DFS.py
+%%PYTHON_SITELIBDIR%%/Codeville/DFS.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/DFS.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/RawServer.py
+%%PYTHON_SITELIBDIR%%/Codeville/RawServer.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/RawServer.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/SRP.py
+%%PYTHON_SITELIBDIR%%/Codeville/SRP.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/SRP.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/__init__.py
+%%PYTHON_SITELIBDIR%%/Codeville/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/agent.py
+%%PYTHON_SITELIBDIR%%/Codeville/agent.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/agent.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/auth.py
+%%PYTHON_SITELIBDIR%%/Codeville/auth.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/auth.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/bencode.py
+%%PYTHON_SITELIBDIR%%/Codeville/bencode.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/bencode.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/cdv_glob.py
+%%PYTHON_SITELIBDIR%%/Codeville/cdv_glob.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/cdv_glob.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/client.py
+%%PYTHON_SITELIBDIR%%/Codeville/client.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/client.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/client_helpers.py
+%%PYTHON_SITELIBDIR%%/Codeville/client_helpers.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/client_helpers.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/client_net.py
+%%PYTHON_SITELIBDIR%%/Codeville/client_net.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/client_net.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/crypt.py
+%%PYTHON_SITELIBDIR%%/Codeville/crypt.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/crypt.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/db.py
+%%PYTHON_SITELIBDIR%%/Codeville/db.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/db.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/diff.py
+%%PYTHON_SITELIBDIR%%/Codeville/diff.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/diff.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/entropy.py
+%%PYTHON_SITELIBDIR%%/Codeville/entropy.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/entropy.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/history.py
+%%PYTHON_SITELIBDIR%%/Codeville/history.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/history.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/lcsmatch.py
+%%PYTHON_SITELIBDIR%%/Codeville/lcsmatch.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/lcsmatch.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/merge.py
+%%PYTHON_SITELIBDIR%%/Codeville/merge.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/merge.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/mergelcs.py
+%%PYTHON_SITELIBDIR%%/Codeville/mergelcs.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/mergelcs.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/network.py
+%%PYTHON_SITELIBDIR%%/Codeville/network.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/network.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/old/__init__.py
+%%PYTHON_SITELIBDIR%%/Codeville/old/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/old/__init__.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/old/history.py
+%%PYTHON_SITELIBDIR%%/Codeville/old/history.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/old/history.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/old/merge.py
+%%PYTHON_SITELIBDIR%%/Codeville/old/merge.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/old/merge.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/passwd.py
+%%PYTHON_SITELIBDIR%%/Codeville/passwd.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/passwd.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/path.py
+%%PYTHON_SITELIBDIR%%/Codeville/path.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/path.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/selectpoll.py
+%%PYTHON_SITELIBDIR%%/Codeville/selectpoll.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/selectpoll.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/server.py
+%%PYTHON_SITELIBDIR%%/Codeville/server.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/server.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/testtest.py
+%%PYTHON_SITELIBDIR%%/Codeville/testtest.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/testtest.pyo
+%%PYTHON_SITELIBDIR%%/Codeville/upgrade.py
+%%PYTHON_SITELIBDIR%%/Codeville/upgrade.pyc
+%%PYTHON_SITELIBDIR%%/Codeville/upgrade.pyo
+%%EXAMPLESDIR%%/cdvserver.conf.sample
+@dirrm %%EXAMPLESDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/Codeville/old
+@dirrm %%PYTHON_SITELIBDIR%%/Codeville
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%