From owner-svn-ports-all@freebsd.org Fri Sep 25 15:17:39 2015 Return-Path: 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 B8E5CA09268; Fri, 25 Sep 2015 15:17:39 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 A91621922; Fri, 25 Sep 2015 15:17:39 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8PFHd6a092377; Fri, 25 Sep 2015 15:17:39 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8PFHc0X092366; Fri, 25 Sep 2015 15:17:38 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201509251517.t8PFHc0X092366@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 25 Sep 2015 15:17:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397828 - in head/deskutils/fbreader: . files X-SVN-Group: ports-head 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.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Sep 2015 15:17:39 -0000 Author: amdmi3 Date: Fri Sep 25 15:17:37 2015 New Revision: 397828 URL: https://svnweb.freebsd.org/changeset/ports/397828 Log: - Add LICENSE - Pet portlint - Regenerate patches with `make makepatch` Modified: head/deskutils/fbreader/Makefile head/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBReaderActions.cpp head/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBView.cpp head/deskutils/fbreader/files/patch-fbreader__src__formats__html__HtmlReader.cpp head/deskutils/fbreader/files/patch-zlibrary__src__text__ZLTextAreaStyle.cpp head/deskutils/fbreader/files/patch-zlibrary__src__unix__time__ZLUnixTime.cpp Modified: head/deskutils/fbreader/Makefile ============================================================================== --- head/deskutils/fbreader/Makefile Fri Sep 25 15:17:31 2015 (r397827) +++ head/deskutils/fbreader/Makefile Fri Sep 25 15:17:37 2015 (r397828) @@ -10,39 +10,27 @@ CATEGORIES= deskutils MAINTAINER= ports@FreeBSD.org COMMENT= Powerful e-book reader +LICENSE= GPLv2 # or later + LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ libexpat.so:${PORTSDIR}/textproc/expat2 \ libfribidi.so:${PORTSDIR}/converters/fribidi \ libunibreak.so:${PORTSDIR}/textproc/libunibreak -OPTIONS_SINGLE= GUI -OPTIONS_SINGLE_GUI= GTK2 QT4 -OPTIONS_DEFAULT= QT4 -OPTIONS_SUB= yes - - USE_GITHUB= yes GH_ACCOUNT= geometer GH_PROJECT= FBReader - .if defined(WITH_DEBUG) STATUS= debug .else STATUS= release .endif -USES= compiler iconv gmake pkgconfig tar:tgz +USES= compiler gmake iconv pkgconfig tar:tgz USE_LDCONFIG= yes USE_SQLITE= yes -GTK2_USE= gnome=gtk20 -GTK2_MAKE_ENV= UI_TYPE=gtk - -QT4_USE= qt4=gui,corelib,imageformats,network,moc_build -QT4_LDFLAGS= -L${QT_LIBDIR} -QT4_MAKE_ENV= UI_TYPE=qt4 - INSTALL_TARGET= do_install CFLAGS+= -I${LOCALBASE}/include @@ -52,6 +40,18 @@ MAKE_ENV+= TARGET_ARCH=desktop TARGET_ST LD="${CXX}" MAKE_ARGS+= MAKE=${MAKE_CMD} LIBDIR=${PREFIX}/lib +OPTIONS_SINGLE= GUI +OPTIONS_SINGLE_GUI= GTK2 QT4 +OPTIONS_DEFAULT= QT4 +OPTIONS_SUB= yes + +GTK2_USE= gnome=gtk20 +GTK2_MAKE_ENV= UI_TYPE=gtk + +QT4_USE= qt4=gui,corelib,imageformats,network,moc_build +QT4_LDFLAGS= -L${QT_LIBDIR} +QT4_MAKE_ENV= UI_TYPE=qt4 + post-patch: @${REINPLACE_CMD} -e '/^CFLAGS/s,-pipe.*$$,${CFLAGS} -DLIBICONV_PLUG,' \ -e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},' \ Modified: head/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBReaderActions.cpp ============================================================================== --- head/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBReaderActions.cpp Fri Sep 25 15:17:31 2015 (r397827) +++ head/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBReaderActions.cpp Fri Sep 25 15:17:37 2015 (r397828) @@ -1,5 +1,5 @@ ---- ./fbreader/src/fbreader/FBReaderActions.cpp.orig 2010-04-02 00:14:24.000000000 +1100 -+++ ./fbreader/src/fbreader/FBReaderActions.cpp 2013-09-12 00:34:03.722065220 +1100 +--- fbreader/src/fbreader/FBReaderActions.cpp.orig 2014-01-11 12:45:25 UTC ++++ fbreader/src/fbreader/FBReaderActions.cpp @@ -18,6 +18,7 @@ */ Modified: head/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBView.cpp ============================================================================== --- head/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBView.cpp Fri Sep 25 15:17:31 2015 (r397827) +++ head/deskutils/fbreader/files/patch-fbreader__src__fbreader__FBView.cpp Fri Sep 25 15:17:37 2015 (r397828) @@ -1,5 +1,5 @@ ---- ./fbreader/src/fbreader/FBView.cpp.orig 2010-04-02 00:14:24.000000000 +1100 -+++ ./fbreader/src/fbreader/FBView.cpp 2013-09-12 00:33:47.204357243 +1100 +--- fbreader/src/fbreader/FBView.cpp.orig 2014-01-11 12:45:25 UTC ++++ fbreader/src/fbreader/FBView.cpp @@ -18,6 +18,7 @@ */ Modified: head/deskutils/fbreader/files/patch-fbreader__src__formats__html__HtmlReader.cpp ============================================================================== --- head/deskutils/fbreader/files/patch-fbreader__src__formats__html__HtmlReader.cpp Fri Sep 25 15:17:31 2015 (r397827) +++ head/deskutils/fbreader/files/patch-fbreader__src__formats__html__HtmlReader.cpp Fri Sep 25 15:17:37 2015 (r397828) @@ -1,5 +1,5 @@ ---- ./fbreader/src/formats/html/HtmlReader.cpp.orig 2010-04-02 00:14:24.000000000 +1100 -+++ ./fbreader/src/formats/html/HtmlReader.cpp 2013-09-12 00:31:39.434367202 +1100 +--- fbreader/src/formats/html/HtmlReader.cpp.orig 2014-01-11 12:45:25 UTC ++++ fbreader/src/formats/html/HtmlReader.cpp @@ -19,6 +19,7 @@ #include Modified: head/deskutils/fbreader/files/patch-zlibrary__src__text__ZLTextAreaStyle.cpp ============================================================================== --- head/deskutils/fbreader/files/patch-zlibrary__src__text__ZLTextAreaStyle.cpp Fri Sep 25 15:17:31 2015 (r397827) +++ head/deskutils/fbreader/files/patch-zlibrary__src__text__ZLTextAreaStyle.cpp Fri Sep 25 15:17:37 2015 (r397828) @@ -1,5 +1,5 @@ ---- ./zlibrary/text/src/area/ZLTextAreaStyle.cpp.orig 2010-04-02 00:14:24.000000000 +1100 -+++ ./zlibrary/text/src/area/ZLTextAreaStyle.cpp 2013-09-12 00:26:19.181817507 +1100 +--- zlibrary/text/src/area/ZLTextAreaStyle.cpp.orig 2014-01-11 12:45:25 UTC ++++ zlibrary/text/src/area/ZLTextAreaStyle.cpp @@ -18,6 +18,7 @@ */ Modified: head/deskutils/fbreader/files/patch-zlibrary__src__unix__time__ZLUnixTime.cpp ============================================================================== --- head/deskutils/fbreader/files/patch-zlibrary__src__unix__time__ZLUnixTime.cpp Fri Sep 25 15:17:31 2015 (r397827) +++ head/deskutils/fbreader/files/patch-zlibrary__src__unix__time__ZLUnixTime.cpp Fri Sep 25 15:17:37 2015 (r397828) @@ -1,5 +1,5 @@ ---- ./zlibrary/core/src/unix/time/ZLUnixTime.cpp.orig 2010-01-30 04:35:22.000000000 +1000 -+++ ./zlibrary/core/src/unix/time/ZLUnixTime.cpp 2010-02-02 01:23:23.000000000 +1000 +--- zlibrary/core/src/unix/time/ZLUnixTime.cpp.orig 2014-01-11 12:45:25 UTC ++++ zlibrary/core/src/unix/time/ZLUnixTime.cpp @@ -17,17 +17,16 @@ * 02110-1301, USA. */