From owner-svn-ports-all@freebsd.org  Wed Sep  7 13:23:05 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8C2C5BC6DAA;
 Wed,  7 Sep 2016 13:23:05 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4218ABB7;
 Wed,  7 Sep 2016 13:23:05 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u87DN4Yf098358;
 Wed, 7 Sep 2016 13:23:04 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u87DN4NL098356;
 Wed, 7 Sep 2016 13:23:04 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201609071323.u87DN4NL098356@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 7 Sep 2016 13:23:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r421501 - branches/2016Q3/deskutils/fbreader
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Sep 2016 13:23:05 -0000

Author: amdmi3
Date: Wed Sep  7 13:23:04 2016
New Revision: 421501
URL: https://svnweb.freebsd.org/changeset/ports/421501

Log:
  MFH: r421500
  
  - Fix plist for GTK2 mode
  - Switch to USES=localbase
  
  PR:		212382
  Submitted by:	maciej@pasternacki.net
  Approved by:	just fix it blanket
  Approved by:	ports-secteam blanket

Modified:
  branches/2016Q3/deskutils/fbreader/Makefile
  branches/2016Q3/deskutils/fbreader/pkg-plist
Directory Properties:
  branches/2016Q3/   (props changed)

Modified: branches/2016Q3/deskutils/fbreader/Makefile
==============================================================================
--- branches/2016Q3/deskutils/fbreader/Makefile	Wed Sep  7 13:21:48 2016	(r421500)
+++ branches/2016Q3/deskutils/fbreader/Makefile	Wed Sep  7 13:23:04 2016	(r421501)
@@ -27,13 +27,11 @@ STATUS=		debug
 STATUS=		release
 .endif
 
-USES=		compiler gmake iconv pkgconfig sqlite tar:tgz
+USES=		compiler gmake iconv localbase pkgconfig sqlite tar:tgz
 USE_LDCONFIG=	yes
 
 INSTALL_TARGET=	do_install
 
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	TARGET_ARCH=desktop TARGET_STATUS=${STATUS} \
 		ROOTDIR=${WRKSRC} INSTALLDIR=${PREFIX} LIBDIR=${PREFIX}/lib \
 		LD="${CXX}"

Modified: branches/2016Q3/deskutils/fbreader/pkg-plist
==============================================================================
--- branches/2016Q3/deskutils/fbreader/pkg-plist	Wed Sep  7 13:21:48 2016	(r421500)
+++ branches/2016Q3/deskutils/fbreader/pkg-plist	Wed Sep  7 13:23:04 2016	(r421501)
@@ -124,7 +124,8 @@ share/zlibrary/encodings/KOI8-R
 share/zlibrary/encodings/windows-1251
 share/zlibrary/encodings/windows-1252
 share/zlibrary/hyphenationPatterns.zip
-share/zlibrary/keynames-qt4.xml
+%%GTK2%%share/zlibrary/keynames-gtk.xml
+%%QT4%%share/zlibrary/keynames-qt4.xml
 share/zlibrary/languagePatterns.zip
 share/zlibrary/resources/ar.xml
 share/zlibrary/resources/bg.xml