4 files changed, 69 insertions, 49 deletions

diff --git a/net/prosearch/Makefile b/net/prosearch/Makefile
index c513c1396c44..4bffb5f98eb3 100644
--- a/net/prosearch/Makefile
+++ b/net/prosearch/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	prosearch
-PORTVERSION=	0.17.2
+PORTVERSION=	0.18.1
 CATEGORIES=	net www
-MASTER_SITES=	SF
+MASTER_SITES=	http://pro.setun.net/search/download/ SF
 MASTER_SITE_SUBDIR=	pro-search
-DISTNAME=	pro-search-0.17.2.tar
-EXTRACT_SUFX=	.bz2
 
 MAINTAINER=	proler@gmail.com
 COMMENT=	Powerful file search
@@ -25,16 +23,34 @@ PLIST_SUB+=	SEARCHDIR=${SEARCHDIR}
 
 #todo
 # user and group for crawler
-OPTIONS=	\
-		CRAWLER        	"With crawler deps "	on	\
-		SAMBA        	" crawler with SAMBA "	on	\
-		RSYNC        	" crawler with RSYNC "	off	\
-		DB        	"With database deps "	on	\
-		WEB         	"With web deps "	on	\
-		MOD_PERL2	"  With MOD_PERL2 "	on
+OPTIONS=\
+		CRAWLER "With crawler deps" on \
+		SAMBA "crawler with SAMBA (file://)" on \
+		RSYNC " crawler with RSYNC " off \
+		WEB "With web deps (APACHE)" on \
+		MOD_PERL2 "With MOD_PERL2" off \
+		DB "With database server deps" on \
+		MYSQL "mysql" on \
+		PGSQL "postgres" off \
+		PGPP "postgres pure perl connection" off \
+		SQLITE "sqlite" off
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_CRAWLER)
+RUN_DEPENDS+=\
+${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
+nmap:${PORTSDIR}/security/nmap
+.endif
+
+.if defined(WITH_SAMBA)
+RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba3
+.endif
+
+.if defined(WITH_RSYNC)
+RUN_DEPENDS+=	rsync:${PORTSDIR}/net/rsync
+.endif
+
 .if defined(WITH_WEB)
 USE_APACHE=	2.0+
 .endif
@@ -44,34 +60,39 @@ RUN_DEPENDS+=\
  ${LOCALBASE}/${APACHEMODDIR}/mod_perl.so:${PORTSDIR}/www/mod_perl2
 .endif
 
-.if defined(WITH_CRAWLER) || defined(WITH_WEB) || defined(WITH_DB)
+.if defined(WITH_MYSQL)
 USE_MYSQL=	YES
-.endif
-
-.if defined(WITH_CRAWLER) || defined(WITH_WEB)
 USE_PERL5_RUN=	YES
 RUN_DEPENDS+=\
 ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER}
 .endif
 
-.if defined(WITH_CRAWLER)
+.if defined(WITH_DB) && defined(WITH_MYSQL)
 RUN_DEPENDS+=\
