Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Jul 2008 16:18:12 GMT
From:      Olli Hauer <ohauer@gmx.de>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/125574: [patch] port devel/cvs2svn make GIT optional
Message-ID:  <200807131618.m6DGIC0E044305@www.freebsd.org>
Resent-Message-ID: <200807131620.m6DGK4WS078933@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         125574
>Category:       ports
>Synopsis:       [patch] port devel/cvs2svn make GIT optional
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 13 16:20:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Olli Hauer
>Release:        
>Organization:
>Environment:
>Description:
There is no need for GIT if someone will convert CVS to SVN, so make this optional.

This is a new patch for the actual cvs2svn version.
A privios PR http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/122471 was closed with comment patch is included in another commit but never happend.




>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.orig	2008-07-07 14:37:17.000000000 +0200
+++ Makefile	2008-07-13 17:44:39.000000000 +0200
@@ -14,13 +14,28 @@
 COMMENT=	CVS to Subversion Repository Converter
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm
-RUN_DEPENDS=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion \
-		${LOCALBASE}/bin/git:${PORTSDIR}/devel/git \
-		${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	yes
 
+OPTIONS=	SUBVERSION "Build with subversion support" on \
+		GIT "Build with git support" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_SUBVERSION) && defined(WITHOUT_GIT)
+BROKEN=	choose at least subversion, git or both
+.endif
+
+.if defined(WITH_SUBVERSION)
+RUN_DEPENDS+=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion
+.endif
+
+.if defined(WITH_GIT)
+RUN_DEPENDS+=	${LOCALBASE}/bin/git:${PORTSDIR}/devel/git
+.endif
+
 MAN1=		cvs2svn.1
 
 # The only thing different in this target vs. the one found in bsd.port.mk
@@ -39,4 +54,4 @@
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/cvs2svn.1 ${PREFIX}/man/man1/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807131618.m6DGIC0E044305>