3 files changed, 21 insertions, 9 deletions

diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile
index 4cda7b1f4a66..423900e830d9 100644
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fbreader
 DISTVERSIONPREFIX=	sources-
-DISTVERSION=	0.8.7
+DISTVERSION=	0.8.8
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.fbreader.org/ CENKES
 EXTRACT_SUFX=	.tgz
@@ -15,27 +15,35 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Powerful e-book reader
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
-		enca.5:${PORTSDIR}/converters/enca
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_LDCONFIG=	yes
+.ifdef WITHOUT_QT
+UI=	gtk
+USE_GNOME=	gtk20
+.else
+UI=	qt4
 USE_QT_VER=	4
 QT_COMPONENTS=	gui corelib moc
+.endif
 USE_GMAKE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lcompat
-MAKE_ENV+=	TARGET_ARCH=desktop UI_TYPE=qt4 TARGET_STATUS=release \
+MAKE_ENV+=	TARGET_ARCH=desktop UI_TYPE=${UI} TARGET_STATUS=release \
 		ROOTDIR=${WRKSRC} EXTERNALINCLUDE="-I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS}" INSTALLDIR="${PREFIX}" LIBDIR=${PREFIX}/lib \
 		BUILD_SHARED_LIBRARY=yes LD="${CXX}"
 MAKE_ARGS+=	MAKE=gmake LIBDIR=${PREFIX}/lib
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 INSTALL_TARGET=	do_install
+PLIST_SUB=	UI=${UI}
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^LDFLAGS/s|=|+=|' ${WRKSRC}/makefiles/arch/*mk
 	@${REINPLACE_CMD} -e 's|-ldl||;/CORE_LIBS/s|$$| -liconv|'\
 		${WRKSRC}/makefiles/config.mk ${WRKSRC}/zlibrary/core/Makefile
+	@${REINPLACE_CMD} -e 's|libpng |libpng12 |'\
+		${WRKSRC}/makefiles/arch/desktop.mk
 	@${REINPLACE_CMD} -e '/TARGET =/s|\.so\..*|.so.0|;s|$$[(]LIBDIR[)]|${PREFIX}/lib|'\
 		${WRKSRC}/zlibrary/[ct]*/Makefile
 	@${FIND} ${WRKSRC} -name Makefile -or -name \*.mk -or -name rules|\
diff --git a/deskutils/fbreader/distinfo b/deskutils/fbreader/distinfo
index adb60b690dfb..cbc8d06994ae 100644
--- a/deskutils/fbreader/distinfo
+++ b/deskutils/fbreader/distinfo
@@ -1,3 +1,3 @@
-MD5 (fbreader-sources-0.8.7.tgz) = 35094324cfc869d4dcedc430bc9637cc
-SHA256 (fbreader-sources-0.8.7.tgz) = 4b55e274a9b42552f5394387558a9248a0df2e02118d300d9cfee909f7a3458b
-SIZE (fbreader-sources-0.8.7.tgz) = 905243
+MD5 (fbreader-sources-0.8.8.tgz) = 9cecbce9990c71a8c3c331c27eaa4f79
+SHA256 (fbreader-sources-0.8.8.tgz) = c0852cf64a82d0ffecc0d1d67f36140b0ce45bf92e156836a2aa7d4ebf16dc69
+SIZE (fbreader-sources-0.8.8.tgz) = 1164080
diff --git a/deskutils/fbreader/pkg-plist b/deskutils/fbreader/pkg-plist
index 5558bc336ee5..9368f714e407 100644
--- a/deskutils/fbreader/pkg-plist
+++ b/deskutils/fbreader/pkg-plist
@@ -1,7 +1,7 @@
 bin/FBReader
 lib/libzlcore.so.0
 lib/libzltext.so.0
-lib/zlibrary/ui/zlui-qt4.so
+lib/zlibrary/ui/zlui-%%UI%%.so
 share/FBReader/default/config.xml
 share/FBReader/default/external.xml
 share/FBReader/default/keymap.xml
@@ -11,10 +11,12 @@ 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.en.fb2
+share/FBReader/help/MiniHelp.fi.fb2
 share/FBReader/help/MiniHelp.fr.fb2
 share/FBReader/help/MiniHelp.ru.fb2
 share/FBReader/help/MiniHelp.uk.fb2
 share/FBReader/resources/en.xml
+share/FBReader/resources/fi.xml
 share/FBReader/resources/fr.xml
 share/FBReader/resources/ru.xml
 share/FBReader/resources/uk.xml
@@ -74,8 +76,10 @@ 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/keynames-%%UI%%.xml
+share/zlibrary/languagePatterns.zip
 share/zlibrary/resources/en.xml
+share/zlibrary/resources/fi.xml
 share/zlibrary/resources/fr.xml
 share/zlibrary/resources/ru.xml
 share/zlibrary/resources/uk.xml