--- Makefile (revision 540890) +++ Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= viewvc DISTVERSION= 1.2.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= ohauer@FreeBSD.org @@ -15,9 +15,8 @@ USE_GITHUB= yes USE_RC_SUBR= viewvc -NO_BUILD= yes NO_OPTIONS_SORT= yes -OPTIONS_DEFINE= WEBSRV APMOD SVN MYSQL +OPTIONS_DEFINE= WEBSRV APMOD SVN MYSQL ALTSVN OPTIONS_DEFAULT= WEBSRV APACHE SVN OPTIONS_SINGLE= WEBSRV APMOD @@ -30,6 +29,7 @@ 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 +ALTSVN_DESC= Use unofficial alternative svn access module APACHE_USE= APACHE_RUN=24+ LIGHTTPD_RUN_DEPENDS= lighttpd:www/lighttpd @@ -37,12 +37,40 @@ 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} +.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 +.if ${PORT_OPTIONS:MALTSVN} +PATCHFILES= viewvc-1.2.1-altsvn.patch:-p1 +PATCH_SITES= http://home.bsdclub.org/~futatuki/UNIX/archives/ +BUILD_DEPENDS= cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR} +.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == LTS +SVN_RUN_DEPENDS= subversion-lts>=0:devel/subversion +SVN_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}subversion-lts>=0:devel/py-subversion@${PY_FLAVOR} +.else +# default version +SVN_RUN_DEPENDS= subversion>=0:devel/subversion +.endif +PLIST_SUB+= ALTSVN="" +.else +NO_BUILD= yes +.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == LTS +SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion-lts>=0:devel/py-subversion@${PY_FLAVOR} +.else +# default version +BROKEN= Subversion Python bindings for Python 2.7 is needed but not provided +.endif +PLIST_SUB+= ALTSVN="@comment " +.endif + SUB_FILES= pkg-message SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \ ECHO=${ECHO} EGREP=${EGREP} TOUCH=${TOUCH} \ @@ -53,6 +81,11 @@ IGNORE= apache module needs Apache server, please re-run 'make config' then choose WEBSRV and APACHE .endif +.if ${PORT_OPTIONS:MALTSVN} +do-build: + @(cd ${WRKSRC}/src/lib && ${PYTHON_CMD} setup.py config && ${PYTHON_CMD} setup.py build && ${PYTHON_CMD} setup.py install) +.endif + post-patch: .for i in cvsgraph.conf mimetypes.conf viewvc.conf ${MV} ${WRKSRC}/conf/${i}.dist ${WRKSRC}/conf/${i}.sample --- distinfo (revision 540890) +++ distinfo (working copy) @@ -1,3 +1,5 @@ -TIMESTAMP = 1587311591 +TIMESTAMP = 1594003481 SHA256 (viewvc-viewvc-1.2.1_GH0.tar.gz) = 5fe1e16f986b51a2800d908683673b880684e90ae1611d98744187f0649634f5 SIZE (viewvc-viewvc-1.2.1_GH0.tar.gz) = 361031 +SHA256 (viewvc-1.2.1-altsvn.patch) = 9d4ddc6bec5a001f619a68776cdebd5cd718c94cfde772319ee9cb0ab3e1fc26 +SIZE (viewvc-1.2.1-altsvn.patch) = 416196 --- pkg-plist (revision 540890) +++ pkg-plist (working copy) @@ -78,6 +78,15 @@ viewvc/lib/vclib/svn/svn_ra.pyc viewvc/lib/vclib/svn/svn_repos.py viewvc/lib/vclib/svn/svn_repos.pyc +%%ALTSVN%%viewvc/lib/vclib/altsvn/__init__.py +%%ALTSVN%%viewvc/lib/vclib/altsvn/__init__.pyc +%%ALTSVN%%viewvc/lib/vclib/altsvn/_svn.so +%%ALTSVN%%viewvc/lib/vclib/altsvn/_svn_ra.so +%%ALTSVN%%viewvc/lib/vclib/altsvn/_svn_repos.so +%%ALTSVN%%viewvc/lib/vclib/altsvn/svn_ra.py +%%ALTSVN%%viewvc/lib/vclib/altsvn/svn_ra.pyc +%%ALTSVN%%viewvc/lib/vclib/altsvn/svn_repos.py +%%ALTSVN%%viewvc/lib/vclib/altsvn/svn_repos.pyc viewvc/lib/viewvc.py viewvc/lib/viewvc.pyc viewvc/lib/win32popen.py