From owner-svn-ports-all@FreeBSD.ORG Sun Sep 29 17:46:43 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1A1D9A87; Sun, 29 Sep 2013 17:46:43 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E0A842085; Sun, 29 Sep 2013 17:46:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8THkgri044939; Sun, 29 Sep 2013 17:46:42 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8THkgTa044938; Sun, 29 Sep 2013 17:46:42 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201309291746.r8THkgTa044938@svn.freebsd.org> From: Olli Hauer Date: Sun, 29 Sep 2013 17:46:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328719 - head/devel/cvs2svn X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Sep 2013 17:46:43 -0000 Author: ohauer Date: Sun Sep 29 17:46:42 2013 New Revision: 328719 URL: http://svnweb.freebsd.org/changeset/ports/328719 Log: - add stage support - use PYDISTUTILS_AUTOPLIST Deleted: head/devel/cvs2svn/pkg-plist Modified: head/devel/cvs2svn/Makefile Modified: head/devel/cvs2svn/Makefile ============================================================================== --- head/devel/cvs2svn/Makefile Sun Sep 29 17:40:22 2013 (r328718) +++ head/devel/cvs2svn/Makefile Sun Sep 29 17:46:42 2013 (r328719) @@ -21,8 +21,9 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} # 2.4.0 -> svn r5392 PATCHREV= 5433 -USE_PYTHON= 2.6+ +USE_PYTHON= -2.7 USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes OPTIONS_MULTI= SCM OPTIONS_MULTI_SCM= SUBVERSION GIT BAZAAR @@ -32,29 +33,16 @@ SUBVERSION_DESC= Build with subversion s GIT_DESC= Build with git support BAZAAR_DESC= Build with Bazaar support -NO_STAGE= yes +SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:${PORTSDIR}/devel/py-subversion +GIT_RUN_DEPENDS= ${LOCALBASE}/bin/git:${PORTSDIR}/devel/git +BAZAAR_RUN_DEPENDS= ${LOCALBASE}/bin/bzr:${PORTSDIR}/devel/bzr + .include .if ${OSVERSION} > 1000000 RUN_DEPENDS+= cvs:${PORTSDIR}/devel/cvs .endif -.if ${PORT_OPTIONS:MSUBVERSION} -RUN_DEPENDS+= ${LOCALBASE}/bin/svn:${PORTSDIR}/devel/py-subversion -.endif - -.if ${PORT_OPTIONS:MGIT} -RUN_DEPENDS+= ${LOCALBASE}/bin/git:${PORTSDIR}/devel/git -.endif - -.if ${PORT_OPTIONS:MBAZAAR} -RUN_DEPENDS+= ${LOCALBASE}/bin/bzr:${PORTSDIR}/devel/bzr -.endif - -MAN1= cvs2svn.1 \ - cvs2git.1 \ - cvs2bzr.1 - # documents from ${WRKSRC}/doc DOCS1= design-notes.txt making-releases.txt \ revision-reader.txt symbol-notes.txt @@ -69,6 +57,12 @@ PORTDOCS:= ${DOCS1} ${DOCS2} PORTEXAMPLES= cvs2bzr-example.options cvs2git-example.options \ cvs2hg-example.options cvs2svn-example.options +MANPAGES= cvs2svn.1.gz \ + cvs2git.1.gz \ + cvs2bzr.1.gz + +PLIST_FILES+= ${MANPAGES:S|^|man/man1/|} + post-patch: # be consistent with PORTVERSION @${REINPLACE_CMD} -e 's|2.5.0-dev|2.4.0|' \ @@ -92,17 +86,11 @@ post-build: ${MAKE} man -C ${WRKSRC} post-install: - @${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/|} ${PREFIX}/man/man1/ - -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${DOCS1:S|^|${WRKSRC}/doc/|} ${DOCSDIR}/ - @${INSTALL_DATA} ${DOCS2:S|^|${WRKSRC}/www/|} ${DOCSDIR}/ -.endif - -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${EXAMPLESDIR}/ -.endif + @${INSTALL_MAN} ${MANPAGES:R:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/man/man1/ + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${DOCS1:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}/ + @${INSTALL_DATA} ${DOCS2:S|^|${WRKSRC}/www/|} ${STAGEDIR}${DOCSDIR}/ + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}/ .include