Attachment 103254 Details for Bug 143140 – file.diff

[patch] file.diff

file.diff (text/plain), 9.85 KB, created by Maxime Zakharov on 2010-01-24 02:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maxime Zakharov

Created: 2010-01-24 02:30:00 UTC

Size: 9.85 KB

patch

obsolete

>diff -ruN dpsearch.old/Makefile dpsearch/Makefile
>--- dpsearch.old/Makefile	2009-04-27 05:39:22.000000000 +0400
>+++ dpsearch/Makefile	2010-01-24 05:08:33.000000000 +0300
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	dpsearch
>-PORTVERSION=	4.52
>+PORTVERSION=	4.53
> CATEGORIES=	www
> MASTER_SITES=	http://dataparksearch.googlecode.com/files/ \
> 		http://www.dataparksearch.org/
>@@ -29,7 +29,6 @@
> 
> OPTIONS=	DPSEARCH_THREADS  "Enable pthreads"                       on  \
> 		DPSEARCH_SSL      "Enable SSL"                            on  \
>-		DPSEARCH_GUESSER  "Enable charset and language guesser"   on  \
> 		DPSEARCH_CHINESE  "Enable chinese charsets"               off \
> 		DPSEARCH_JAPANESE "Enable japanese charsets"              off \
> 		DPSEARCH_MECAB    "Enable MeCab japanese analyzer"        off \
>@@ -37,8 +36,9 @@
> 		DPSEARCH_APACHE   "Enable mod_dpsearch for Apache"        off \
> 		DPSEARCH_IDN      "Enable Internationalized Domain Names" off \
> 		DPSEARCH_ASPELL   "Enable aspell support"                 off \
>-		DPSEARCH_PGSQL    "Use PostgreSQL  (mutually exclusive)"  off \
>-		DPSEARCH_MYSQL    "Use MySQL       (mutually exclusive)"  on \
>+		DPSEARCH_EXTRACT  "Enable libextractor support"           off \
>+		DPSEARCH_PGSQL    "Use PostgreSQL  (mutually exclusive)"  on \
>+		DPSEARCH_MYSQL    "Use MySQL       (mutually exclusive)"  off \
> 		DPSEARCH_SQLITE   "Use SQLite      (mutually exclusive)"  off
> 
> .include <bsd.port.pre.mk>
>@@ -59,6 +59,11 @@
> CONFIGURE_ARGS+=--without-aspell
> .endif
> 
>+.if !defined(WITHOUT_DPSEARCH_EXTRACT)
>+LIB_DEPENDS+=   extractor.2:${PORTSDIR}/textproc/libextractor
>+.endif
>+
>+
> .if !defined(NO_OPENSSL) && !defined(WITHOUT_DPSEARCH_SSL)
> WITH_OPENSSL=	yes
> .endif
>@@ -67,10 +72,6 @@
> CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
> .endif
> 
>-.if defined(WITH_DPSEARCH_GUESSER)
>-CONFIGURE_ARGS+=--enable-charset-guesser
>-.endif
>-
> .if defined(WITH_DPSEARCH_CHASRETS)
> CONFIGURE_ARGS+=--with-extra-charsets=all
> .endif
>diff -ruN dpsearch.old/distinfo dpsearch/distinfo
>--- dpsearch.old/distinfo	2009-04-25 16:13:03.000000000 +0400
>+++ dpsearch/distinfo	2010-01-24 02:52:40.000000000 +0300
>@@ -1,3 +1,3 @@
>-MD5 (dpsearch-4.52.tar.bz2) = ede74bec3c39462e4a49840c115c07a8
>-SHA256 (dpsearch-4.52.tar.bz2) = dfce226671f9353eaa50e82dbcd483ea9a2a195189705eefb64e250b48d67dd1
>-SIZE (dpsearch-4.52.tar.bz2) = 2175210
>+MD5 (dpsearch-4.53.tar.bz2) = 5667af2069079496ba9c15f03562a4d1
>+SHA256 (dpsearch-4.53.tar.bz2) = f2ba22a49533a62114c8494ba7513f86b3fd3fa8d45dd7cb63e2e139ba929591
>+SIZE (dpsearch-4.53.tar.bz2) = 2124818
>diff -ruN dpsearch.old/pkg-plist dpsearch/pkg-plist
>--- dpsearch.old/pkg-plist	2009-01-13 14:31:05.000000000 +0300
>+++ dpsearch/pkg-plist	2010-01-24 05:18:51.000000000 +0300
>@@ -25,34 +25,32 @@
> etc/dpsearch/langmap/ar.cp1256.lm
> etc/dpsearch/langmap/ar.cp1256.quran.lm
> etc/dpsearch/langmap/ast.utf-8.lm
>-etc/dpsearch/langmap/av.utf-8.lm
> etc/dpsearch/langmap/az.utf8.lm
> etc/dpsearch/langmap/ba.cp1251.lm
> etc/dpsearch/langmap/ba.koi8-r.lm
> etc/dpsearch/langmap/ba.utf-8.lm
> etc/dpsearch/langmap/be.cp1251.lm
>+etc/dpsearch/langmap/be.utf-16be.lm
>+etc/dpsearch/langmap/be.utf-16le.lm
>+etc/dpsearch/langmap/be.utf-8.lm
> etc/dpsearch/langmap/bg.cp1251.bible.lm
> etc/dpsearch/langmap/bg.cp1251.lm
> etc/dpsearch/langmap/bg.cyrillic.bible.lm
> etc/dpsearch/langmap/bg.cyrillic.lm
> etc/dpsearch/langmap/bg.utf-8.bible.lm
> etc/dpsearch/langmap/bg.utf-8.lm
>-etc/dpsearch/langmap/bn.utf-8.lm
> etc/dpsearch/langmap/br.latin1.lm
> etc/dpsearch/langmap/br.utf-8.lm
> etc/dpsearch/langmap/bs.ascii.lm
> etc/dpsearch/langmap/bs.cp1250.lm
> etc/dpsearch/langmap/bs.latin2.lm
> etc/dpsearch/langmap/bs.utf-8.lm
>-etc/dpsearch/langmap/ca.latin1.lit.lm
> etc/dpsearch/langmap/ca.latin1.lm
> etc/dpsearch/langmap/ce.utf-8.lm
>-etc/dpsearch/langmap/co.utf-8.lm
> etc/dpsearch/langmap/cs.cp1250.lm
> etc/dpsearch/langmap/cs.iso-8859-1.lm
> etc/dpsearch/langmap/cs.latin2.lm
> etc/dpsearch/langmap/cs.utf-8.lm
>-etc/dpsearch/langmap/csb.utf-8.lm
> etc/dpsearch/langmap/cv.utf-8.lm
> etc/dpsearch/langmap/cy.latin1.lm
> etc/dpsearch/langmap/cy.utf-8.lm
>@@ -61,7 +59,6 @@
> etc/dpsearch/langmap/da.latin1.lm
> etc/dpsearch/langmap/de.latin1.bible.lm
> etc/dpsearch/langmap/de.latin1.lm
>-etc/dpsearch/langmap/de.utf8.lit.lm
> etc/dpsearch/langmap/de.utf8.lm
> etc/dpsearch/langmap/el.cp1253.lm
> etc/dpsearch/langmap/el.greek.lm
>@@ -86,20 +83,13 @@
> etc/dpsearch/langmap/fa.isiri3342.lm
> etc/dpsearch/langmap/fa.utf-8.lm
> etc/dpsearch/langmap/fi.latin1.lm
>-etc/dpsearch/langmap/fo.utf-8.lm
> etc/dpsearch/langmap/fr.latin1.bible.lm
> etc/dpsearch/langmap/fr.latin1.lm
>-etc/dpsearch/langmap/fr.utf-8.lit.lm
>-etc/dpsearch/langmap/fur.utf-8.lm
>-etc/dpsearch/langmap/fy.utf-8.lm
>-etc/dpsearch/langmap/ga.latin1.lit.lm
>+etc/dpsearch/langmap/fr.utf-8.lm
> etc/dpsearch/langmap/ga.latin1.lm
> etc/dpsearch/langmap/ga.utf-8.lm
>-etc/dpsearch/langmap/gd.utf-8.lm
>-etc/dpsearch/langmap/gl.utf-8.lm
> etc/dpsearch/langmap/he.hebrew.lm
> etc/dpsearch/langmap/he.utf-8.lm
>-etc/dpsearch/langmap/hi.utf-8.lm
> etc/dpsearch/langmap/hr.ascii.lm
> etc/dpsearch/langmap/hr.cp1250.bible.lm
> etc/dpsearch/langmap/hr.cp1250.lm
>@@ -110,44 +100,28 @@
> etc/dpsearch/langmap/hu.utf-8.lm
> etc/dpsearch/langmap/hy.armscii-8.lm
> etc/dpsearch/langmap/hy.utf-8.lm
>-etc/dpsearch/langmap/ia.utf-8.lm
> etc/dpsearch/langmap/id.latin1.lm
> etc/dpsearch/langmap/id.utf-8.lm
>-etc/dpsearch/langmap/ie.utf-8.lm
>-etc/dpsearch/langmap/io.utf-8.lm
> etc/dpsearch/langmap/is.latin1.lm
> etc/dpsearch/langmap/is.utf-8.lm
> etc/dpsearch/langmap/it.latin1.lm
>-etc/dpsearch/langmap/ja.euc-jp.lit.lm
>+etc/dpsearch/langmap/it.utf-8.lm
> etc/dpsearch/langmap/ja.euc-jp.lm
>-etc/dpsearch/langmap/ja.iso-2022-jp.lit.lm
> etc/dpsearch/langmap/ja.iso-2022-jp.lm
>-etc/dpsearch/langmap/ja.sjis.lit.lm
> etc/dpsearch/langmap/ja.sjis.lm
>-etc/dpsearch/langmap/ja.utf-8.lit.lm
> etc/dpsearch/langmap/ja.utf-8.lm
>-etc/dpsearch/langmap/jv.utf-8.lm
> etc/dpsearch/langmap/ka.georgian-academy.lm
> etc/dpsearch/langmap/ka.georgian-ps.lm
> etc/dpsearch/langmap/ka.geostd8.lm
> etc/dpsearch/langmap/ka.utf-8.lm
> etc/dpsearch/langmap/kk.utf-8.lm
>-etc/dpsearch/langmap/ko.EUC-KR.lm
>-etc/dpsearch/langmap/ko.euc-kr.lit.lm
>-etc/dpsearch/langmap/ko.utf8.lit.lm
>+etc/dpsearch/langmap/ko.euc-kr.lm
> etc/dpsearch/langmap/ko.utf8.lm
>-etc/dpsearch/langmap/ku.utf-8.lm
>-etc/dpsearch/langmap/kv.utf-8.lm
>-etc/dpsearch/langmap/kw.utf-8.lm
>-etc/dpsearch/langmap/ky.utf-8.lm
> etc/dpsearch/langmap/la.ascii.lm
> etc/dpsearch/langmap/la.utf-8.lm
>-etc/dpsearch/langmap/lb.utf-8.lm
>-etc/dpsearch/langmap/li.utf-8.lm
> etc/dpsearch/langmap/lt.cp1257.lm
> etc/dpsearch/langmap/lt.cp775.lm
> etc/dpsearch/langmap/lt.iso-8859-13.lm
>-etc/dpsearch/langmap/lt.latin4.lit.lm
> etc/dpsearch/langmap/lt.latin4.lm
> etc/dpsearch/langmap/lt.utf-8.lm
> etc/dpsearch/langmap/lv.cp1257.lm
>@@ -157,32 +131,23 @@
> etc/dpsearch/langmap/lv.utf-8.lm
> etc/dpsearch/langmap/mi.latin1.lm
> etc/dpsearch/langmap/mi.utf-8.lm
>-etc/dpsearch/langmap/mk.utf-8.lm
>-etc/dpsearch/langmap/mo.utf-8.lm
>-etc/dpsearch/langmap/ms.utf-8.lm
> etc/dpsearch/langmap/mt.latin1.lm
> etc/dpsearch/langmap/mt.utf-8.lm
>-etc/dpsearch/langmap/nap.utf-8.lm
>-etc/dpsearch/langmap/nds.utf-8.lm
> etc/dpsearch/langmap/nl.latin1.bible.lm
> etc/dpsearch/langmap/nl.latin1.lm
> etc/dpsearch/langmap/nl.utf-8.lm
> etc/dpsearch/langmap/nl.windows-1252.lm
>-etc/dpsearch/langmap/nn.utf-8.lm
> etc/dpsearch/langmap/no.latin1.lm
> etc/dpsearch/langmap/no.utf-8.lm
>-etc/dpsearch/langmap/oc.utf-8.lm
> etc/dpsearch/langmap/os.utf-8.lm
>-etc/dpsearch/langmap/pl.cp1250.lit.lm
> etc/dpsearch/langmap/pl.cp1250.lm
>-etc/dpsearch/langmap/pl.cp852.lit.lm
> etc/dpsearch/langmap/pl.cp852.lm
>-etc/dpsearch/langmap/pl.latin2.lit.lm
> etc/dpsearch/langmap/pl.latin2.lm
> etc/dpsearch/langmap/pl.utf-8.lm
> etc/dpsearch/langmap/pt-br.latin1.lm
>-etc/dpsearch/langmap/pt-pt.latin1.lm
>-etc/dpsearch/langmap/rmy.utf-8.lm
>+etc/dpsearch/langmap/pt-br.utf-8.lm
>+etc/dpsearch/langmap/pt.latin1.lm
>+etc/dpsearch/langmap/pt.utf-8.lm
> etc/dpsearch/langmap/ro.ascii.lm
> etc/dpsearch/langmap/ro.cp1250.lm
> etc/dpsearch/langmap/ro.latin2.lm
>@@ -196,12 +161,9 @@
> etc/dpsearch/langmap/ru.koi-7.lm
> etc/dpsearch/langmap/ru.koi8-r.lm
> etc/dpsearch/langmap/ru.maccyr.lm
>-etc/dpsearch/langmap/ru.utf-16be.lit.lm
>-etc/dpsearch/langmap/ru.utf-16le.lit.lm
>+etc/dpsearch/langmap/ru.utf-16be.lm
>+etc/dpsearch/langmap/ru.utf-16le.lm
> etc/dpsearch/langmap/ru.utf8.lm
>-etc/dpsearch/langmap/scn.utf-8.lm
>-etc/dpsearch/langmap/se.utf-8.lm
>-etc/dpsearch/langmap/sh.utf-8.lm
> etc/dpsearch/langmap/sk.ascii.lm
> etc/dpsearch/langmap/sk.cp1250.lm
> etc/dpsearch/langmap/sk.latin2.lm
>@@ -210,13 +172,11 @@
> etc/dpsearch/langmap/sl.cp1250.lm
> etc/dpsearch/langmap/sl.latin2.lm
> etc/dpsearch/langmap/sl.utf-8.lm
>-etc/dpsearch/langmap/so.utf-8.lm
> etc/dpsearch/langmap/sq.latin1.lm
> etc/dpsearch/langmap/sq.utf-8.lm
> etc/dpsearch/langmap/sr.cp1250.lm
> etc/dpsearch/langmap/sr.latin2.lm
> etc/dpsearch/langmap/sr.utf-8.lm
>-etc/dpsearch/langmap/su.utf-8.lm
> etc/dpsearch/langmap/sv.latin1.bible.lm
> etc/dpsearch/langmap/sv.latin1.lm
> etc/dpsearch/langmap/sv.utf-8.bible.lm
>@@ -225,11 +185,9 @@
> etc/dpsearch/langmap/sw.utf-8.lm
> etc/dpsearch/langmap/ta.tscii.lm
> etc/dpsearch/langmap/ta.utf-8.lm
>-etc/dpsearch/langmap/te.utf-8.lm
> etc/dpsearch/langmap/th.cp874.lm
> etc/dpsearch/langmap/th.tis-620.lm
> etc/dpsearch/langmap/th.utf-8.lm
>-etc/dpsearch/langmap/tk.utf-8.lm
> etc/dpsearch/langmap/tl.ascii.bible.lm
> etc/dpsearch/langmap/tl.ascii.lm
> etc/dpsearch/langmap/tl.utf-8.lm
>@@ -238,16 +196,14 @@
> etc/dpsearch/langmap/tr.latin5.lm
> etc/dpsearch/langmap/tr.utf-8.lm
> etc/dpsearch/langmap/tt.utf-8.lm
>-etc/dpsearch/langmap/udm.utf-8.lm
>-etc/dpsearch/langmap/ug.utf-8.lm
> etc/dpsearch/langmap/uk.cp1251.lm
> etc/dpsearch/langmap/uk.cp866u.lm
> etc/dpsearch/langmap/uk.koi8-u.lm
>-etc/dpsearch/langmap/uz.utf-8.lm
>+etc/dpsearch/langmap/uz-cyr.utf-8.lm
>+etc/dpsearch/langmap/uz-lat.utf-8.lm
> etc/dpsearch/langmap/vi.utf-8.lm
> etc/dpsearch/langmap/vi.viscii.lm
> etc/dpsearch/langmap/wa.utf-8.lm
>-etc/dpsearch/langmap/xal.utf-8.lm
> etc/dpsearch/langmap/zh-min-nan.utf-8.lm
> etc/dpsearch/langmap/zh.big5.lm
> etc/dpsearch/langmap/zh.gb18030.lm

Actions: View | Diff

Attachments on bug 143140: 103254