Import of pkgsrc-2013Q2

misc/fbreader/DESCR

@@ -0,0 +1,24 @@
+FBReader is an e-book reader for various platforms.
+
+Main features:
+  * Supported formats are
+       * fb2 e-book format (style attributes are not supported yet).
+       * HTML format (tables are not supported).
+       * CHM format (tables are not supported).
+       * plucker format (tables are not supported).
+       * Palmdoc (aportis doc).
+       * zTxt (Weasel format).
+       * TCR (psion text) format.
+       * RTF format (stylesheets and tables are not supported).
+       * OEB format (css and tables are not supported).
+       * OpenReader format (css and tables are not supported).
+       * Non-DRM'ed mobipocket format (tables are not supported).
+       * Plain text format.
+  * Direct reading from tar, zip, gzip and bzip2 archives. (Multiple books
+    in one archive are supported.)
+  * Automatic library building.
+  * Automatic language and character encoding detection is supported.
+  * Automatically generated contents table.
+  * Embedded images support.
+  * Footnotes/hyperlinks support.
+...and more!

misc/fbreader/Makefile

@@ -0,0 +1,50 @@
+# $NetBSD: Makefile,v 1.34 2013/06/27 14:21:09 ryoon Exp $
+#
+
+DISTNAME=	fbreader-sources-0.99.4
+PKGNAME=	${DISTNAME:S/-sources//}
+CATEGORIES=	misc
+MASTER_SITES=	http://www.fbreader.org/files/desktop/
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.fbreader.org/
+COMMENT=	Ebook reader software
+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+=	TARGET_ARCH=desktop
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "NetBSD"
+CPPFLAGS+=	-DDO_ICONV_CAST
+.endif
+
+.include "options.mk"
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../converters/fribidi/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.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"

misc/fbreader/PLIST

@@ -0,0 +1,154 @@
+@comment $NetBSD: PLIST,v 1.5 2013/06/27 14:21:09 ryoon Exp $
+bin/FBReader
+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
+share/FBReader/default/keymap.xml
+share/FBReader/default/styles.xml
+share/FBReader/default/toolbar.xml
+share/FBReader/formats/fb2/FBReaderVersion.ent
+share/FBReader/formats/fb2/fb2genres.xml
+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/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/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
+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
+share/pixmaps/FBReader/oeb.png
+share/pixmaps/FBReader/openreader.png
+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
+share/pixmaps/FBReader/unknown.png
+share/pixmaps/FBReader/upfolder.png
+share/pixmaps/FBReader/weasel.png
+share/pixmaps/FBReader/zipfolder.png
+share/zlibrary/default/config.xml
+share/zlibrary/encodings/Big5
+share/zlibrary/encodings/Encodings.xml
+share/zlibrary/encodings/GBK
+share/zlibrary/encodings/IBM866
+share/zlibrary/encodings/ISO-8859-1
+share/zlibrary/encodings/ISO-8859-10
+share/zlibrary/encodings/ISO-8859-11
+share/zlibrary/encodings/ISO-8859-13
+share/zlibrary/encodings/ISO-8859-14
+share/zlibrary/encodings/ISO-8859-15
+share/zlibrary/encodings/ISO-8859-16
+share/zlibrary/encodings/ISO-8859-2
+share/zlibrary/encodings/ISO-8859-3
+share/zlibrary/encodings/ISO-8859-4
+share/zlibrary/encodings/ISO-8859-5
+share/zlibrary/encodings/ISO-8859-6
+share/zlibrary/encodings/ISO-8859-7
+share/zlibrary/encodings/ISO-8859-8
+share/zlibrary/encodings/ISO-8859-9
+share/zlibrary/encodings/KOI8-R
+share/zlibrary/encodings/windows-1251
+share/zlibrary/encodings/windows-1252
+share/zlibrary/hyphenationPatterns.zip
+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/style.qss
+share/zlibrary/unicode.xml.gz

misc/fbreader/distinfo

@@ -0,0 +1,18 @@
+$NetBSD: distinfo,v 1.8 2013/06/27 14:21:09 ryoon Exp $
+
+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) = 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-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

misc/fbreader/options.mk

