1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-26 09:46:09 +00:00

- update patch from r5406 to r5433

- fix PORTEXAMPLES and PORTDOCS
- depend on devel/cvs for ${OSVERSION} > 1000000

Bugs fixed:
 - Handle non-ASCII, non-UTF8 filenames in .cvsignore files.
 - ExternalBlobGenerator: Don't fail if no revisions are needed for a file.

From the commit log:
 - Write all progress information to stderr rather than stdout. (r5419)
 - Make sure to close CVS repository files after parsing them. (r5421)
 - Choose garbage collection policy a bit more intelligently. (r5431)
 - cvs2git: Emit some more information in OutputPass. (rr5432)
 - Allow paths under Attic directories to be excluded, too. (r5433)
This commit is contained in:
Olli Hauer 2013-09-15 17:17:43 +00:00
parent 5ede3215b6
commit 0105b123b2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=327348
3 changed files with 41 additions and 39 deletions

View File

@ -3,16 +3,14 @@
PORTNAME= cvs2svn
PORTVERSION= 2.4.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://cvs2svn.tigris.org/files/documents/1462/49237/ \
LOCAL/ohauer
# 2.4.0 -> svn r5392
PATCHFILES= ${PORTNAME}-${PORTVERSION}-r${PATCHREV}.diff.bz2
PATCH_SITES= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= ohauer
PATCHREV= 5406
PATCHFILES= ${PORTNAME}-${PORTVERSION}-r${PATCHREV}.diff.bz2
MAINTAINER= ohauer@FreeBSD.org
COMMENT= CVS to Subversion Repository Converter
@ -20,8 +18,10 @@ COMMENT= CVS to Subversion Repository Converter
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:${PORTSDIR}/databases/py-gdbm
RUN_DEPENDS:= ${BUILD_DEPENDS}
# 2.4.0 -> svn r5392
PATCHREV= 5433
USE_PYTHON= 2.5+
USE_PYTHON= 2.6+
USE_PYDISTUTILS= yes
OPTIONS_MULTI= SCM
@ -29,11 +29,15 @@ OPTIONS_MULTI_SCM= SUBVERSION GIT BAZAAR
OPTIONS_DEFAULT= SUBVERSION
SUBVERSION_DESC= Build with subversion support
GIT_DESC= Build with git support
BAZAAR_DESC= Build with Bazaar support
GIT_DESC= Build with git support
BAZAAR_DESC= Build with Bazaar support
.include <bsd.port.options.mk>
.if ${OSVERSION} > 1000000
RUN_DEPENDS+= cvs:${PORTSDIR}/devel/cvs
.endif
.if ${PORT_OPTIONS:MSUBVERSION}
RUN_DEPENDS+= ${LOCALBASE}/bin/svn:${PORTSDIR}/devel/py-subversion
.endif
@ -50,10 +54,25 @@ MAN1= cvs2svn.1 \
cvs2git.1 \
cvs2bzr.1
PORTDOCS= design-notes.txt making-releases.txt revision-reader.txt \
symbol-notes.txt cvs2bzr.html cvs2git.html cvs2svn.html \
faq.html features.html index.html issue_tracker.html \
project_license.html project_tools.html
# documents from ${WRKSRC}/doc
DOCS1= design-notes.txt making-releases.txt \
revision-reader.txt symbol-notes.txt
# documents from ${WRKSRC}/www
DOCS2= cvs2bzr.html cvs2git.html cvs2svn.html \
faq.html features.html index.html issue_tracker.html \
project_license.html project_tools.html
PORTDOCS:= ${DOCS1} ${DOCS2}
PORTEXAMPLES= cvs2bzr-example.options cvs2git-example.options \
cvs2hg-example.options cvs2svn-example.options
post-patch:
# be consistent with PORTVERSION
@${REINPLACE_CMD} -e 's|2.5.0-dev|2.4.0|' \
${WRKSRC}/PKG-INFO \
${WRKSRC}/cvs2svn_lib/version.py
# The only thing different in this target vs. the one found in bsd.port.mk
# is that the extract command exit code is ignored. tar exits with status
@ -69,32 +88,20 @@ do-extract:
done
post-build:
cd ${WRKSRC} && make man
${MAKE} man -C ${WRKSRC}
post-install:
@${INSTALL_MAN} ${WRKSRC}/cvs2svn.1 ${PREFIX}/man/man1/
@${INSTALL_MAN} ${WRKSRC}/cvs2git.1 ${PREFIX}/man/man1/
@${INSTALL_MAN} ${WRKSRC}/cvs2bzr.1 ${PREFIX}/man/man1/
@${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/|} ${PREFIX}/man/man1/
.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/doc/design-notes.txt ${DOCSDIR}/
@${INSTALL_DATA} ${WRKSRC}/doc/making-releases.txt ${DOCSDIR}/
@${INSTALL_DATA} ${WRKSRC}/doc/revision-reader.txt ${DOCSDIR}/
@${INSTALL_DATA} ${WRKSRC}/doc/symbol-notes.txt ${DOCSDIR}/
@${INSTALL_DATA} ${WRKSRC}/www/cvs2bzr.html ${DOCSDIR}/
@${INSTALL_DATA} ${WRKSRC}/www/cvs2git.html ${DOCSDIR}/
@${INSTALL_DATA} ${WRKSRC}/www/cvs2svn.html ${DOCSDIR}/
@${INSTALL_DATA} ${WRKSRC}/www/faq.html ${DOCSDIR}/
@${INSTALL_DATA} ${WRKSRC}/www/features.html ${DOCSDIR}/
@${INSTALL_DATA} ${WRKSRC}/www/index.html ${DOCSDIR}/
@${INSTALL_DATA} ${WRKSRC}/www/issue_tracker.html ${DOCSDIR}/
@${INSTALL_DATA} ${WRKSRC}/www/project_license.html ${DOCSDIR}/
@${INSTALL_DATA} ${WRKSRC}/www/project_tools.html ${DOCSDIR}/
@${INSTALL_DATA} ${DOCS1:S|^|${WRKSRC}/doc/|} ${DOCSDIR}/
@${INSTALL_DATA} ${DOCS2:S|^|${WRKSRC}/www/|} ${DOCSDIR}/
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
@${MKDIR} ${EXAMPLESDIR}
@${INSTALL_DATA} ${WRKSRC}/cvs2bzr-example.options ${EXAMPLESDIR}/
@${INSTALL_DATA} ${WRKSRC}/cvs2git-example.options ${EXAMPLESDIR}/
@${INSTALL_DATA} ${WRKSRC}/cvs2hg-example.options ${EXAMPLESDIR}/
@${INSTALL_DATA} ${WRKSRC}/cvs2svn-example.options ${EXAMPLESDIR}/
@${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${EXAMPLESDIR}/
.endif
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
SHA256 (cvs2svn-2.4.0.tar.gz) = a6677fc3e7b4374020185c61c998209d691de0c1b01b53e59341057459f6f116
SIZE (cvs2svn-2.4.0.tar.gz) = 514891
SHA256 (cvs2svn-2.4.0-r5406.diff.bz2) = 29701df569560cdd51a56c1d1af7b70bc6dd6951751495b3f899a916193cc611
SIZE (cvs2svn-2.4.0-r5406.diff.bz2) = 43844
SHA256 (cvs2svn-2.4.0-r5433.diff.bz2) = a20d854df3c3cbd6a554e99fd7f9bf33dab7520e577ca04dacd20b08a40a7c9f
SIZE (cvs2svn-2.4.0-r5433.diff.bz2) = 57278

View File

@ -244,10 +244,5 @@ bin/cvs2svn
%%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/texttools.py
%%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/texttools.pyc
%%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse/texttools.pyo
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cvs2bzr-example.options
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cvs2git-example.options
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cvs2hg-example.options
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cvs2svn-example.options
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
@dirrm %%PYTHON_SITELIBDIR%%/cvs2svn_rcsparse
@dirrm %%PYTHON_SITELIBDIR%%/cvs2svn_lib