Index: head/devel/cvs2svn/Makefile =================================================================== --- head/devel/cvs2svn/Makefile (revision 537566) +++ head/devel/cvs2svn/Makefile (revision 537567) @@ -1,89 +1,82 @@ # Created by: Hye-Shik Chang # $FreeBSD$ PORTNAME= cvs2svn PORTVERSION= 2.5.0 PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://cvs2svn.tigris.org/files/documents/1462/49543/ \ LOCAL/ohauer MAINTAINER= ohauer@FreeBSD.org COMMENT= CVS to Subversion Repository Converter DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-09-15 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${PY_FLAVOR} \ cvs:devel/cvs USES= shebangfix python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes SHEBANG_FILES= cvs2svn cvs2git cvs2bzr *.py \ contrib/* cvs2svn_lib/*.py \ svntest/* cvs2svn_rcsparse/*.py OPTIONS_MULTI= SCM 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 -.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == LTS SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion-lts>=0:devel/py-subversion@${PY_FLAVOR} -.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 19 -SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion19>=0:devel/py-subversion@${PY_FLAVOR} -.else -# default version -SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${PY_FLAVOR} -.endif GIT_RUN_DEPENDS= ${LOCALBASE}/bin/git:devel/git BAZAAR_RUN_DEPENDS= ${LOCALBASE}/bin/bzr:devel/bzr # 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 MANPAGES= cvs2svn.1.gz \ cvs2git.1.gz \ cvs2bzr.1.gz PLIST_FILES+= ${MANPAGES:S|^|man/man1/|} OPTIONS_DEFINE= DOCS EXAMPLES 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 post-build: ${MAKE} man -C ${WRKSRC} post-install: @${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 Index: head/devel/py-subversion/Makefile =================================================================== --- head/devel/py-subversion/Makefile (revision 537566) +++ head/devel/py-subversion/Makefile (revision 537567) @@ -1,39 +1,37 @@ # Created by: thinker@branda.to # $FreeBSD$ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PORTREVISION= 0 MAINTAINER= lev@FreeBSD.org COMMENT= Python bindings for version control system BUILD_DEPENDS= ${LOCALBASE}/include/py3c.h:devel/py3c -USES= python:${BINDINGS_PYTHON_VERSION} +USES= python USE_PYTHON= flavors py3kplist PORTREVISION_114= 0 PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes +.if ${FLAVOR:Upy37:Mpy3*} +WITH_SUBVERSION_VER= 114 +.else +WITH_SUBVERSION_VER= LTS +.endif + .include "${.CURDIR}/../../devel/subversion/Makefile.addons" CATEGORIES+= python - -.if ${WITH_SUBVERSION_VER} == 114 -BINDINGS_PYTHON_VERSION= 3.5+ -.elif ${WITH_SUBVERSION_VER} == LTS -BINDINGS_PYTHON_VERSION= 2.7 -.else -BROKEN= Wrong WITH_SUBVERSION_VER=${WITH_SUBVERSION_VER}, only 114 (default) and LTS are supported -.endif CONFIGURE_ARGS+= --without-gnome-keyring \ --without-kwallet \ --with-apxs=no ALL_TARGET= swig-py check-swig-py INSTALL_TARGET= install-swig-py .include Index: head/devel/viewvc/Makefile =================================================================== --- head/devel/viewvc/Makefile (revision 537566) +++ head/devel/viewvc/Makefile (revision 537567) @@ -1,79 +1,72 @@ # Created by: will # $FreeBSD$ PORTNAME= viewvc DISTVERSION= 1.2.1 PORTREVISION= 0 CATEGORIES= devel python MAINTAINER= ohauer@FreeBSD.org COMMENT= Web-based Version Control Repository Browsing LICENSE= BSD2CLAUSE USES= cpe python:2.7 USE_GITHUB= yes USE_RC_SUBR= viewvc NO_BUILD= yes NO_OPTIONS_SORT= yes OPTIONS_DEFINE= WEBSRV APMOD SVN MYSQL OPTIONS_DEFAULT= WEBSRV APACHE SVN OPTIONS_SINGLE= WEBSRV APMOD OPTIONS_SINGLE_WEBSRV= APACHE LIGHTTPD OPTIONS_SINGLE_APMOD= MODPYTHON35 MODWSGI WEBSRV_DESC= Enable web server support APMOD_DESC= depend on Apache module MODWSGI_DESC= Add mod_wsgi to the list of package dependencies MODPYTHON35_DESC= Add mod_python35 to the list of package dependencies MYSQL_DESC= Bonsai-like repository query facilities APACHE_USE= APACHE_RUN=24+ LIGHTTPD_RUN_DEPENDS= lighttpd:www/lighttpd MODPYTHON35_RUN_DEPENDS=${APACHE_PKGNAMEPREFIX}mod_python35>=3.5:www/mod_python35 MODWSGI_RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}${PYTHON_PKGNAMEPREFIX}mod_wsgi>=4.4.13:www/mod_wsgi4@${PY_FLAVOR} MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${PY_FLAVOR} -.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == LTS SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion-lts>=0:devel/py-subversion@${PY_FLAVOR} -.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 19 -SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion19>=0:devel/py-subversion@${PY_FLAVOR} -.else -# default version -SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${PY_FLAVOR} -.endif RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} .include SUB_FILES= pkg-message SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \ ECHO=${ECHO} EGREP=${EGREP} TOUCH=${TOUCH} \ CHOWN=${CHOWN} RM=${RM:Q} pre-everything:: .if ${PORT_OPTIONS:MAPMOD} && !${PORT_OPTIONS:MAPACHE} IGNORE= apache module needs Apache server, please re-run 'make config' then choose WEBSRV and APACHE .endif post-patch: .for i in cvsgraph.conf mimetypes.conf viewvc.conf ${MV} ${WRKSRC}/conf/${i}.dist ${WRKSRC}/conf/${i}.sample ${REINPLACE_CMD} -e '/"${i}"/d' ${WRKSRC}/viewvc-install .endfor ${REINPLACE_CMD} -e 's/conf.dist/conf.sample/g' \ ${WRKSRC}/viewvc-install # to much files, use own shebangfix ${FIND} ${WRKSRC} -type f | ${GREP} -v -e 'png' -e 'images' \ | ${XARGS} ${SED} -i '' \ -e '1s|^\#![[:space:]]*/usr/bin/env python|\#!${PYTHON_CMD}|' \ -e '1s|^\#![[:space:]]*/usr/bin/python|\#!${PYTHON_CMD}|' do-install: @(cd ${WRKSRC} && ${PYTHON_CMD} viewvc-install --prefix=${PREFIX}/${PORTNAME} --destdir="${STAGEDIR}" --clean-mode=false) .include Index: head/www/trac/Makefile =================================================================== --- head/www/trac/Makefile (revision 537566) +++ head/www/trac/Makefile (revision 537567) @@ -1,60 +1,60 @@ # Created by: Kuei-Feng Li # $FreeBSD$ PORTNAME= trac PORTVERSION= 1.2.5 CATEGORIES= www devel python MASTER_SITES= http://ftp.edgewall.com/pub/trac/ \ ftp://ftp.edgewall.com/pub/trac/ DISTNAME= Trac-${PORTVERSION} MAINTAINER= joneum@FreeBSD.org COMMENT= Enhanced wiki and issue tracking system for software projects LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.8.0:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7.3:textproc/py-genshi@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.8.0:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7.3:textproc/py-genshi@${PY_FLAVOR} CONFLICTS_INSTALL= trac-devel PORTSCOUT= limit:^1\.2\.[0-9]* USES= python:2.7 shebangfix SHEBANG_FILES= trac/tests/functional/better_twill.py trac/tests/functional/tester.py \ trac/tests/functional/testenv.py trac/tests/functional/compat.py \ trac/tests/functional/__init__.py contrib/emailfilter.py \ contrib/checkwiki.py contrib/htpasswd.py USE_PYTHON= distutils autoplist USE_RC_SUBR= tracd SUB_LIST= PYTHON_CMD=${PYTHON_CMD} PORTEXAMPLES= * PORTDATA= * NO_ARCH= yes OPTIONS_DEFINE= DOCUTILS PYGMENTS TZ SVN EXAMPLES OPTIONS_DEFAULT= DOCUTILS PYGMENTS TZ SVN SQLITE OPTIONS_RADIO= DATABASE OPTIONS_RADIO_DATABASE= PGSQL SQLITE DOCUTILS_DESC= Allow additional text markup PYGMENTS_DESC= Use generic syntax highlighter TZ_DESC= Process Time Zones DOCUTILS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.15.2:textproc/py-docutils@${PY_FLAVOR} PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} TZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} -SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion@${PY_FLAVOR} +SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion-lts>0:devel/py-subversion@${PY_FLAVOR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample-plugins ${FIND} ${WRKSRC}/contrib -type f -maxdepth 1 -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR}/ \; (cd ${WRKSRC}/sample-plugins && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/sample-plugins) .include Index: head/www/trac-devel/Makefile =================================================================== --- head/www/trac-devel/Makefile (revision 537566) +++ head/www/trac-devel/Makefile (revision 537567) @@ -1,60 +1,60 @@ # $FreeBSD$ PORTNAME= trac DISTVERSION= 1.3.3 CATEGORIES= www devel python MASTER_SITES= http://ftp.edgewall.com/pub/trac/ \ ftp://ftp.edgewall.com/pub/trac/ PKGNAMESUFFIX= -devel DISTNAME= Trac-${DISTVERSION} MAINTAINER= joneum@FreeBSD.org COMMENT= Enhanced wiki and issue tracking system for software projects LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} CONFLICTS_INSTALL= trac USES= python:2.7 shebangfix SHEBANG_FILES= trac/tests/functional/better_twill.py trac/tests/functional/tester.py \ trac/tests/functional/testenv.py trac/tests/functional/compat.py \ trac/tests/functional/__init__.py contrib/emailfilter.py \ contrib/checkwiki.py contrib/htpasswd.py USE_PYTHON= distutils autoplist USE_RC_SUBR= tracd SUB_LIST= PYTHON_CMD=${PYTHON_CMD} PORTEXAMPLES= * PORTDATA= * NO_ARCH= yes OPTIONS_DEFINE= DOCUTILS PYGMENTS TZ SVN EXAMPLES OPTIONS_DEFAULT= DOCUTILS PYGMENTS TZ SVN SQLITE OPTIONS_RADIO= DATABASE OPTIONS_RADIO_DATABASE= PGSQL SQLITE DOCUTILS_DESC= Allow additional text markup PYGMENTS_DESC= Use generic syntax highlighter TZ_DESC= Process Time Zones DOCUTILS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils@${PY_FLAVOR} PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} TZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} -SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion@${PY_FLAVOR} +SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion-lts>0:devel/py-subversion@${PY_FLAVOR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample-plugins ${FIND} ${WRKSRC}/contrib -type f -maxdepth 1 -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR}/ \; (cd ${WRKSRC}/sample-plugins && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/sample-plugins) .include