Update to 0.99.4

* Add missing dependencies.
* Libtoolized.

Changelog:
===== 0.99.4 (November 30, 2012) =====

* Bulgarian hyphenation patterns, converted by Kaloyan Raev
* Network catalogs: fixed Cyryllic names rendering
* Showing suggestions in search field
* Fixed bug with duplicates series items in LitRes catalog
* Fixed different network bugs in Network Library

10 files changed, 258 insertions, 26 deletions

diff --git a/misc/fbreader/Makefile b/misc/fbreader/Makefile
index 79fbe6c7d63..d8283a12d2f 100644
--- a/misc/fbreader/Makefile
+++ b/misc/fbreader/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2013/06/06 12:54:45 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2013/06/27 14:21:09 ryoon Exp $
 #
 
-DISTNAME=	fbreader-sources-0.99.2
+DISTNAME=	fbreader-sources-0.99.4
 PKGNAME=	${DISTNAME:S/-sources//}
-PKGREVISION=	9
 CATEGORIES=	misc
 MASTER_SITES=	http://www.fbreader.org/files/desktop/
 EXTRACT_SUFX=	.tgz
@@ -15,11 +14,11 @@ LICENSE=	gnu-gpl-v2 AND modified-bsd
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_LANGUAGES=	c c++
+USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake pkg-config
 
 MAKE_ENV+=	INSTALLDIR=${PREFIX}
 MAKE_ENV+=	DESTDIR=${DESTDIR}
-MAKE_ENV+=	LDFLAGS=${COMPILER_RPATH_FLAG}${PREFIX}/lib
 MAKE_ENV+=	TARGET_ARCH=desktop
 
 .include "../../mk/bsd.prefs.mk"
@@ -39,4 +38,13 @@ CPPFLAGS+=	-DDO_ICONV_CAST
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/liblinebreak/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/Xrender/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/fbreader/PLIST b/misc/fbreader/PLIST
index 473844a47e0..36cb2956dbf 100644
--- a/misc/fbreader/PLIST
+++ b/misc/fbreader/PLIST
@@ -1,14 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2012/10/01 12:40:36 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/06/27 14:21:09 ryoon Exp $
 bin/FBReader
-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}
+lib/libzlcore.la
+lib/libzltext.la
+lib/libzlui.la
 share/FBReader/default/config.xml
 share/FBReader/default/external.xml
 share/FBReader/default/fullscreen_toolbar.xml
@@ -63,9 +57,12 @@ share/FBReader/resources/zh.xml
 share/pixmaps/FBReader.png
 share/pixmaps/FBReader/addBook.png
 share/pixmaps/FBReader/advancedSearchOnNetwork.png
+share/pixmaps/FBReader/back_button.png
+share/pixmaps/FBReader/back_button_disabled.png
 share/pixmaps/FBReader/bookInfo.png
 share/pixmaps/FBReader/booktree-author.png
 share/pixmaps/FBReader/booktree-book.png
+share/pixmaps/FBReader/booktree-catalog.png
 share/pixmaps/FBReader/booktree-tag.png
 share/pixmaps/FBReader/byAuthor.png
 share/pixmaps/FBReader/byTag.png
@@ -73,6 +70,8 @@ share/pixmaps/FBReader/fb2.png
 share/pixmaps/FBReader/findNext.png
 share/pixmaps/FBReader/findPrevious.png
 share/pixmaps/FBReader/folder.png
+share/pixmaps/FBReader/forward_button.png
+share/pixmaps/FBReader/forward_button_disabled.png
 share/pixmaps/FBReader/gotoHome.png
 share/pixmaps/FBReader/html.png
 share/pixmaps/FBReader/mobipocket.png
@@ -82,15 +81,21 @@ share/pixmaps/FBReader/palm.png
 share/pixmaps/FBReader/plucker.png
 share/pixmaps/FBReader/preferences.png
 share/pixmaps/FBReader/redo.png
+share/pixmaps/FBReader/refresh-icon-1.png
+share/pixmaps/FBReader/refresh-icon-2.png
+share/pixmaps/FBReader/refresh-icon.svg
 share/pixmaps/FBReader/rotate.png
 share/pixmaps/FBReader/rtf.png
 share/pixmaps/FBReader/search.png