@@ -0,0 +1,31 @@
+# $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 # qt3 is untested
+PKG_SUPPORTED_OPTIONS=	debug
+PKG_SUGGESTED_OPTIONS=	qt4
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdebug)
+MAKE_ENV+=	TARGET_STATUS=debug
+.else
+MAKE_ENV+=	TARGET_STATUS=release
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk2)
+.include "../../x11/gtk2/buildlink3.mk"
+MAKE_ENV+=	UI_TYPE=gtk
+USE_TOOLS+=	pkg-config
+.endif
+
+.if !empty(PKG_OPTIONS:Mqt3)
+.include "../../x11/qt3-libs/buildlink3.mk"
+MAKE_ENV+=	UI_TYPE=qt
+.endif
+
+.if !empty(PKG_OPTIONS:Mqt4)
+.include "../../x11/qt4-libs/buildlink3.mk"
+MAKE_ENV+=	UI_TYPE=qt4
+.endif

misc/fbreader/patches/patch-ab

@@ -0,0 +1,27 @@
+$NetBSD: patch-ab,v 1.3 2012/10/01 12:47:30 wiz Exp $
+
+Avoid ancient function that needs libcompat.
+
+--- zlibrary/core/src/unix/time/ZLUnixTime.cpp.orig	2012-09-06 20:58:48.000000000 +0000
++++ zlibrary/core/src/unix/time/ZLUnixTime.cpp
+@@ -17,7 +17,6 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <sys/timeb.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((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 {

misc/fbreader/patches/patch-ah

@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.3 2012/10/01 12:40:36 ryoon Exp $
+
+* Use liblinebreak instead of libunibreak
+
+--- makefiles/config.mk.orig	2012-09-06 20:58:48.000000000 +0000
++++ makefiles/config.mk
+@@ -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 -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"

misc/fbreader/patches/patch-ai

@@ -0,0 +1,16 @@
+$NetBSD: patch-ai,v 1.4 2013/06/27 14:21:09 ryoon Exp $
+
+* Pass DO_ICONV_CAST
+
+--- 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
+ LD = g++
+ 
+-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"

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

misc/fbreader/patches/patch-fbreader_src_fbreader_FBReaderActions.cpp

@@ -0,0 +1,12 @@
+$NetBSD: patch-fbreader_src_fbreader_FBReaderActions.cpp,v 1.1 2013/05/06 15:04:55 joerg Exp $
+
+--- fbreader/src/fbreader/FBReaderActions.cpp.orig	2013-05-04 15:09:20.000000000 +0000
++++ fbreader/src/fbreader/FBReaderActions.cpp
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include <algorithm>
++#include <cstdlib>
+ 
+ #include <ZLStringUtil.h>
+ #include <ZLDialogManager.h>

misc/fbreader/patches/patch-fbreader_src_fbreader_FBView.cpp

@@ -0,0 +1,12 @@
+$NetBSD: patch-fbreader_src_fbreader_FBView.cpp,v 1.1 2013/05/06 15:04:55 joerg Exp $
+
+--- fbreader/src/fbreader/FBView.cpp.orig	2013-05-04 15:09:39.000000000 +0000
++++ fbreader/src/fbreader/FBView.cpp
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include <cmath>
++#include <cstdlib>
+ #include <algorithm>
+ 
+ #include <ZLUnicodeUtil.h>

misc/fbreader/patches/patch-fbreader_src_formats_html_HtmlReader.cpp

@@ -0,0 +1,12 @@
+$NetBSD: patch-fbreader_src_formats_html_HtmlReader.cpp,v 1.1 2013/05/06 15:04:55 joerg Exp $
+
+--- fbreader/src/formats/html/HtmlReader.cpp.orig	2013-05-04 15:08:25.000000000 +0000
++++ fbreader/src/formats/html/HtmlReader.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include <algorithm>
+ #include <cctype>
++#include <cstdlib>
+ 
+ #include <ZLInputStream.h>
+ #include <ZLXMLReader.h>

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

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

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:

misc/fbreader/patches/patch-zlibrary_text_Makefile

@@ -0,0 +1,36 @@
+$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-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
++	@${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:

misc/fbreader/patches/patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp

@@ -0,0 +1,12 @@
+$NetBSD: patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp,v 1.1 2013/05/06 15:04:55 joerg Exp $
+
+--- zlibrary/text/src/area/ZLTextAreaStyle.cpp.orig	2013-05-04 15:07:13.000000000 +0000
++++ zlibrary/text/src/area/ZLTextAreaStyle.cpp
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include <algorithm>
++#include <cstdlib>
+ 
+ #include <ZLUnicodeUtil.h>
+ #include <ZLPaintContext.h>

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: