Update to 0.99.2

* By default, use Qt4 instead of gtk2, gtk2 support is broken in this version

Changelog:
===== 0.99.2 (September 7, 2012) =====

* Has been added "My Books" (purchased books) section for LitRes catalog
* Hebrew localization (by David Kachan)
* Updated Finnish localization (by Marko Vertainen)

===== 0.99.1 (July 26, 2012) =====

* Fixed bug with freezing at start
* List of network libraries is updated now from fbreader.org
* Fixed working with secured connections (now authentification and books buying on LitRes.ru catalog works)
* Image support for Ms-Word doc format

===== 0.99.0 (July 5, 2012) =====

* Esperanto interface localization has been added (by Katarína Nosková)
* Hyphenation patterns for Polish (by Tomasz Długosz)
* Polish interface localization (by Tomasz Długosz)
* Speed of library scanning has been increased
* Plugin for reading MsWord (*.doc) books
* Fixed zip reading for several ePub books (e.g. for “äie Zeit” ePubs)
* Support for book series in ePubs with point format (e.g. "2.5") has been added
* Fixed image support in RTF books
* Encoding & language recognizing has been improved
* As from version 0.99.0 FBReader for Linux supports qt4 interface only

===== 0.14.20100422 (April 22, 2010) =====

* Chinese text drawing optimization (thanks to You Sheng (SmartDevices) for
  idea)
* Mobipocket image processing has been fixed
* Standard file open dialog is now used instead of the old specially written
  for FBReader
* CSS processing for multi-xhtml epubs has been fixed (in 0.12.* the CSS
  loaded for the first xhtml was also applied for all other xhtmls)
* Chinese encodings detection has been improved
* Language/encoding detection for small files has been improved
* A problem with TOC in newest O'Reilly ePubs has been fixed
* A detection of book format by mime-type (not by file extension) has been
  partially implemented (in Gtk+ version only)
* Polish interface localization has been added (by Rafał Bakuła)

===== 0.12.10 (April 1, 2010) =====

* Processing of external hyperlinks in epubs has been fixed

===== 0.12.9 (March 25, 2010) =====

* Processing of epub local hyperlinks of form "../dir/file.html" has been
  fixed
* Code is now compilable with gcc 4.4.* (missing include directives have been
  added)

===== 0.12.8 (March 22, 2010) =====

* Smashwords library support has been improved: purchase links have been added
* LitRes library support has been updated: since this version FBReader uses an
  OPDS proxy located at http://data.fbreader.org/ for most operations with the
  LitRes catalog
* Processing of the xhtml hyperlinks in html encoded form (like
  '/files/This%20is%20a%20link') has been fixed
* A seg.fault during scanning several archives has been fixed
* Lithuanian localization has been updated
* Vietnamese language/encoding detection patterns have been added
* Parsing of decimal point in CSS files has been fixed (it doesn't depend on
the current locale now)

===== 0.12.7 (March 5, 2010) =====

* Vietnamese localization has been added
* LitRes catalog browsing broken in 0.12.6 has been fixed

===== 0.12.6 (March 3, 2010) =====

* A processing of ePub files with incorrect CRC/entry size information
  has been fixed. Such files are available e.g. from the FictionWise site.

15 files changed, 103 insertions, 209 deletions

diff --git a/misc/fbreader/Makefile b/misc/fbreader/Makefile
index 2870aa88636..ac6a0f19cc0 100644
--- a/misc/fbreader/Makefile
+++ b/misc/fbreader/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2012/09/15 10:05:35 obache Exp $
+# $NetBSD: Makefile,v 1.22 2012/10/01 12:40:36 ryoon Exp $
 #
 