+share/pixmaps/FBReader/search_icon.png
 share/pixmaps/FBReader/searchresult.png
 share/pixmaps/FBReader/showHelp.png
 share/pixmaps/FBReader/showLibrary.png
 share/pixmaps/FBReader/showNetLibrary.png
+share/pixmaps/FBReader/showNetworkLibrary.png
 share/pixmaps/FBReader/showReading.png
 share/pixmaps/FBReader/showRecent.png
+share/pixmaps/FBReader/spinner.gif
 share/pixmaps/FBReader/tcr.png
 share/pixmaps/FBReader/toc.png
 share/pixmaps/FBReader/undo.png
@@ -145,4 +150,5 @@ share/zlibrary/resources/sv.xml
 share/zlibrary/resources/uk.xml
 share/zlibrary/resources/vi.xml
 share/zlibrary/resources/zh.xml
+share/zlibrary/style.qss
 share/zlibrary/unicode.xml.gz
diff --git a/misc/fbreader/distinfo b/misc/fbreader/distinfo
index ccca20616f9..bd9858b76e4 100644
--- a/misc/fbreader/distinfo
+++ b/misc/fbreader/distinfo
@@ -1,13 +1,18 @@
-$NetBSD: distinfo,v 1.7 2013/05/06 15:04:55 joerg Exp $
+$NetBSD: distinfo,v 1.8 2013/06/27 14:21:09 ryoon Exp $
 
-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 (fbreader-sources-0.99.4.tgz) = 7e6f0acbac5d8111fcda14a576ae4fdc93eef292
+RMD160 (fbreader-sources-0.99.4.tgz) = 90825fcb6b026785dd3a7329899b54a02b08e4ed
+Size (fbreader-sources-0.99.4.tgz) = 2345664 bytes
 SHA1 (patch-ab) = 4fcbbc7c9fe7fe2e9d841d226ba69624e36e08a5
 SHA1 (patch-ah) = 8b30ee01cdb05d1680ce45cb57ba37011c33fa6c
-SHA1 (patch-ai) = 4e1e7f400277461853deba91536d25c13d9b6426
+SHA1 (patch-ai) = edeca8816f882917bae735ad7f8f9c49dd06d6b1
+SHA1 (patch-fbreader_Makefile) = b34214a6a725527f312969c12f3c79fcda193233
 SHA1 (patch-fbreader_src_fbreader_FBReaderActions.cpp) = ac2d5937d3628abd6db2e4b2fe869d95262d2689
 SHA1 (patch-fbreader_src_fbreader_FBView.cpp) = f9018b813b92d31c67e13eb68d6e50c8a7637a5c
 SHA1 (patch-fbreader_src_formats_html_HtmlReader.cpp) = fe0ebe4dff97a11581a6d7b079f8f19f4e3be019
-SHA1 (patch-zlibrary_text_Makefile) = 626331a0fe20419613029ad1337c1d60d73837c9
+SHA1 (patch-makefiles_qsubdir.mk) = a139410def61e793b193cb54716b9ffb339b5692
+SHA1 (patch-makefiles_subdir.mk) = b9c7d0339e86b9cd6010d4156f35233320a14436
+SHA1 (patch-zlibrary_core_Makefile) = f9141aadbfa7844ac553643957b48ff221e1768f
+SHA1 (patch-zlibrary_text_Makefile) = 0380a2242fc453c1bef462701dd0abc653d87a52
 SHA1 (patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp) = ec87bd8072c2385df6e224c7cb1a914bef595f78
+SHA1 (patch-zlibrary_ui_Makefile) = ac23e1618abfa17bf208f95283781a1d3840cb8d
diff --git a/misc/fbreader/patches/patch-ai b/misc/fbreader/patches/patch-ai
index ba96377774b..4d283a1fc81 100644
--- a/misc/fbreader/patches/patch-ai
+++ b/misc/fbreader/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2012/10/01 12:40:36 ryoon Exp $
+$NetBSD: patch-ai,v 1.4 2013/06/27 14:21:09 ryoon Exp $
 
 * Pass DO_ICONV_CAST
 
