View | Details | Raw Unified | Return to bug 168433 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-19 / +26 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	prosearch
8
PORTNAME=	prosearch
9
PORTVERSION=	0.19.1
9
PORTVERSION=	0.19.2
10
PORTREVISION=	1
10
#PORTREVISION=	1
11
CATEGORIES=	net www
11
CATEGORIES=	net www
12
MASTER_SITES=	http://pro.setun.net/search/download/ SF/pro-search/pro-search/${PORTVERSION}
12
MASTER_SITES=	http://pro.setun.net/search/download/ SF/pro-search/pro-search/${PORTVERSION}
13
13
Lines 30-36 Link Here
30
# user and group for crawler, nginx
30
# user and group for crawler, nginx
31
OPTIONS=\
31
OPTIONS=\
32
		CRAWLER "With crawler deps (nmap, p5-libwww)" on \
32
		CRAWLER "With crawler deps (nmap, p5-libwww)" on \
33
		SAMBA "crawler with SAMBA (file://)" on \
33
		SMBCLIENT "crawler with SMBCLIENT (file://)" on \
34
		RSYNC " crawler with RSYNC " off \
34
		RSYNC " crawler with RSYNC " off \
35
		APACH22 "With web server apache2.2+" on \
35
		APACH22 "With web server apache2.2+" on \
36
		APACH20 "With web server apache2.0+" off \
36
		APACH20 "With web server apache2.0+" off \