-DISTNAME=	fbreader-sources-0.10.7
+DISTNAME=	fbreader-sources-0.99.2
 PKGNAME=	${DISTNAME:S/-sources//}
-PKGREVISION=	14
 CATEGORIES=	misc
-MASTER_SITES=	http://www.fbreader.org/
+MASTER_SITES=	http://www.fbreader.org/files/desktop/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/misc/fbreader/PLIST b/misc/fbreader/PLIST
index a15dad57775..473844a47e0 100644
--- a/misc/fbreader/PLIST
+++ b/misc/fbreader/PLIST
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2009/10/31 03:20:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/10/01 12:40:36 ryoon Exp $
 bin/FBReader
-lib/libzlcore.so.0.10
-lib/libzlcore.so.0.10.7
-lib/libzltext.so.0.10
-lib/libzltext.so.0.10.7
-lib/zlibrary/ui/zlui-gtk.so
+lib/libzlcore.so
+lib/libzlcore.so.0.99
+lib/libzlcore.so.${PKGVERSION}
+lib/libzltext.so
+lib/libzltext.so.0.99
+lib/libzltext.so.${PKGVERSION}
+lib/libzlui.so
+lib/libzlui.so.0.99
+lib/libzlui.so.${PKGVERSION}
 share/FBReader/default/config.xml
 share/FBReader/default/external.xml
 share/FBReader/default/fullscreen_toolbar.xml
@@ -17,30 +21,52 @@ share/FBReader/formats/html/html.ent
 share/FBReader/formats/xhtml/xhtml-lat1.ent
 share/FBReader/formats/xhtml/xhtml-special.ent
 share/FBReader/formats/xhtml/xhtml-symbol.ent
+share/FBReader/help/MiniHelp.bg.fb2
 share/FBReader/help/MiniHelp.cs.fb2
+share/FBReader/help/MiniHelp.de.fb2
 share/FBReader/help/MiniHelp.en.fb2
+share/FBReader/help/MiniHelp.es.fb2
 share/FBReader/help/MiniHelp.fi.fb2
 share/FBReader/help/MiniHelp.fr.fb2
+share/FBReader/help/MiniHelp.he.fb2
+share/FBReader/help/MiniHelp.hu.fb2
 share/FBReader/help/MiniHelp.id.fb2
 share/FBReader/help/MiniHelp.it.fb2
+share/FBReader/help/MiniHelp.lt.fb2
+share/FBReader/help/MiniHelp.nl.fb2
 share/FBReader/help/MiniHelp.ru.fb2
 share/FBReader/help/MiniHelp.sv.fb2
 share/FBReader/help/MiniHelp.uk.fb2
+share/FBReader/help/MiniHelp.vi.fb2
+share/FBReader/help/MiniHelp.zh.fb2
 share/FBReader/resources/ar.xml
+share/FBReader/resources/bg.xml
 share/FBReader/resources/cs.xml
+share/FBReader/resources/de.xml
 share/FBReader/resources/en.xml
+share/FBReader/resources/eo.xml
+share/FBReader/resources/es.xml
 share/FBReader/resources/fi.xml
 share/FBReader/resources/fr.xml
+share/FBReader/resources/he.xml
+share/FBReader/resources/hu.xml
 share/FBReader/resources/id.xml
 share/FBReader/resources/it.xml
+share/FBReader/resources/lt.xml
+share/FBReader/resources/nl.xml
+share/FBReader/resources/pl.xml
 share/FBReader/resources/ru.xml
 share/FBReader/resources/sv.xml
 share/FBReader/resources/uk.xml
-share/applications/FBReader.desktop
+share/FBReader/resources/vi.xml
+share/FBReader/resources/zh.xml
 share/pixmaps/FBReader.png
 share/pixmaps/FBReader/addBook.png
 share/pixmaps/FBReader/advancedSearchOnNetwork.png
 share/pixmaps/FBReader/bookInfo.png
+share/pixmaps/FBReader/booktree-author.png
+share/pixmaps/FBReader/booktree-book.png
+share/pixmaps/FBReader/booktree-tag.png
 share/pixmaps/FBReader/byAuthor.png
 share/pixmaps/FBReader/byTag.png
 share/pixmaps/FBReader/fb2.png
@@ -59,6 +85,7 @@ share/pixmaps/FBReader/redo.png
 share/pixmaps/FBReader/rotate.png
 share/pixmaps/FBReader/rtf.png
 share/pixmaps/FBReader/search.png
+share/pixmaps/FBReader/searchresult.png
 share/pixmaps/FBReader/showHelp.png
 share/pixmaps/FBReader/showLibrary.png
 share/pixmaps/FBReader/showNetLibrary.png
@@ -66,20 +93,6 @@ share/pixmaps/FBReader/showReading.png
 share/pixmaps/FBReader/showRecent.png
 share/pixmaps/FBReader/tcr.png
 share/pixmaps/FBReader/toc.png
-share/pixmaps/FBReader/tree-authorinfo.png
-share/pixmaps/FBReader/tree-bookinfo.png
-share/pixmaps/FBReader/tree-download-epub.png
-share/pixmaps/FBReader/tree-download-fb2.png
-share/pixmaps/FBReader/tree-download-mobi.png
-share/pixmaps/FBReader/tree-local-epub.png
-share/pixmaps/FBReader/tree-local-fb2.png
-share/pixmaps/FBReader/tree-local-mobi.png
-share/pixmaps/FBReader/tree-open-in-browser.png
-share/pixmaps/FBReader/tree-order-series.png
-share/pixmaps/FBReader/tree-removebook.png
-share/pixmaps/FBReader/tree-removetag.png
-share/pixmaps/FBReader/tree-strut.png
-share/pixmaps/FBReader/tree-taginfo.png
 share/pixmaps/FBReader/undo.png
 share/pixmaps/FBReader/unknown.png
 share/pixmaps/FBReader/upfolder.png
@@ -109,16 +122,27 @@ share/zlibrary/encodings/KOI8-R
 share/zlibrary/encodings/windows-1251
 share/zlibrary/encodings/windows-1252
 share/zlibrary/hyphenationPatterns.zip
-share/zlibrary/keynames-gtk.xml
+share/zlibrary/keynames-qt4.xml
 share/zlibrary/languagePatterns.zip
 share/zlibrary/resources/ar.xml
+share/zlibrary/resources/bg.xml
 share/zlibrary/resources/cs.xml
+share/zlibrary/resources/de.xml
 share/zlibrary/resources/en.xml
+share/zlibrary/resources/eo.xml
+share/zlibrary/resources/es.xml
 share/zlibrary/resources/fi.xml
 share/zlibrary/resources/fr.xml
+share/zlibrary/resources/he.xml
+share/zlibrary/resources/hu.xml
 share/zlibrary/resources/id.xml
 share/zlibrary/resources/it.xml
+share/zlibrary/resources/lt.xml
+share/zlibrary/resources/nl.xml
+share/zlibrary/resources/pl.xml
 share/zlibrary/resources/ru.xml
 share/zlibrary/resources/sv.xml
 share/zlibrary/resources/uk.xml
+share/zlibrary/resources/vi.xml
+share/zlibrary/resources/zh.xml
 share/zlibrary/unicode.xml.gz
diff --git a/misc/fbreader/distinfo b/misc/fbreader/distinfo
index e4ee85a1ffe..cc55c97e76c 100644
--- a/misc/fbreader/distinfo
+++ b/misc/fbreader/distinfo
@@ -1,15 +1,9 @@
-$NetBSD: distinfo,v 1.4 2011/08/22 11:24:06 wiz Exp $
+$NetBSD: distinfo,v 1.5 2012/10/01 12:40:36 ryoon Exp $
 
-SHA1 (fbreader-sources-0.10.7.tgz) = d47a2fa46d43057cac9408db1f2c409f0d3a9942
-RMD160 (fbreader-sources-0.10.7.tgz) = dec4d8ee716697dd021535295c9fe62970f059a2
-Size (fbreader-sources-0.10.7.tgz) = 1600984 bytes
-SHA1 (patch-aa) = c76391244ee4a5f2efb1729157638ddb1ca97d3e
-SHA1 (patch-ab) = b2b2efd7389a847429003e460bd3ccfe4fb27722
-SHA1 (patch-ac) = 95c7a7bee4cfc017cdf52ac04895d78fde2530df
-SHA1 (patch-ae) = 29b33b9440e013cf87ae02ec4d32826f62e6b2ba
-SHA1 (patch-af) = dad6ecbf5ca5663d11ea4a5dbb0bed1ab3cae6d8
-SHA1 (patch-ag) = 19e92bd82df3cfb134ff17c9bdbb59028aceff95
-SHA1 (patch-ah) = 1a154c4650eefd8d255e3b17583e401000c07a54
-SHA1 (patch-ai) = d62ca84596a94f1ec020d419eb0c4f0a28422e1e
-SHA1 (patch-aj) = 5db2865b8975eb9972ec78ebc0914a81bd382b4c
-SHA1 (patch-zlibrary_text_src_view_ZLTextStyle.h) = a4b82ee22148ef3a5f381fb85583ac6f838a24d1
+SHA1 (fbreader-sources-0.99.2.tgz) = 16391ac7d5e38c014c48f9f9f8c0a21342926ffe
+RMD160 (fbreader-sources-0.99.2.tgz) = b143d8bb2aa3879f2c4b273011ffef5ec93532be
+Size (fbreader-sources-0.99.2.tgz) = 2423279 bytes
+SHA1 (patch-ab) = d52517a4467c86c028413b3e431f9a87548ad957
+SHA1 (patch-ah) = 8b30ee01cdb05d1680ce45cb57ba37011c33fa6c
+SHA1 (patch-ai) = 4e1e7f400277461853deba91536d25c13d9b6426
+SHA1 (patch-zlibrary_text_Makefile) = 626331a0fe20419613029ad1337c1d60d73837c9
diff --git a/misc/fbreader/options.mk b/misc/fbreader/options.mk
index 83883a6e422..f810a4b530f 100644
--- a/misc/fbreader/options.mk
+++ b/misc/fbreader/options.mk
@@ -1,17 +1,17 @@
-# $NetBSD: options.mk,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2012/10/01 12:40:36 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.fbreader
 PKG_OPTIONS_REQUIRED_GROUPS=	gui
-PKG_OPTIONS_GROUP.gui=	gtk2 # qt3 qt4 - untested
+PKG_OPTIONS_GROUP.gui=	gtk2 qt3 qt4 # qt3 is untested
 PKG_SUPPORTED_OPTIONS=	debug
-PKG_SUGGESTED_OPTIONS=	gtk2
+PKG_SUGGESTED_OPTIONS=	qt4
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
-MAKE_ENV+=      TARGET_STATUS=debug
+MAKE_ENV+=	TARGET_STATUS=debug
 .else
-MAKE_ENV+=     TARGET_STATUS=release
+MAKE_ENV+=	TARGET_STATUS=release
 .endif
 
 .if !empty(PKG_OPTIONS:Mgtk2)
diff --git a/misc/fbreader/patches/patch-aa b/misc/fbreader/patches/patch-aa
deleted file mode 100644
index 3265ddf40de..00000000000
--- a/misc/fbreader/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $
-
---- build_packages.sh.orig	2009-01-11 01:44:33.000000000 +0100
-+++ build_packages.sh
-@@ -3,7 +3,7 @@
- version=`cat fbreader/VERSION`
- tmpdir=fbreader-$version
- 
--if [ "$1" == "-non-GPL" ]; then
-+if [ "$1" = "-non-GPL" ]; then
- 	distdir=distributions-nonGPL
- 	pkgdir=packages-nonGPL
- 	prepare_nonGPL=true
-@@ -35,7 +35,7 @@ create_tmpdir() {
- 	rm -rf `find $tmpdir -name ".svn"`
- 	make -C $tmpdir distclean 1> /dev/null 2>&1
- 
--	if [ "$prepare_nonGPL" == "true" ]; then
-+	if [ "$prepare_nonGPL" = "true" ]; then
- 		pushd $tmpdir > /dev/null;
- 		echo -en "Removing Arabic localization... ";
- 		rm -rf fbreader/data/resources/ar.xml zlibrary/core/data/resources/ar.xml fbreader/data/help/MiniHelp.*.ar.fb2;
-@@ -114,7 +114,7 @@ build_package() {
- 	esac;
- }
- 
--if [ $1 == all ]; then
-+if [ $1 = all ]; then
- 	create_tmpdir
- 	for pkgtype in $distdir/*; do
- 		for archtype in $pkgtype/*; do
-@@ -128,7 +128,7 @@ else
- 		pkgtype=`echo $1 | cut -d "-" -f 2`;
- 		extra=`echo $1 | cut -d "-" -f 3`;
- 
--		if [ "$pkgtype" != "" -a "$extra" == "" -a -d $distdir/$pkgtype/$archtype ]; then
-+		if [ "$pkgtype" != "" -a "$extra" = "" -a -d $distdir/$pkgtype/$archtype ]; then
- 			create_tmpdir
- 			build_package $archtype $pkgtype
- 			remove_tmpdir
diff --git a/misc/fbreader/patches/patch-ab b/misc/fbreader/patches/patch-ab
index 5baba4f4f60..a52823d7417 100644
--- a/misc/fbreader/patches/patch-ab
+++ b/misc/fbreader/patches/patch-ab
@@ -1,32 +1,25 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2012/10/01 12:40:36 ryoon Exp $
 
---- zlibrary/core/src/unix/time/ZLUnixTime.cpp.orig	2008-03-22 13:00:31.000000000 +0000
+--- zlibrary/core/src/unix/time/ZLUnixTime.cpp.orig	2012-09-06 20:58:48.000000000 +0000
 +++ zlibrary/core/src/unix/time/ZLUnixTime.cpp
-@@ -17,21 +17,21 @@
+@@ -17,7 +17,6 @@
   * 02110-1301, USA.
   */
  
 -#include <sys/timeb.h>
-+#include <sys/time.h>
  #include <time.h>
  
+ #include <ZLTime.h>
+@@ -25,9 +24,9 @@
  #include "ZLUnixTime.h"
  
  ZLTime ZLUnixTimeManager::currentTime() const {
 -	struct timeb timeB;
 -	ftime(&timeB);
--	return ZLTime(timeB.time, timeB.millitm);
-+	struct timeval timeV;
-+	gettimeofday(&timeV, NULL);
-+	return ZLTime(timeV.tv_sec, 1000*timeV.tv_usec);
+-	return ZLTime((long)timeB.time, timeB.millitm);
++	struct timeval timeB;
++	gettimeofday(&timeB,NULL);
++	return ZLTime(timeB.tv_sec, timeB.tv_usec/1000);
  }
  
  short ZLUnixTimeManager::hoursBySeconds(long seconds) const {
--	return localtime(&seconds)->tm_hour;
-+	return localtime((time_t*)&seconds)->tm_hour;
- }
- 
- short ZLUnixTimeManager::minutesBySeconds(long seconds) const {
--	return localtime(&seconds)->tm_min;
-+	return localtime((time_t*)&seconds)->tm_min;
- }
diff --git a/misc/fbreader/patches/patch-ac b/misc/fbreader/patches/patch-ac
deleted file mode 100644
index 9940c3a4a6f..00000000000
--- a/misc/fbreader/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $
-
---- fbreader/src/formats/fb2/FB2BookReader.cpp.orig	2008-03-22 13:00:31.000000000 +0000
-+++ fbreader/src/formats/fb2/FB2BookReader.cpp
-@@ -65,7 +65,7 @@ void FB2BookReader::startElementHandler(
- 		myModelReader.addHyperlinkLabel(id);
- 	}
- 	switch (tag) {
--		case _P:
-+		case _PP:
- 			if (mySectionStarted) {
- 				mySectionStarted = false;
- 			} else if (myInsideTitle) {
-@@ -218,7 +218,7 @@ void FB2BookReader::startElementHandler(
- 
- void FB2BookReader::endElementHandler(int tag) {
- 	switch (tag) {
--		case _P:
-+		case _PP:
- 			myModelReader.endParagraph();
- 			break;
- 		case _V:
diff --git a/misc/fbreader/patches/patch-ae b/misc/fbreader/patches/patch-ae
deleted file mode 100644
index 9e3840c1402..00000000000
--- a/misc/fbreader/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $
-
---- fbreader/src/formats/fb2/FB2Reader.cpp.orig	2008-03-22 13:00:31.000000000 +0000
-+++ fbreader/src/formats/fb2/FB2Reader.cpp
-@@ -31,7 +31,7 @@ void FB2Reader::endElementHandler(const 
- }
- 
- static const FB2Reader::Tag TAGS[] = {
--	{"p", FB2Reader::_P},
-+	{"p", FB2Reader::_PP},
- 	{"subtitle", FB2Reader::_SUBTITLE},
- 	{"cite", FB2Reader::_CITE},
- 	{"text-author", FB2Reader::_TEXT_AUTHOR},
diff --git a/misc/fbreader/patches/patch-af b/misc/fbreader/patches/patch-af
deleted file mode 100644
index 4260d1b623d..00000000000
--- a/misc/fbreader/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $
-
---- fbreader/src/formats/fb2/FB2Reader.h.orig	2008-03-22 13:00:31.000000000 +0000
-+++ fbreader/src/formats/fb2/FB2Reader.h
-@@ -44,7 +44,7 @@ private:
- 
- public:
- 	enum TagCode {
--		_P,
-+		_PP,
- 		_SUBTITLE,
- 		_CITE,
- 		_TEXT_AUTHOR,
diff --git a/misc/fbreader/patches/patch-ag b/misc/fbreader/patches/patch-ag
deleted file mode 100644
index de1dfd7f387..00000000000
--- a/misc/fbreader/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2009/10/31 03:20:35 wiz Exp $
-
---- zlibrary/core/Makefile.orig	2009-10-20 11:48:34.000000000 +0000
-+++ zlibrary/core/Makefile
-@@ -50,8 +50,8 @@ $(TARGET): .objects
- 	@echo -n 'Creating $@ ...'
- 	@$(RM_QUIET) $(TARGET)
- ifeq "$(ZLSHARED)" "yes"
--	@$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) $(NETWORK_LIBS) -ldl
--	#@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) $(NETWORK_LIBS) -ldl -liconv
-+	@$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) $(NETWORK_LIBS)
-+	#@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) $(NETWORK_LIBS) -liconv
- 	@ln -sf $(TARGET) $(TARGET_SONAME)
- 	@ln -sf $(TARGET) $(TARGET_SHORTNAME)
- else
diff --git a/misc/fbreader/patches/patch-ah b/misc/fbreader/patches/patch-ah
index 639f801bf9b..43369e55963 100644
--- a/misc/fbreader/patches/patch-ah
+++ b/misc/fbreader/patches/patch-ah
@@ -1,15 +1,15 @@
-$NetBSD: patch-ah,v 1.2 2009/10/31 03:20:35 wiz Exp $
+$NetBSD: patch-ah,v 1.3 2012/10/01 12:40:36 ryoon Exp $
 
---- makefiles/config.mk.orig	2009-10-20 11:48:35.000000000 +0000
+* Use liblinebreak instead of libunibreak
+
+--- makefiles/config.mk.orig	2012-09-06 20:58:48.000000000 +0000
 +++ makefiles/config.mk
-@@ -38,8 +38,8 @@ ZINCLUDE = -I $(ROOTDIR)/zlibrary/core/i
- ZLSHARED ?= yes
- 
- ifeq "$(ZLSHARED)" "yes"
--  CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/core -lzlcore -ldl
--	TEXT_LIBS = -lzltext
-+  CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/core -lzlcore
-+	TEXT_LIBS = -lzltext -llinebreak
+@@ -47,7 +47,7 @@ ifeq "$(ZLSHARED)" "yes"
+ 	ZLUI_LIB = -L$(ROOTDIR)/zlibrary/ui -lzlui
  else
-   CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/ui -L$(ROOTDIR)/zlibrary/core -lzlcore -lzlui-$(UI_TYPE) -lzlcore $(UILIBS) $(XML_LIBS) $(ARCHIVER_LIBS) $(NETWORK_LIBS)
- 	TEXT_LIBS = -lzltext $(EXTERNAL_LIBS) -llinebreak -lfribidi
+   CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/ui -L$(ROOTDIR)/zlibrary/core -lzlcore -lzlui -lzlcore $(UILIBS) $(XML_LIBS) $(ARCHIVER_LIBS)
+-	TEXT_LIBS = -L$(ROOTDIR)/zlibrary/text -lzltext $(EXTERNAL_LIBS) -lunibreak -lfribidi
++	TEXT_LIBS = -L$(ROOTDIR)/zlibrary/text -lzltext $(EXTERNAL_LIBS) -llinebreak -lfribidi
+ endif
+ 
+ ifneq "$(BUILD_RESOURCE_OBJECT)" "yes"
diff --git a/misc/fbreader/patches/patch-ai b/misc/fbreader/patches/patch-ai
index 6275fcff31d..ba96377774b 100644
--- a/misc/fbreader/patches/patch-ai
+++ b/misc/fbreader/patches/patch-ai
@@ -1,8 +1,10 @@
-$NetBSD: patch-ai,v 1.2 2010/04/05 18:50:48 wiz Exp $
+$NetBSD: patch-ai,v 1.3 2012/10/01 12:40:36 ryoon Exp $
 
---- makefiles/arch/desktop.mk.orig	2009-03-30 12:56:07.000000000 +0000
+* Pass DO_ICONV_CAST
+
+--- makefiles/arch/desktop.mk.orig	2012-09-06 20:58:48.000000000 +0000
 +++ makefiles/arch/desktop.mk
-@@ -10,8 +10,7 @@ CC = gcc
+@@ -12,8 +12,7 @@ CC = $(CCACHE) gcc
  AR = ar rsu
  LD = g++
  
diff --git a/misc/fbreader/patches/patch-aj b/misc/fbreader/patches/patch-aj
deleted file mode 100644
index bd9748d3c01..00000000000
--- a/misc/fbreader/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $
-
---- fbreader/desktop/Makefile.orig	2008-03-22 13:00:31.000000000 +0000
-+++ fbreader/desktop/Makefile
-@@ -6,8 +6,8 @@ TARGET = FBReader
- SHARE_FBREADER = $(DESTDIR)$(SHAREDIR)/FBReader
- 
- install:
--	@install -d $(DESTDIR)/usr/share/applications
--	@install -m 0644 desktop $(DESTDIR)/usr/share/applications/$(TARGET).desktop
-+	@install -d $(DESTDIR)${INSTALLDIR}/share/applications
-+	@install -m 0644 desktop $(DESTDIR)${INSTALLDIR}/share/applications/$(TARGET).desktop
- 	@install -d $(DESTDIR)$(IMAGEDIR)
- 	@install -m 0644 ../data/icons/application/$(TARGET_ARCH).png $(DESTDIR)$(IMAGEDIR)/FBReader.png
- 	@install -m 0644 ../data/default/config.desktop.xml $(SHARE_FBREADER)/default/config.xml
diff --git a/misc/fbreader/patches/patch-zlibrary_text_Makefile b/misc/fbreader/patches/patch-zlibrary_text_Makefile
new file mode 100644
index 00000000000..d137a443923
--- /dev/null
+++ b/misc/fbreader/patches/patch-zlibrary_text_Makefile
@@ -0,0 +1,15 @@
+$NetBSD: patch-zlibrary_text_Makefile,v 1.1 2012/10/01 12:40:36 ryoon Exp $
+
+* Use liblinebreak instead of libunibreak
+
+--- zlibrary/text/Makefile.orig	2012-09-06 20:58:48.000000000 +0000
++++ zlibrary/text/Makefile
+@@ -34,7 +34,7 @@ $(TARGET): .objects
+ 	@echo -n 'Creating $@ ...'
+ 	@$(RM_QUIET) $(TARGET)
+ ifeq "$(ZLSHARED)" "yes"
+-	@$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) $(CORE_LIBS) -lunibreak -lfribidi
++	@$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) $(CORE_LIBS) -llinebreak -lfribidi
+ #@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) $(CORE_LIBS) $(EXTERNAL_LIBS) -llinebreak -lfribidi
+ 	@ln -sf $(TARGET) $(TARGET_SONAME)
+ 	@ln -sf $(TARGET) $(TARGET_SHORTNAME)
diff --git a/misc/fbreader/patches/patch-zlibrary_text_src_view_ZLTextStyle.h b/misc/fbreader/patches/patch-zlibrary_text_src_view_ZLTextStyle.h
deleted file mode 100644
index f0b5d9974dc..00000000000
--- a/misc/fbreader/patches/patch-zlibrary_text_src_view_ZLTextStyle.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-zlibrary_text_src_view_ZLTextStyle.h,v 1.1 2011/08/22 11:24:07 wiz Exp $
-
-Fix build with gcc-4.5.
-
---- zlibrary/text/src/view/ZLTextStyle.h.orig	2009-03-30 12:56:07.000000000 +0000
-+++ zlibrary/text/src/view/ZLTextStyle.h
-@@ -304,7 +304,7 @@ public:
- 
- private:
- 	ZLTextPositionIndicatorInfo(const ZLTextPositionIndicatorInfo&);
--	const ZLTextPositionIndicatorInfo operator = (const ZLTextPositionIndicatorInfo&);
-+	const ZLTextPositionIndicatorInfo &operator = (const ZLTextPositionIndicatorInfo&);
- };
- 
- class ZLTextStyleCollection {