Index: head/devel/viewvc/Makefile =================================================================== --- head/devel/viewvc/Makefile (revision 532137) +++ head/devel/viewvc/Makefile (revision 532138) @@ -1,81 +1,79 @@ # Created by: will # $FreeBSD$ PORTNAME= viewvc -DISTVERSION= 1.1.28 +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 \ - ${WRKSRC}/bin/standalone.py + ${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/devel/viewvc/distinfo =================================================================== --- head/devel/viewvc/distinfo (revision 532137) +++ head/devel/viewvc/distinfo (revision 532138) @@ -1,3 +1,3 @@ -TIMESTAMP = 1587305824 -SHA256 (viewvc-viewvc-1.1.28_GH0.tar.gz) = 6d53db40ac9f81155060c0af6eadce8b95a0bda7a6f3ae5d3b89a91c625d3711 -SIZE (viewvc-viewvc-1.1.28_GH0.tar.gz) = 661267 +TIMESTAMP = 1587311591 +SHA256 (viewvc-viewvc-1.2.1_GH0.tar.gz) = 5fe1e16f986b51a2800d908683673b880684e90ae1611d98744187f0649634f5 +SIZE (viewvc-viewvc-1.2.1_GH0.tar.gz) = 361031 Index: head/devel/viewvc/files/pkg-message.in =================================================================== --- head/devel/viewvc/files/pkg-message.in (revision 532137) +++ head/devel/viewvc/files/pkg-message.in (revision 532138) @@ -1,60 +1,74 @@ [ { type: install message: < WSGIRestrictSignal Off ScriptAlias "/viewvc" "%%PREFIX%%/viewvc/bin/cgi/viewvc.cgi" WSGIScriptAlias "/viewvc" "%%PREFIX%%/viewvc/bin/wsgi/viewvc.wsgi" Options NONE +ExecCGI Example config lines for lighttpd ================================= server.modules = ( "mod_alias", "mod_access" ) alias.url += ( "/viewvc" => "%%PREFIX%%/viewvc/bin/cgi" ) $HTTP["url"] =~ "^/viewvc/" { index-file.names = ( "viewvc.cgi" ) cgi.assign = ( ".cgi" => "%%PYTHON_CMD%%", ) } EOM } +{ + type: upgrade + maximum_version: "1.2.1" + message: <