Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Sep 2016 13:23:04 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r421501 - branches/2016Q3/deskutils/fbreader
Message-ID:  <201609071323.u87DN4NL098356@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609071323.u87DN4NL098356>