[Midnightbsd-cvs] mports [15601] U trunk/devel/cvs2svn: 2.4.0 with updated patchset

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Nov 22 23:09:35 EST 2013 

Revision: 15601
          http://svnweb.midnightbsd.org/mports/?rev=15601
Author:   laffer1
Date:     2013-11-22 23:09:33 -0500 (Fri, 22 Nov 2013)
Log Message:
-----------
2.4.0 with updated patchset

Modified Paths:
--------------
    trunk/devel/cvs2svn/Makefile
    trunk/devel/cvs2svn/distinfo
    trunk/devel/cvs2svn/pkg-plist

Property Changed:
----------------
    trunk/devel/cvs2svn/distinfo
    trunk/devel/cvs2svn/pkg-descr
    trunk/devel/cvs2svn/pkg-plist

Modified: trunk/devel/cvs2svn/Makefile
===================================================================
--- trunk/devel/cvs2svn/Makefile	2013-11-17 21:18:43 UTC (rev 15600)
+++ trunk/devel/cvs2svn/Makefile	2013-11-23 04:09:33 UTC (rev 15601)
@@ -2,7 +2,7 @@
 
 PORTNAME=	cvs2svn
 PORTVERSION=	2.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://cvs2svn.tigris.org/files/documents/1462/49237/ \
 		FREEBSD_LOCAL/ohauer
@@ -10,7 +10,7 @@
 # 2.4.0 -> svn r5392
 PATCH_SITES=	${MASTER_SITE_FREEBSD_LOCAL}
 PATCH_SITE_SUBDIR=	ohauer
-PATCHREV=	5406
+PATCHREV=	5433
 PATCHFILES=	${PORTNAME}-${PORTVERSION}-r${PATCHREV}.diff.bz2
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -21,7 +21,7 @@
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gdbm.so:${PORTSDIR}/databases/py-gdbm
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_PYTHON=	2.5+
+USE_PYTHON=	2.6+
 USE_PYDISTUTILS=	yes
 
 OPTIONS_MULTI=		SCM
@@ -50,11 +50,26 @@
 		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
 # 1 because the distfile contains a symlink that points nowhere.
@@ -69,32 +84,20 @@
 	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>

Modified: trunk/devel/cvs2svn/distinfo
===================================================================
--- trunk/devel/cvs2svn/distinfo	2013-11-17 21:18:43 UTC (rev 15600)
+++ trunk/devel/cvs2svn/distinfo	2013-11-23 04:09:33 UTC (rev 15601)
@@ -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


Property changes on: trunk/devel/cvs2svn/distinfo
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Index: trunk/devel/cvs2svn/pkg-descr
===================================================================
--- trunk/devel/cvs2svn/pkg-descr	2013-11-17 21:18:43 UTC (rev 15600)
+++ trunk/devel/cvs2svn/pkg-descr	2013-11-23 04:09:33 UTC (rev 15601)

Property changes on: trunk/devel/cvs2svn/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/devel/cvs2svn/pkg-plist
===================================================================
--- trunk/devel/cvs2svn/pkg-plist	2013-11-17 21:18:43 UTC (rev 15600)
+++ trunk/devel/cvs2svn/pkg-plist	2013-11-23 04:09:33 UTC (rev 15601)
@@ -244,10 +244,5 @@
 %%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


Property changes on: trunk/devel/cvs2svn/pkg-plist
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property

More information about the Midnightbsd-cvs mailing list