Index: head/www/py-searx/Makefile =================================================================== --- head/www/py-searx/Makefile (revision 463943) +++ head/www/py-searx/Makefile (revision 463944) @@ -1,37 +1,47 @@ # Created by: Loic Blot # $FreeBSD$ PORTNAME= searx -PORTVERSION= 0.12.0 -DISTVERSIONPREFIX= v +DISTVERSION= 0.14.0 CATEGORIES= www python +MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= loic.blot@unix-experience.fr -COMMENT= Searx / a privacy-respecting, hackable metasearch engine +COMMENT= Privacy-respecting, hackable metasearch engine LICENSE= AGPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.0:devel/py-dateutil@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Flask-Babel>=0.11.1:devel/py-flask-babel@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}lxml>=3.6.0:devel/py-lxml@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>=0.4.1:net/py-ndg_httpsclient@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}openssl>=0.15.1:security/py-openssl@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Flask>=0.11.1:www/py-flask@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10:www/py-requests@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}certifi>=2016.2.28:security/py-certifi@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-Babel>0:devel/py-flask-babel@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}splinter>0:www/py-splinter@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${PY_FLAVOR} +USES= python +USE_PYTHON= distutils autoplist noflavors +NO_ARCH= yes USE_RC_SUBR= searx -USE_GITHUB= yes -GH_ACCOUNT= asciimoo -GH_PROJECT= searx +SUB_FILES= searx pkg-message +SUB_LIST= PYTHON_CMD=${PYTHON_CMD} PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} -USES= python -NO_ARCH= yes -USE_PYTHON= autoplist distutils concurrent +post-patch: # expect dependencies to be backwards-compatible, otherwise it is difficult to have a port + @${REINPLACE_CMD} -e 's|==|>=|' ${WRKSRC}/requirements.txt + +post-install: + # workaround for https://github.com/asciimoo/searx/issues/1208 + @${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/tests + @${REINPLACE_CMD} -e 's|.*/tests/.*||' ${_PYTHONPKGLIST} + # move settings to etc/ /usr/local/lib/python2.7/site-packages/searx/settings.yml + @${MV} ${STAGEDIR}${PYTHON_SITELIBDIR}/searx/settings.yml ${STAGEDIR}${PREFIX}/etc/${PORTNAME}-settings.yml.sample + @${LN} -s ${PREFIX}/etc/${PORTNAME}-settings.yml ${STAGEDIR}${PYTHON_SITELIBDIR}/searx/settings.yml .include Index: head/www/py-searx/distinfo =================================================================== --- head/www/py-searx/distinfo (revision 463943) +++ head/www/py-searx/distinfo (revision 463944) @@ -1,3 +1,3 @@ -TIMESTAMP = 1496607289 -SHA256 (asciimoo-searx-v0.12.0_GH0.tar.gz) = afb2f8acd82b31dd9305a06b26dfb61985b5ccbfd1d94f711764b2fa7b4b57f4 -SIZE (asciimoo-searx-v0.12.0_GH0.tar.gz) = 1315894 +TIMESTAMP = 1519173150 +SHA256 (searx-0.14.0.tar.gz) = 0efa8e6359e933dc63f6922e201bdd7b21c30f7ed43edb308a2312e57b45dc83 +SIZE (searx-0.14.0.tar.gz) = 1591201 Index: head/www/py-searx/files/pkg-message.in =================================================================== --- head/www/py-searx/files/pkg-message.in (nonexistent) +++ head/www/py-searx/files/pkg-message.in (revision 463944) @@ -0,0 +1,15 @@ +====================================================================== +You installed Searx: privacy-respecting, hackable metasearch engine. + +It is recommended to run Searx as a service: +# sysrc searx_enable="YES" +# service searx start + +It allows you to search the Internet through the local website at +http://localhost:8888 + +By default, Searx uses the network of long running Searx instances. +You can see the list here: http://stats.searx.oe5tpo.com + +Please adjust Searx settings in %%PREFIX%%/etc/searx-settings.yml +====================================================================== Property changes on: head/www/py-searx/files/pkg-message.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/py-searx/files/searx.in =================================================================== --- head/www/py-searx/files/searx.in (revision 463943) +++ head/www/py-searx/files/searx.in (revision 463944) @@ -1,47 +1,48 @@ #!/bin/sh # $FreeBSD$ # PROVIDE: searx # REQUIRE: DAEMON NETWORKING # BEFORE: LOGIN # KEYWORD: shutdown # Add the following lines to /etc/rc.conf to enable searx: # searx_enable="YES" # # searx_enable (bool): Set to YES to enable searx # Default: NO # searx_conf (str): searx configuration file # Default: ${PREFIX}/etc/searx.conf # searx_user (str): searx daemon user # Default: searx # searx_group (str): searx daemon group # Default: searx # searx_flags (str): Extra flags passed to searx . /etc/rc.subr name="searx" rcvar=searx_enable : ${searx_enable:="NO"} : ${searx_user:="www"} : ${searx_group:="www"} : ${searx_flags:=""} # daemon -searx_pidfile="/var/run/${name}.pid" -python="%%PREFIX%%/bin/python2.7" -procname="%%PREFIX%%/lib/python2.7/site-packages/${name}/webapp.py" +pidfile="/var/run/${name}.pid" +python="%%PYTHON_CMD%%" +script_py="%%PYTHON_SITELIBDIR%%/${name}/webapp.py" command=/usr/sbin/daemon -command_args=" -c -f -P ${searx_pidfile} ${python} ${procname}" +procname="daemon" +command_args=" -c -f -P ${pidfile} ${python} ${script_py}" start_precmd="searx_precmd" searx_precmd() { - install -o ${searx_user} /dev/null ${searx_pidfile} + install -o ${searx_user} /dev/null ${pidfile} } load_rc_config $name run_rc_command "$1" Index: head/www/py-searx/pkg-descr =================================================================== --- head/www/py-searx/pkg-descr (revision 463943) +++ head/www/py-searx/pkg-descr (revision 463944) @@ -1,3 +1,19 @@ -A privacy-respecting, hackable metasearch engine. +Searx is a free internet metasearch engine which aggregates results +from more than 70 search services. Users are neither tracked nor profiled. +Additionally, searx can be used over Tor for online anonymity. -WWW: https://github.com/asciimoo/searx +Get started with searx by using one of the public instances. If you don't +trust anyone, you can set up your own service. + +Features: +* Self hosted +* No user tracking +* No user profiling +* About 70 supported search engines +* Easy integration with any search engine +* Cookies are not used by default +* Secure, encrypted connections (HTTPS/SSL) +* Hosted by organisations, such as La Quadrature du Net, which promote + digital rights + +WWW: https://asciimoo.github.io/searx/ Index: head/www/py-searx/pkg-plist =================================================================== --- head/www/py-searx/pkg-plist (nonexistent) +++ head/www/py-searx/pkg-plist (revision 463944) @@ -0,0 +1 @@ +@sample etc/searx-settings.yml.sample Property changes on: head/www/py-searx/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property