-${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-nmap:${PORTSDIR}/security/nmap
+${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server \
+mysqlhotcopy:${PORTSDIR}/databases/mysql${MYSQL_VER}-scripts
+.endif
 
+.if defined(WITH_PGSQL)
+USE_PGSQL=	yes
+RUN_DEPENDS+=\
+${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
-.if defined(WITH_SAMBA)
-RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba3
+
+.if  defined(WITH_PGPP)
+RUN_DEPENDS+=\
+${SITE_PERL}/DBD/PgPP.pm:${PORTSDIR}/databases/p5-DBD-PgPP
 .endif
 
-.if defined(WITH_RSYNC)
-RUN_DEPENDS+=	rsync:${PORTSDIR}/net/rsync
+.if (defined(WITH_PGSQL) || defined(WITH_PGPP)) && defined(WITH_DB)
+RUN_DEPENDS+=\
+${LOCALBASE}/bin/postgres:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
 .endif
 
-.if defined(WITH_DB)
+.if defined(WITH_SQLITE)
+USE_SQLITE=	yes
 RUN_DEPENDS+=\
-${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server \
-mysqlhotcopy:${PORTSDIR}/databases/mysql${MYSQL_VER}-scripts
+${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite
 .endif
 
 WRKSRC=	${WRKDIR}/search
diff --git a/net/prosearch/distinfo b/net/prosearch/distinfo
index b15ec5a441f5..2c0e1a990bc0 100644
--- a/net/prosearch/distinfo
+++ b/net/prosearch/distinfo
@@ -1,3 +1,3 @@
-MD5 (pro-search-0.17.2.tar.bz2) = a7f35c16979ee55f52c1cc73f065f662
-SHA256 (pro-search-0.17.2.tar.bz2) = 35ffecd39b86a93d126cdb2d77e5874b206fa893ef00299fba20359b040409ab
-SIZE (pro-search-0.17.2.tar.bz2) = 218030
+MD5 (prosearch-0.18.1.tar.bz2) = 57b29a2633271a905f4e9fb12d71da21
+SHA256 (prosearch-0.18.1.tar.bz2) = 1613f4fe81d71b28df631cb5311fb99fa36ac5c7ca86be0c3d47523623e28dbf
+SIZE (prosearch-0.18.1.tar.bz2) = 265730
diff --git a/net/prosearch/files/pkg-message.in b/net/prosearch/files/pkg-message.in
index 7836b3716f8b..00f22d51137d 100644
--- a/net/prosearch/files/pkg-message.in
+++ b/net/prosearch/files/pkg-message.in
@@ -16,4 +16,7 @@ Alias /search "%%PREFIX%%/%%SEARCHDIR%%/web"
 or 
 # cp %%PREFIX%%/%%SEARCHDIR%%/tools/search.conf %%PREFIX%%/etc/apache22/Includes/
 # ee %%PREFIX%%/etc/apache22/Includes/search.conf
+8. scan your resources
+# perl crawler.pl 10.0.0.0/24 ftp://files.net 
+9. enjoy: http://your.site/search/ or cd web && perl index.cgi q=test
 =======================================================================
diff --git a/net/prosearch/pkg-plist b/net/prosearch/pkg-plist
index f07fc05bd922..8765fbc1c54e 100644
--- a/net/prosearch/pkg-plist
+++ b/net/prosearch/pkg-plist
@@ -1,11 +1,3 @@
-@comment @unexec if diff -q %D/%%SEARCHDIR%%/config.pl %D/%%SEARCHDIR%%/config.pl.dist; then rm %D/%%SEARCHDIR%%/config.pl; fi
-@comment #@exec  if [ ! -f %B/%%SEARCHDIR%%/config.pl ]; then cp %B/%%SEARCHDIR%%/config.pl.dist %B/%%SEARCHDIR%%/config.pl; fi
-@comment #@unexec if diff -q %%PREFIX%%/etc/apache%%APACHE_VERSION%%/Includes/search.conf %D/%%SEARCHDIR%%/tools/search.conf; then rm %%PREFIX%%/etc/apache%%APACHE_VERSION%%/Includes/search.conf; fi
-@comment #@exec  if [ ! -f %%PREFIX%%/etc/apache%%APACHE_VERSION%%/Includes/search.conf ]; then cp %B/%%SEARCHDIR%%/tools/search.conf %%PREFIX%%/etc/apache%%APACHE_VERSION%%/Includes/search.conf; fi
-@comment #@unexec rm  %%PREFIX%%/www/apache%%APACHE_VERSION%%/data/search
-@comment #@exec touch %%PREFIX%%/www/apache%%APACHE_VERSION%%/data/search
-@comment @unexec rmdir %%SEARCHDIR%%/tmp 2>/dev/null || true
-@comment @unexec rmdir %%SEARCHDIR%%/var 2>/dev/null || true
 %%SEARCHDIR%%/010.search.purge
 %%SEARCHDIR%%/AUTHORS
 %%SEARCHDIR%%/confdef.pl
@@ -13,8 +5,6 @@
 %%SEARCHDIR%%/COPYING
 %%SEARCHDIR%%/crawler.pl
 %%SEARCHDIR%%/search.sh.dist
-%%SEARCHDIR%%/showactive
-%%SEARCHDIR%%/showalive
 %%SEARCHDIR%%/TODO
 %%SEARCHDIR%%/WHATSNEW
 %%SEARCHDIR%%/dcppp/dcppp.pm
@@ -33,21 +23,21 @@
 %%SEARCHDIR%%/lib/psmisc.pm
 %%SEARCHDIR%%/lib/lib.js
 %%SEARCHDIR%%/lib/player.js
+%%SEARCHDIR%%/lib/search1.js
 %%SEARCHDIR%%/lib/psconn.pm
 %%SEARCHDIR%%/lib/pssql.pm
 %%SEARCHDIR%%/lib/psweb.pm
-%%SEARCHDIR%%/modules/chat/chatdef.pl
 %%SEARCHDIR%%/tools/cp_auto_gen.pl
 %%SEARCHDIR%%/tools/grant.sql
 %%SEARCHDIR%%/tools/search.conf
 %%SEARCHDIR%%/tools/size.sh
 %%SEARCHDIR%%/tools/test
 %%SEARCHDIR%%/tools/test.zip
-%%SEARCHDIR%%/tools/tidy
-%%SEARCHDIR%%/tools/pro-search/Makefile
-%%SEARCHDIR%%/tools/pro-search/pkg-descr
-%%SEARCHDIR%%/tools/pro-search/pkg-plist
-%%SEARCHDIR%%/tools/pro-search/files/pkg-message.in
+%%SEARCHDIR%%/tools/tidy.pl
+%%SEARCHDIR%%/tools/prosearch/Makefile
+%%SEARCHDIR%%/tools/prosearch/pkg-descr
+%%SEARCHDIR%%/tools/prosearch/pkg-plist
+%%SEARCHDIR%%/tools/prosearch/files/pkg-message.in
 %%SEARCHDIR%%/web/.htaccess.dist
 %%SEARCHDIR%%/web/about.htm
 %%SEARCHDIR%%/web/base.css
@@ -65,7 +55,6 @@
 %%SEARCHDIR%%/web/robots.txt.dist
 %%SEARCHDIR%%/web/search.css
 %%SEARCHDIR%%/web/search1.css
-%%SEARCHDIR%%/web/search1.js
 %%SEARCHDIR%%/web/search2.css
 %%SEARCHDIR%%/web/dcppp/dcppp.pm
 %%SEARCHDIR%%/web/dcppp/dcppp/clicli.pm
@@ -73,10 +62,12 @@
 %%SEARCHDIR%%/web/dcppp/dcppp/hubcli.pm
 %%SEARCHDIR%%/web/dcppp/dcppp/hubhub.pm
 %%SEARCHDIR%%/web/img/archive.png
+%%SEARCHDIR%%/web/img/apache.png
 %%SEARCHDIR%%/web/img/audio.png
 %%SEARCHDIR%%/web/img/bat.png
 %%SEARCHDIR%%/web/img/cd.png
 %%SEARCHDIR%%/web/img/chm.png
+%%SEARCHDIR%%/web/img/css.png
 %%SEARCHDIR%%/web/img/dchub.png
 %%SEARCHDIR%%/web/img/dcuser.png
 %%SEARCHDIR%%/web/img/dir.png
@@ -90,12 +81,17 @@
 %%SEARCHDIR%%/web/img/image.png
 %%SEARCHDIR%%/web/img/ini.png
 %%SEARCHDIR%%/web/img/mov.png
+%%SEARCHDIR%%/web/img/mysql.png
 %%SEARCHDIR%%/web/img/nrg.png
 %%SEARCHDIR%%/web/img/opera.png
 %%SEARCHDIR%%/web/img/pdf.png
+%%SEARCHDIR%%/web/img/perl.png
 %%SEARCHDIR%%/web/img/ppt.png
+%%SEARCHDIR%%/web/img/postgres.png
 %%SEARCHDIR%%/web/img/psd.png
 %%SEARCHDIR%%/web/img/res.png
+%%SEARCHDIR%%/web/img/rss.png
+%%SEARCHDIR%%/web/img/sqlite.png
 %%SEARCHDIR%%/web/img/swf.png
 %%SEARCHDIR%%/web/img/text.png
 %%SEARCHDIR%%/web/img/unk.png
@@ -103,17 +99,18 @@
 %%SEARCHDIR%%/web/img/video.png
 %%SEARCHDIR%%/web/img/wmv.png
 %%SEARCHDIR%%/web/img/xls.png
+%%SEARCHDIR%%/web/img/xhtml11.png
 %%SEARCHDIR%%/web/img/xml.png
 %%SEARCHDIR%%/web/lib/psmisc.pm
 %%SEARCHDIR%%/web/lib/lib.js
 %%SEARCHDIR%%/web/lib/player.js
+%%SEARCHDIR%%/web/lib/search1.js
 %%SEARCHDIR%%/web/lib/psconn.pm
 %%SEARCHDIR%%/web/lib/pssql.pm
 %%SEARCHDIR%%/web/lib/psweb.pm
 @dirrm %%SEARCHDIR%%/dcppp/dcppp
-@dirrm %%SEARCHDIR%%/modules/chat
-@dirrm %%SEARCHDIR%%/tools/pro-search/files
-@dirrm %%SEARCHDIR%%/tools/pro-search
+@dirrm %%SEARCHDIR%%/tools/prosearch/files
+@dirrm %%SEARCHDIR%%/tools/prosearch
 @dirrm %%SEARCHDIR%%/web/dcppp/dcppp
 @dirrm %%SEARCHDIR%%/web/dcppp
 @dirrm %%SEARCHDIR%%/web/img
@@ -122,7 +119,6 @@
 @dirrm %%SEARCHDIR%%/doc
 @dirrm %%SEARCHDIR%%/example
 @dirrm %%SEARCHDIR%%/lib
-@dirrm %%SEARCHDIR%%/modules
 @dirrm %%SEARCHDIR%%/tools
 @dirrmtry %%SEARCHDIR%%/tmp
 @dirrmtry %%SEARCHDIR%%/var