svn commit: r359721 - in head: . devel devel/codeville devel/codeville/files

Sat Jun 28 21:58:38 UTC 2014

Author: marino
Date: Sat Jun 28 21:58:36 2014
New Revision: 359721
URL: http://svnweb.freebsd.org/changeset/ports/359721
QAT: https://qat.redports.org/buildarchive/r359721/

Log:
  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

Added:
  head/devel/codeville/
     - copied from r258295, head/devel/codeville/
  head/devel/codeville/files/patch-MANIFEST.in   (contents, props changed)
Deleted:
  head/devel/codeville/files/extra-psyco-patch-cdv
  head/devel/codeville/files/extra-psyco-patch-cdv-agent
  head/devel/codeville/files/extra-psyco-patch-cdvpasswd
  head/devel/codeville/files/extra-psyco-patch-cdvserver
  head/devel/codeville/files/extra-psyco-patch-cdvupgrade
Modified:
  head/MOVED
  head/devel/Makefile
  head/devel/codeville/Makefile   (contents, props changed)
  head/devel/codeville/distinfo   (contents, props changed)
  head/devel/codeville/files/patch-setup.py   (contents, props changed)
  head/devel/codeville/pkg-descr   (contents, props changed)

Modified: head/MOVED
==============================================================================

--- head/MOVED	Sat Jun 28 20:58:56 2014	(r359720)
+++ head/MOVED	Sat Jun 28 21:58:36 2014	(r359721)
@@ -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

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Sat Jun 28 20:58:56 2014	(r359720)
+++ head/devel/Makefile	Sat Jun 28 21:58:36 2014	(r359721)
@@ -251,6 +251,7 @@
     SUBDIR += cocaine-core
     SUBDIR += coccinelle
     SUBDIR += codeblocks
+    SUBDIR += codeville
     SUBDIR += codeworker
     SUBDIR += colorgcc
     SUBDIR += colormake

Modified: head/devel/codeville/Makefile
==============================================================================
--- head/devel/codeville/Makefile	Mon Jul 26 21:11:58 2010	(r258295)
+++ head/devel/codeville/Makefile	Sat Jun 28 21:58:36 2014	(r359721)
@@ -1,66 +1,40 @@
-# New ports collection makefile for:	Codeville
-# Date created:		Wed Dec  8 01:00:39 UTC 2004
-# Whom:                 Mario Sergio Fujikawa Ferreira <lioux at FreeBSD.org>
-#
+# Created by: Mario Sergio Fujikawa Ferreira <lioux at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	codeville
 PORTVERSION=	0.1.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
-MASTER_SITES=	http://codeville.org/download/
+MASTER_SITES=	http://bsdforge.com/projects/source/devel/codeville/
 DISTNAME=	Codeville-${PORTVERSION}
 
-MAINTAINER=	ports at FreeBSD.org
-COMMENT=	An "anarchic" control version system without unnecessary re-merges
+MAINTAINER=	portmaster at 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
+PORTDOCS=	LICENSE.txt
+EXAMPLE_FILES=	cdvserver.conf.sample
+
+OPTIONS_DEFINE=	DOCS
 
-EXAMPLE_FILES=	\
-		cdvserver.conf.sample
+.include <bsd.port.options.mk>
 
 post-install:
 # examples
-	@${MKDIR} ${EXAMPLESDIR}
-.for file in ${EXAMPLE_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${EXAMPLESDIR}
-.endfor
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${EXAMPLE_FILES} ${STAGEDIR}${EXAMPLESDIR}
 # documentation
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-. for file in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-. endfor
-.endif
-
-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
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/codeville/distinfo
==============================================================================
--- head/devel/codeville/distinfo	Mon Jul 26 21:11:58 2010	(r258295)
+++ head/devel/codeville/distinfo	Sat Jun 28 21:58:36 2014	(r359721)
@@ -1,3 +1,2 @@
-MD5 (Codeville-0.1.16.tar.gz) = 032e78024a30b20c6bae926499c7538d
-SHA256 (Codeville-0.1.16.tar.gz) = 58cd0e27dd85dca5bf0a8d16e94aed49295dac5a2d5110acb85faa181f17f42b
-SIZE (Codeville-0.1.16.tar.gz) = 93177
+SHA256 (Codeville-0.1.16.tar.xz) = b5cf02fa1846498c23c7d910b1b971793e173b00df9944593ed3c6357b9fdecb
+SIZE (Codeville-0.1.16.tar.xz) = 70360

Added: head/devel/codeville/files/patch-MANIFEST.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/codeville/files/patch-MANIFEST.in	Sat Jun 28 21:58:36 2014	(r359721)
@@ -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

Modified: head/devel/codeville/files/patch-setup.py
==============================================================================
--- head/devel/codeville/files/patch-setup.py	Mon Jul 26 21:11:58 2010	(r258295)
+++ head/devel/codeville/files/patch-setup.py	Sat Jun 28 21:58:36 2014	(r359721)
@@ -1,7 +1,7 @@
---- setup.py.orig	Tue Dec  7 23:17:53 2004
-+++ setup.py	Tue Dec  7 23:18:37 2004
-@@ -43,6 +43,5 @@
-     packages = ["Codeville"],
+--- 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,

Modified: head/devel/codeville/pkg-descr
==============================================================================
--- head/devel/codeville/pkg-descr	Mon Jul 26 21:11:58 2010	(r258295)
+++ head/devel/codeville/pkg-descr	Sat Jun 28 21:58:36 2014	(r359721)
@@ -1,11 +1,9 @@
-[ excerpt from developer's web site ]
-
-Why yet another version control system? All other version control
-systems require that you keep careful track of the relationships
-between branches so as not have to repeatedly merge the same
-conflicts. Codeville is much more anarchic. It allows you to update
-from or commit to any repository at any time with no unnecessary
-re-merges.
+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
@@ -16,9 +14,4 @@ the other side win automatically. When t
 automatically mergeable version conflict, Codeville behaves in
 almost exactly the same way as CVS.
 
-For subtle but very important reasons Codeville actually versions
-spaces between lines, rather than the lines themselves. If you want
-to know the complete accurate details of how it works, you can look
-at the slides. Beyond that, I suggest reading the source.
-
-WWW: http://www.codeville.org/
+WWW: http://bsdforge.com/projects/devel/codeville/