Lines 49-66 Link Here
49
.include <bsd.port.pre.mk>
49
.include <bsd.port.pre.mk>
50
50
51
RUN_DEPENDS+=\
51
RUN_DEPENDS+=\
52
${SITE_PERL}/lib/abs.pm:${PORTSDIR}/devel/p5-lib-abs
52
p5-lib-abs>=0:${PORTSDIR}/devel/p5-lib-abs
53
53
54
.if defined(WITH_CRAWLER)
54
.if defined(WITH_CRAWLER)
55
RUN_DEPENDS+=\
55
RUN_DEPENDS+=\
56
${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
56
p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
57
${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser \
57
p5-URI>=0:${PORTSDIR}/net/p5-URI \
58
nmap:${PORTSDIR}/security/nmap \
58
p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
59
${SITE_PERL}/Net/DirectConnect.pm:${PORTSDIR}/net-p2p/p5-Net-DirectConnect
59
p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
60
nmap>=0:${PORTSDIR}/security/nmap \
61
p5-Net-DirectConnect>=0:${PORTSDIR}/net-p2p/p5-Net-DirectConnect
60
.endif
62
.endif
61
63
62
.if defined(WITH_SAMBA)
64
.if defined(WITH_SMBCLIENT)
63
RUN_DEPENDS+=	smbclient:${PORTSDIR}/${SAMBA_PORT}
65
RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba-smbclient
64
.endif
66
.endif
65
67
66
.if defined(WITH_RSYNC)
68
.if defined(WITH_RSYNC)
Lines 82-94 Link Here
82
84
83
.if defined(WITH_MOD_PERL2)
85
.if defined(WITH_MOD_PERL2)
84
RUN_DEPENDS+=\
86
RUN_DEPENDS+=\
85
${LOCALBASE}/${APACHEMODDIR}/mod_perl.so:${PORTSDIR}/www/mod_perl2
87
ap22-mod_perl2>=0:${PORTSDIR}/www/mod_perl2
86
.endif
88
.endif
87
89
88
.if defined(WITH_MOD_FASTCGI)
90
.if defined(WITH_MOD_FASTCGI)
89
RUN_DEPENDS+=\
91
RUN_DEPENDS+=\
90
${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi	\
92
ap22-mod_fastcgi>=0:${PORTSDIR}/www/mod_fastcgi	\
91
${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FCGI
93
p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI
92
.endif
94
.endif
93
95
94
.if defined(WITH_SPHINX)
96
.if defined(WITH_SPHINX)
Lines 100-106 Link Here
100
.if defined(WITH_MYSQL)
102
.if defined(WITH_MYSQL)
101
USE_MYSQL=	client
103
USE_MYSQL=	client
102
RUN_DEPENDS+=\
104
RUN_DEPENDS+=\
103
${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
105
p5-DBD-mysql${MYSQL_VER}>=0:${PORTSDIR}/databases/p5-DBD-mysql
104
.endif
106
.endif
105
107
106
.if defined(WITH_DB) && defined(WITH_MYSQL)
108
.if defined(WITH_DB) && defined(WITH_MYSQL)
Lines 108-130 Link Here
108
.endif
110
.endif
109
111
110
.if defined(WITH_MARIA)
112
.if defined(WITH_MARIA)
113
WANT_MYSQL_VER=53
111
RUN_DEPENDS+=\
114
RUN_DEPENDS+=\
112
${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
115
p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
113
${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mariadb
116
.endif
117
118
.if defined(WITH_DB) && defined(WITH_MARIA)
119
USE_MYSQL=	server
114
.endif
120
.endif
115
121
116
.if defined(WITH_PGSQL)
122
.if defined(WITH_PGSQL)
117
USE_PGSQL=	yes
123
USE_PGSQL=	yes
118
RUN_DEPENDS+=\
124
RUN_DEPENDS+=\
119
${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
125
p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
120
.endif
126
.endif
121
127
122
.if  defined(WITH_PGPP)
128
.if  defined(WITH_PGPP)
123
RUN_DEPENDS+=\
129
RUN_DEPENDS+=\
124
${SITE_PERL}/DBD/PgPP.pm:${PORTSDIR}/databases/p5-DBD-PgPP
130
p5-DBD-PgPP>=0:${PORTSDIR}/databases/p5-DBD-PgPP
125
.endif
131
.endif
126
132
127
.if (defined(WITH_PGSQL) || defined(WITH_PGPP)) && defined(WITH_DB)
133
.if (defined(WITH_PGSQL) || defined(WITH_PGPP)) && defined(WITH_DB)
134
USE_PGSQL=	yes
128
RUN_DEPENDS+=\
135
RUN_DEPENDS+=\
129
${LOCALBASE}/bin/postgres:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
136
${LOCALBASE}/bin/postgres:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
130
.endif
137
.endif
Lines 132-138 Link Here
132
.if defined(WITH_SQLITE)
139
.if defined(WITH_SQLITE)
133
USE_SQLITE=	yes
140
USE_SQLITE=	yes
134
RUN_DEPENDS+=\
141
RUN_DEPENDS+=\
135
${SITE_PERL}/${PERL_ARCH}/DBD/SQLite.pm:${PORTSDIR}/databases/p5-DBD-SQLite
142
p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
136
.endif
143
.endif
137
144
138
WRKSRC=	${WRKDIR}/search
145
WRKSRC=	${WRKDIR}/search
(-)./distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (prosearch-0.19.1.tar.bz2) = 41c9d635c9d3dc8cbd162e2110e2c4c97a43480b5666ec2c18b91c08fc9d66f1
1
SHA256 (prosearch-0.19.2.tar.bz2) = 3bf5b90a1f8d66a20cc699ed487708a719e31f6217aa1856f009565d33ffe9fb
2
SIZE (prosearch-0.19.1.tar.bz2) = 313442
2
SIZE (prosearch-0.19.2.tar.bz2) = 400435
(-)./pkg-plist (-1 / +6 lines)
Lines 4-16 Link Here
4
%%SEARCHDIR%%/tools/prosearch/Makefile
4
%%SEARCHDIR%%/tools/prosearch/Makefile
5
%%SEARCHDIR%%/tools/tidy.pl
5
%%SEARCHDIR%%/tools/tidy.pl
6
%%SEARCHDIR%%/tools/test
6
%%SEARCHDIR%%/tools/test
7
%%SEARCHDIR%%/tools/onebyte
7
%%SEARCHDIR%%/tools/rsync_password
8
%%SEARCHDIR%%/tools/test.zip
8
%%SEARCHDIR%%/tools/test.zip
9
%%SEARCHDIR%%/tools/size.sh
9
%%SEARCHDIR%%/tools/size.sh
10
%%SEARCHDIR%%/tools/grant.sql
10
%%SEARCHDIR%%/tools/grant.sql
11
%%SEARCHDIR%%/tools/search.conf
11
%%SEARCHDIR%%/tools/search.conf
12
%%SEARCHDIR%%/tools/sphinx.conf
12
%%SEARCHDIR%%/tools/sphinx.conf
13
%%SEARCHDIR%%/tools/cp_auto_gen.pl
13
%%SEARCHDIR%%/tools/cp_auto_gen.pl
14
%%SEARCHDIR%%/tools/nginx-fastcgi.conf
14
%%SEARCHDIR%%/doc/html2txt.pl
15
%%SEARCHDIR%%/doc/html2txt.pl
15
%%SEARCHDIR%%/doc/cuted.old
16
%%SEARCHDIR%%/doc/cuted.old
16
%%SEARCHDIR%%/doc/doc.txt
17
%%SEARCHDIR%%/doc/doc.txt
Lines 22-31 Link Here
22
%%SEARCHDIR%%/lib/lib.js
23
%%SEARCHDIR%%/lib/lib.js
23
%%SEARCHDIR%%/lib/search1.js
24
%%SEARCHDIR%%/lib/search1.js
24
%%SEARCHDIR%%/lib/player.js
25
%%SEARCHDIR%%/lib/player.js
26
%%SEARCHDIR%%/lib/jquery-1.7.1.min.js
25
%%SEARCHDIR%%/lib/psmisc.pm
27
%%SEARCHDIR%%/lib/psmisc.pm
26
%%SEARCHDIR%%/lib/psweb.pm
28
%%SEARCHDIR%%/lib/psweb.pm
27
%%SEARCHDIR%%/lib/lib.css
29
%%SEARCHDIR%%/lib/lib.css
28
%%SEARCHDIR%%/lib/pssql.pm
30
%%SEARCHDIR%%/lib/pssql.pm
31
%%SEARCHDIR%%/t/json.t
29
%%SEARCHDIR%%/WHATSNEW
32
%%SEARCHDIR%%/WHATSNEW
30
%%SEARCHDIR%%/search.sh.dist
33
%%SEARCHDIR%%/search.sh.dist
31
%%SEARCHDIR%%/config.pl.dist
34
%%SEARCHDIR%%/config.pl.dist
Lines 77-82 Link Here
77
%%SEARCHDIR%%/web/lib/lib.js
80
%%SEARCHDIR%%/web/lib/lib.js
78
%%SEARCHDIR%%/web/lib/search1.js
81
%%SEARCHDIR%%/web/lib/search1.js
79
%%SEARCHDIR%%/web/lib/player.js
82
%%SEARCHDIR%%/web/lib/player.js
83
%%SEARCHDIR%%/web/lib/jquery-1.7.1.min.js
80
%%SEARCHDIR%%/web/lib/psmisc.pm
84
%%SEARCHDIR%%/web/lib/psmisc.pm
81
%%SEARCHDIR%%/web/lib/psweb.pm
85
%%SEARCHDIR%%/web/lib/psweb.pm
82
%%SEARCHDIR%%/web/lib/lib.css
86
%%SEARCHDIR%%/web/lib/lib.css
Lines 111-116 Link Here
111
@dirrm %%SEARCHDIR%%/doc
115
@dirrm %%SEARCHDIR%%/doc
112
@dirrm %%SEARCHDIR%%/example
116
@dirrm %%SEARCHDIR%%/example
113
@dirrm %%SEARCHDIR%%/lib
117
@dirrm %%SEARCHDIR%%/lib
118
@dirrm %%SEARCHDIR%%/t
114
@dirrmtry %%SEARCHDIR%%/tmp
119
@dirrmtry %%SEARCHDIR%%/tmp
115
@dirrmtry %%SEARCHDIR%%/var
120
@dirrmtry %%SEARCHDIR%%/var
116
@dirrmtry %%SEARCHDIR%%/web
121
@dirrmtry %%SEARCHDIR%%/web

Return to bug 168433