Attachment 113825 Details for Bug 155427 – prosearch-0.19.0.patch

[patch] prosearch-0.19.0.patch

prosearch-0.19.0.patch (text/plain), 6.16 KB, created by proler on 2011-03-10 00:00:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: proler

Created: 2011-03-10 00:00:25 UTC

Size: 6.16 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/net/prosearch/Makefile /usr/home/root/prosearch/Makefile
>--- /usr/ports/net/prosearch/Makefile	2011-02-25 17:36:21.000000000 +0300
>+++ /usr/home/root/prosearch/Makefile	2011-03-10 02:52:04.000000000 +0300
>@@ -2,12 +2,12 @@
> # Date created:		20 May 2006
> # Whom:			Oleg Alexeenkov <proler@gmail.com>
> #
>-# $FreeBSD: ports/net/prosearch/Makefile,v 1.13 2011/02/25 14:36:21 ale Exp $
>+# $FreeBSD: ports/net/prosearch/Makefile,v 1.11 2010/09/14 19:53:24 garga Exp $
> #
> 
> PORTNAME=	prosearch
>-PORTVERSION=	0.18.3
>-PORTREVISION=	2
>+PORTVERSION=	0.19.0
>+#PORTREVISION=	1
> CATEGORIES=	net www
> MASTER_SITES=	http://pro.setun.net/search/download/ SF/pro-search/pro-search/${PORTVERSION}
> 
>@@ -24,27 +24,39 @@
> 
> SAMBA_PORT?=	net/samba34
> 
>+USE_PERL5_RUN=	YES
>+
> #todo
>-# user and group for crawler
>+# user and group for crawler, nginx
> OPTIONS=\
>-		CRAWLER "With crawler deps" on \
>+		CRAWLER "With crawler deps (nmap, p5-libwww)" on \
> 		SAMBA "crawler with SAMBA (file://)" on \
> 		RSYNC " crawler with RSYNC " off \
>-		WEB "With web deps (APACHE)" on \
>+		APACH22 "With web server apache2.2+" on \
>+		APACH20 "With web server apache2.0+" off \
> 		MOD_PERL2 "With MOD_PERL2" off \
> 		MOD_FASTCGI "With MOD_FASTCGI" off \
> 		DB "With database server deps" on \
> 		MYSQL "mysql" on \
>+		MARIA "maria (mysql replace)" off \
> 		PGSQL "postgres" off \
>-		PGPP "postgres pure perl connection" off \
>-		SQLITE "sqlite" off
>+		PGPP "postgres pure Perl connection driver" off \
>+		SQLITE "sqlite" off \
>+		SPHINX "sphinx fulltext search engine" off
>+
>+#		NGINX "With web server deps (NGINX)" off
> 
> .include <bsd.port.pre.mk>
> 
>+RUN_DEPENDS+=\
>+${SITE_PERL}/lib/abs.pm:${PORTSDIR}/devel/p5-lib-abs
>+
> .if defined(WITH_CRAWLER)
> RUN_DEPENDS+=\
> ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
>-nmap:${PORTSDIR}/security/nmap
>+${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser \
>+nmap:${PORTSDIR}/security/nmap \
>+${SITE_PERL}/Net/DirectConnect.pm:${PORTSDIR}/net-p2p/p5-Net-DirectConnect
> .endif
> 
> .if defined(WITH_SAMBA)
>@@ -55,10 +67,19 @@
> RUN_DEPENDS+=	rsync:${PORTSDIR}/net/rsync
> .endif
> 
>-.if defined(WITH_WEB)
>+.if defined(WITH_APACH22)
>+USE_APACHE=	2.2+
>+.endif
>+
>+.if defined(WITH_APACH20)
> USE_APACHE=	2.0+
> .endif
> 
>+.if defined(WITH_NGINX)
>+RUN_DEPENDS+=\
>+nginx:${PORTSDIR}/www/nginx
>+.endif
>+
> .if defined(WITH_MOD_PERL2)
> RUN_DEPENDS+=\
> ${LOCALBASE}/${APACHEMODDIR}/mod_perl.so:${PORTSDIR}/www/mod_perl2
>@@ -70,10 +91,15 @@
> ${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FastCGI
> .endif
> 
>+.if defined(WITH_SPHINX)
>+WITH_MYSQL=	client	# for dbi
>+RUN_DEPENDS+=\
>+searchd:${PORTSDIR}/textproc/sphinxsearch-devel
>+.endif
>+
> .if defined(WITH_MYSQL)
> USE_MYSQL=	client
>-USE_PERL5_RUN=	YES
>-RUN_DEPENDS+=
>+RUN_DEPENDS+=\
> ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
> .endif
> 
>@@ -81,6 +107,12 @@
> USE_MYSQL=	server
> .endif
> 
>+.if defined(WITH_MARIA)
>+RUN_DEPENDS+=\
>+${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
>+${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mariadb
>+.endif
>+
> .if defined(WITH_PGSQL)
> USE_PGSQL=	yes
> RUN_DEPENDS+=\
>@@ -108,6 +140,7 @@
> do-install:
> 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${PREFIX}/${SEARCHDIR}/
> 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${SEARCHDIR}
>+	@${CHMOD} +x ${PREFIX}/${SEARCHDIR}/crawler.pl ${PREFIX}/${SEARCHDIR}/010.search.purge ${PREFIX}/${SEARCHDIR}/*.sh.* ${PREFIX}/${SEARCHDIR}/web/*.*cgi
> 	@${ECHO_CMD} @exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
> 		${SEARCHDIR:S|^${PREFIX}/|%D/|} >> ${TMPPLIST}
> 
>diff -ruN --exclude=CVS /usr/ports/net/prosearch/distinfo /usr/home/root/prosearch/distinfo
>--- /usr/ports/net/prosearch/distinfo	2009-10-10 13:39:06.000000000 +0400
>+++ /usr/home/root/prosearch/distinfo	2011-03-10 02:52:15.000000000 +0300
>@@ -1,3 +1,2 @@
>-MD5 (prosearch-0.18.3.tar.bz2) = b3ade36ba0a0f324d964a34401aac95e
>-SHA256 (prosearch-0.18.3.tar.bz2) = 2d8b730763ab5263fbf495fa7fa76ba5dc821190901f188109d299847af941db
>-SIZE (prosearch-0.18.3.tar.bz2) = 326241
>+SHA256 (prosearch-0.19.0.tar.bz2) = b2739cbdf433c1259aefbc54f0a9ad75807f180a5c932743ed56bd0e1e7dee03
>+SIZE (prosearch-0.19.0.tar.bz2) = 305008
>diff -ruN --exclude=CVS /usr/ports/net/prosearch/pkg-plist /usr/home/root/prosearch/pkg-plist
>--- /usr/ports/net/prosearch/pkg-plist	2009-10-10 13:39:06.000000000 +0400
>+++ /usr/home/root/prosearch/pkg-plist	2011-03-10 02:52:04.000000000 +0300
>@@ -8,6 +8,7 @@
> %%SEARCHDIR%%/tools/size.sh
> %%SEARCHDIR%%/tools/grant.sql
> %%SEARCHDIR%%/tools/search.conf
>+%%SEARCHDIR%%/tools/sphinx.conf
> %%SEARCHDIR%%/tools/cp_auto_gen.pl
> %%SEARCHDIR%%/doc/html2txt.pl
> %%SEARCHDIR%%/doc/cuted.old
>@@ -21,7 +22,6 @@
> %%SEARCHDIR%%/lib/search1.js
> %%SEARCHDIR%%/lib/player.js
> %%SEARCHDIR%%/lib/psmisc.pm
>-%%SEARCHDIR%%/lib/psconn.pm
> %%SEARCHDIR%%/lib/psweb.pm
> %%SEARCHDIR%%/lib/lib.css
> %%SEARCHDIR%%/lib/pssql.pm
>@@ -72,17 +72,10 @@
> %%SEARCHDIR%%/web/img/dcuser.png
> %%SEARCHDIR%%/web/img/nrg.png
> %%SEARCHDIR%%/web/img/ftp.png
>-%%SEARCHDIR%%/web/Net/DirectConnect/clihub.pm
>-%%SEARCHDIR%%/web/Net/DirectConnect/hubcli.pm
>-%%SEARCHDIR%%/web/Net/DirectConnect/hubhub.pm
>-%%SEARCHDIR%%/web/Net/DirectConnect/hub.pm
>-%%SEARCHDIR%%/web/Net/DirectConnect/clicli.pm
>-%%SEARCHDIR%%/web/Net/DirectConnect.pm
> %%SEARCHDIR%%/web/lib/lib.js
> %%SEARCHDIR%%/web/lib/search1.js
> %%SEARCHDIR%%/web/lib/player.js
> %%SEARCHDIR%%/web/lib/psmisc.pm
>-%%SEARCHDIR%%/web/lib/psconn.pm
> %%SEARCHDIR%%/web/lib/psweb.pm
> %%SEARCHDIR%%/web/lib/lib.css
> %%SEARCHDIR%%/web/lib/pssql.pm
>@@ -105,22 +98,12 @@
> %%SEARCHDIR%%/web/.htaccess.dist
> %%SEARCHDIR%%/web/search1.css
> %%SEARCHDIR%%/web/search2.css
>-%%SEARCHDIR%%/Net/DirectConnect/clihub.pm
>-%%SEARCHDIR%%/Net/DirectConnect/hubcli.pm
>-%%SEARCHDIR%%/Net/DirectConnect/hubhub.pm
>-%%SEARCHDIR%%/Net/DirectConnect/hub.pm
>-%%SEARCHDIR%%/Net/DirectConnect/clicli.pm
>-%%SEARCHDIR%%/Net/DirectConnect.pm
> %%SEARCHDIR%%/COPYING
> %%SEARCHDIR%%/crawler.pl
> %%SEARCHDIR%%/confdef.pl
>-@dirrm %%SEARCHDIR%%/Net/DirectConnect
>-@dirrm %%SEARCHDIR%%/Net
> @dirrm %%SEARCHDIR%%/tools/prosearch/files
> @dirrm %%SEARCHDIR%%/tools/prosearch
> @dirrm %%SEARCHDIR%%/tools
>-@dirrm %%SEARCHDIR%%/web/Net/DirectConnect
>-@dirrm %%SEARCHDIR%%/web/Net
> @dirrm %%SEARCHDIR%%/web/img
> @dirrm %%SEARCHDIR%%/web/lib
> @dirrm %%SEARCHDIR%%/doc

Actions: View | Diff

Attachments on bug 155427: 113825