---- makefiles/arch/desktop.mk.orig	2012-09-06 20:58:48.000000000 +0000
+--- makefiles/arch/desktop.mk.orig	2012-11-30 12:41:25.000000000 +0000
 +++ makefiles/arch/desktop.mk
 @@ -12,8 +12,7 @@ CC = $(CCACHE) gcc
  AR = ar rsu
@@ -11,6 +11,6 @@ $NetBSD: patch-ai,v 1.3 2012/10/01 12:40:36 ryoon Exp $
 -CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
 -LDFLAGS =
 +CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG ${CPPFLAGS}
+ EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi) 
  
  ifeq "$(UI_TYPE)" "qt"
-   MOC = moc-qt3
diff --git a/misc/fbreader/patches/patch-fbreader_Makefile b/misc/fbreader/patches/patch-fbreader_Makefile
new file mode 100644
index 00000000000..77f73a784ff
--- /dev/null
+++ b/misc/fbreader/patches/patch-fbreader_Makefile
@@ -0,0 +1,25 @@
+$NetBSD: patch-fbreader_Makefile,v 1.1 2013/06/27 14:21:09 ryoon Exp $
+
+* Link to -lX11 etc.
+* Libtoolized.
+
+--- fbreader/Makefile.orig	2012-11-30 12:41:25.000000000 +0000
++++ fbreader/Makefile
+@@ -22,7 +22,7 @@ all: .resources
+ 		fi; \
+ 	done;
+ 	@echo -n 'Linking $(TARGET) ...'
+-	@$(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3
++	@${LIBTOOL} --mode=link --tag=CC $(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.lo` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3 -rpath ${BUILDLINK_X11_DIR}/lib
+ 	@echo ' OK'
+ 
+ FBSHAREDIR = $(DESTDIR)$(SHAREDIR)/FBReader
+@@ -35,7 +35,7 @@ APPIMAGEDIR_REAL = $(subst %application_
+ 
+ do_install:
+ 	@install -d $(DESTDIR)$(BINDIR)
+-	@install $(TARGET) $(DESTDIR)$(BINDIR)/FBReader
++	@${LIBTOOL} --mode=install install $(TARGET) $(DESTDIR)$(BINDIR)
+ 	@install -d $(FBSHAREDIR)
+ 	@install -d $(FBSHAREDIR)/help
+ 	@./scripts/install_help.sh $(VARIANT) $(FBSHAREDIR)/help
diff --git a/misc/fbreader/patches/patch-makefiles_qsubdir.mk b/misc/fbreader/patches/patch-makefiles_qsubdir.mk
new file mode 100644
index 00000000000..3795c8a2a73
--- /dev/null
+++ b/misc/fbreader/patches/patch-makefiles_qsubdir.mk
@@ -0,0 +1,34 @@
+$NetBSD: patch-makefiles_qsubdir.mk,v 1.1 2013/06/27 14:21:09 ryoon Exp $
+
+* Libtoolized
+
+--- makefiles/qsubdir.mk.orig	2012-11-30 12:41:25.000000000 +0000
++++ makefiles/qsubdir.mk
+@@ -5,14 +5,14 @@ INCLUDE = $(QTINCLUDE) $(ZINCLUDE) $(EXT
+ 
+ HEADERS = $(wildcard *.h)
+ SOURCES =	$(wildcard *.cpp)
+-OBJMOC = $(patsubst %.cpp, %.o, $(SRCMOC))
+-OBJECTS = $(patsubst %.cpp, %.o, $(SOURCES))
++OBJMOC = $(patsubst %.cpp, %.lo, $(SRCMOC))
++OBJECTS = $(patsubst %.cpp, %.lo, $(SOURCES))
+ 
+-.SUFFIXES: .cpp .moc.cpp .moc.o .o .h
++.SUFFIXES: .cpp .moc.cpp .moc.lo .lo .h
+ 
+-.cpp.o:
++.cpp.lo:
+ 	@echo -n 'Compiling $@ ...'
+-	@$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
++	@${LIBTOOL} --mode=compile --tag=CXX $(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
+ 	@echo ' OK'
+ 
+ .h.moc.cpp:
+@@ -23,6 +23,6 @@ OBJECTS = $(patsubst %.cpp, %.o, $(SOURC
+ all: $(OBJECTS) $(OBJMOC)
+ 
+ clean:
+-	@$(RM) *.o *.moc.cpp *.d
++	@$(RM) *.lo *.moc.cpp *.d
+ 
+ -include *.d
diff --git a/misc/fbreader/patches/patch-makefiles_subdir.mk b/misc/fbreader/patches/patch-makefiles_subdir.mk
new file mode 100644
index 00000000000..90b8f176747
--- /dev/null
+++ b/misc/fbreader/patches/patch-makefiles_subdir.mk
@@ -0,0 +1,63 @@
+$NetBSD: patch-makefiles_subdir.mk,v 1.1 2013/06/27 14:21:09 ryoon Exp $
+
+* Libtoolized.
+
+--- makefiles/subdir.mk.orig	2012-11-30 12:41:25.000000000 +0000
++++ makefiles/subdir.mk
+@@ -6,43 +6,43 @@ HEADERS = $(wildcard *.h)
+ SOURCES_CPP = $(wildcard *.cpp)
+ SOURCES_OBJCPP = $(wildcard *.M)
+ SOURCES_OBJC = $(wildcard *.m)
+-OBJECTS = $(patsubst %.cpp, %.o, $(SOURCES_CPP)) $(patsubst %.M, %.o, $(SOURCES_OBJCPP)) $(patsubst %.m, %.o, $(SOURCES_OBJC))
++OBJECTS = $(patsubst %.cpp, %.lo, $(SOURCES_CPP)) $(patsubst %.M, %.lo, $(SOURCES_OBJCPP)) $(patsubst %.m, %.lo, $(SOURCES_OBJC))
+ 
+-.SUFFIXES: .cpp .M .m .o .h
++.SUFFIXES: .cpp .M .m .lo .h
+ 
+-.cpp.o:
++.cpp.lo:
+ 	@echo -n 'Compiling $@ ...'
+ ifdef CFLAGS_NOARCH
+-	@$(CC) -MM $(CFLAGS_PRE) $(INCLUDE) $< -o `basename $< .cpp`.d
+-	@$(CC) -c $(CFLAGS) $(INCLUDE) $<
++	@${LIBTOOL} --mode=compile --tag=CC $(CC) -MM $(CFLAGS_PRE) $(INCLUDE) $< -o `basename $< .cpp`.d
++	@${LIBTOOL} --mode=compile --tag=CC $(CC) -c $(CFLAGS) $(INCLUDE) $<
+ else
+-	@$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
++	@${LIBTOOL} --mode=compile --tag=CC $(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
+ endif
+ 	@echo ' OK'
+ 
+ .M.o:
+ 	@echo -n 'Compiling $@ ...'
+ ifdef CFLAGS_NOARCH
+-	@$(CC) -MM $(CFLAGS_PRE) $(INCLUDE) $< -o `basename $< .M`.d
+-	@$(CC) -c $(CFLAGS) $(INCLUDE) $<
++	@${LIBTOOL} --mode=compile --tag=CC $(CC) -MM $(CFLAGS_PRE) $(INCLUDE) $< -o `basename $< .M`.d
++	@${LIBTOOL} --mode=compile --tag=CC $(CC) -c $(CFLAGS) $(INCLUDE) $<
+ else
+-	@$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
++	@${LIBTOOL} --mode=compile --tag=CC $(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
+ endif
+ 	@echo ' OK'
+ 
+ .m.o:
+ 	@echo -n 'Compiling $@ ...'
+ ifdef CFLAGS_NOARCH
+-	@$(CC) -MM $(CFLAGS_PRE) $(INCLUDE) $< -o `basename $< .m`.d
+-	@$(CC) -c $(CFLAGS) $(INCLUDE) $<
++	@${LIBTOOL} --mode=compile --tag=CC $(CC) -MM $(CFLAGS_PRE) $(INCLUDE) $< -o `basename $< .m`.d
++	@${LIBTOOL} --mode=compile --tag=CC $(CC) -c $(CFLAGS) $(INCLUDE) $<
+ else
+-	@$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
++	@${LIBTOOL} --mode=compile --tag=CC $(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
+ endif
+ 	@echo ' OK'
+ 
+ all: $(OBJECTS)
+ 
+ clean:
+-	@$(RM) *.o *.s *.ld *.d
++	@$(RM) *.lo *.s *.ld *.d
+ 
+ -include *.d
diff --git a/misc/fbreader/patches/patch-zlibrary_core_Makefile b/misc/fbreader/patches/patch-zlibrary_core_Makefile
new file mode 100644
index 00000000000..0d5fd1fdd7d
--- /dev/null
+++ b/misc/fbreader/patches/patch-zlibrary_core_Makefile
@@ -0,0 +1,35 @@
+$NetBSD: patch-zlibrary_core_Makefile,v 1.1 2013/06/27 14:21:09 ryoon Exp $
+
+* Libtoolized.
+
+--- zlibrary/core/Makefile.orig	2012-11-30 12:41:25.000000000 +0000
++++ zlibrary/core/Makefile
+@@ -11,7 +11,7 @@ ifeq "$(ZLSHARED)" "yes"
+     TARGET_SONAME = libzlcore.$(SOVERSION).dylib
+     TARGET_SHORTNAME = libzlcore.dylib
+   else
+-    TARGET = libzlcore.so.$(VERSION)
++    TARGET = libzlcore.la
+     TARGET_SONAME = libzlcore.so.$(SOVERSION)
+     TARGET_SHORTNAME = libzlcore.so
+   endif
+@@ -50,7 +50,7 @@ $(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)
++	@${LIBTOOL} --mode=link --tag=CXX $(LD) $(LDFLAGS) -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.lo, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) -rpath ${PREFIX}/lib
+ #@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) $(ZLUI_LIB) -ldl -liconv
+ 	@ln -sf $(TARGET) $(TARGET_SONAME)
+ 	@ln -sf $(TARGET) $(TARGET_SHORTNAME)
+@@ -83,9 +83,7 @@ do_install:
+ 	fi
+ ifeq "$(ZLSHARED)" "yes"
+ 	@install -d $(DESTDIR)$(LIBDIR)
+-	@install $(TARGET) $(DESTDIR)$(LIBDIR)
+-	@ln -sf $(TARGET) $(DESTDIR)$(LIBDIR)/$(TARGET_SONAME)
+-	@ln -sf $(TARGET) $(DESTDIR)$(LIBDIR)/$(TARGET_SHORTNAME)
++	@${LIBTOOL} --mode=install install $(TARGET) $(DESTDIR)$(LIBDIR)
+ endif
+ 
+ do_install_dev:
diff --git a/misc/fbreader/patches/patch-zlibrary_text_Makefile b/misc/fbreader/patches/patch-zlibrary_text_Makefile
index d137a443923..8a862737450 100644
--- a/misc/fbreader/patches/patch-zlibrary_text_Makefile
+++ b/misc/fbreader/patches/patch-zlibrary_text_Makefile
@@ -1,15 +1,36 @@
-$NetBSD: patch-zlibrary_text_Makefile,v 1.1 2012/10/01 12:40:36 ryoon Exp $
+$NetBSD: patch-zlibrary_text_Makefile,v 1.2 2013/06/27 14:21:09 ryoon Exp $
 
 * Use liblinebreak instead of libunibreak
+* Libtoolized.
 
---- zlibrary/text/Makefile.orig	2012-09-06 20:58:48.000000000 +0000
+--- zlibrary/text/Makefile.orig	2012-11-30 12:41:25.000000000 +0000
 +++ zlibrary/text/Makefile
+@@ -11,7 +11,7 @@ ifeq "$(ZLSHARED)" "yes"
+     TARGET_SONAME = libzltext.$(SOVERSION).dylib
+     TARGET_SHORTNAME = libzltext.dylib
+   else
+-    TARGET = libzltext.so.$(VERSION)
++    TARGET = libzltext.la
+     TARGET_SONAME = libzltext.so.$(SOVERSION)
+     TARGET_SHORTNAME = libzltext.so
+   endif
 @@ -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
++	@${LIBTOOL} --mode=link --tag=CXX $(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.lo, $(SUBDIRS)) $(CORE_LIBS) -llinebreak -lfribidi -rpath ${PREFIX}/lib
  #@$(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)
+@@ -50,9 +50,7 @@ do_install:
+ 	@install -m 0644 $(wildcard data/hyphenationPatterns.zip) $(SHARE_ZLIBRARY)
+ ifeq "$(ZLSHARED)" "yes"
+ 	@install -d $(DESTDIR)$(LIBDIR)
+-	@install $(TARGET) $(DESTDIR)$(LIBDIR)
+-	@ln -sf $(TARGET) $(DESTDIR)$(LIBDIR)/$(TARGET_SONAME)
+-	@ln -sf $(TARGET) $(DESTDIR)$(LIBDIR)/$(TARGET_SHORTNAME)
++	@${LIBTOOL} --mode=install install $(TARGET) $(DESTDIR)$(LIBDIR)
+ endif
+ 
+ do_install_dev:
diff --git a/misc/fbreader/patches/patch-zlibrary_ui_Makefile b/misc/fbreader/patches/patch-zlibrary_ui_Makefile
new file mode 100644
index 00000000000..f9cb5659b86
--- /dev/null
+++ b/misc/fbreader/patches/patch-zlibrary_ui_Makefile
@@ -0,0 +1,35 @@
+$NetBSD: patch-zlibrary_ui_Makefile,v 1.1 2013/06/27 14:21:09 ryoon Exp $
+
+* Libtoolized.
+
+--- zlibrary/ui/Makefile.orig	2012-11-30 12:41:25.000000000 +0000
++++ zlibrary/ui/Makefile
+@@ -11,7 +11,7 @@ ifeq "$(ZLSHARED)" "yes"
+     TARGET_SONAME = libzlui.$(SOVERSION).dylib
+     TARGET_SHORTNAME = libzlui.dylib
+   else
+-    TARGET = libzlui.so.$(VERSION)
++    TARGET = libzlui.la
+     TARGET_SONAME = libzlui.so.$(SOVERSION)
+     TARGET_SHORTNAME = libzlui.so
+   endif
+@@ -117,7 +117,7 @@ $(TARGET): .objects
+ 	@echo -n 'Creating $@ ...'
+ 	@$(RM_QUIET) $(TARGET)
+ ifeq "$(ZLSHARED)" "yes"
+-	@$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS) $(QTSUBDIRS) $(GTKSUBDIRS)) $(UILIBS) $(CORE_LIBS)
++	@${LIBTOOL} --mode=link --tag=CXX $(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.lo, $(SUBDIRS) $(QTSUBDIRS) $(GTKSUBDIRS)) $(UILIBS) $(CORE_LIBS) -rpath ${PREFIX}/lib
+ #@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS) $(QTSUBDIRS) $(GTKSUBDIRS)) $(UILIBS) $(CORE_LIBS)
+ 	@ln -sf $(TARGET) $(TARGET_SONAME)
+ 	@ln -sf $(TARGET) $(TARGET_SHORTNAME)
+@@ -143,9 +143,7 @@ do_install:
+ 	@install -m 0644 data/style.$(TARGET_ARCH).qss $(SHARE_ZLIBRARY)/style.qss
+ ifeq "$(ZLSHARED)" "yes"
+ 	@install -d $(DESTDIR)$(LIBDIR)
+-	@install $(TARGET) $(DESTDIR)$(LIBDIR)
+-	@ln -sf $(TARGET) $(DESTDIR)$(LIBDIR)/$(TARGET_SONAME)
+-	@ln -sf $(TARGET) $(DESTDIR)$(LIBDIR)/$(TARGET_SHORTNAME)
++	@${LIBTOOL} --mode=install install $(TARGET) $(DESTDIR)$(LIBDIR)
+ endif
+ 
+ do_install_dev: