From owner-svn-ports-all@freebsd.org Sat Mar 16 15:13:54 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F4ED15303C8; Sat, 16 Mar 2019 15:13:54 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A50BD8C4EE; Sat, 16 Mar 2019 15:13:53 +0000 (UTC) (envelope-from tcberner@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7EEE323C98; Sat, 16 Mar 2019 15:13:53 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2GFDrSb054045; Sat, 16 Mar 2019 15:13:53 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2GFDrpa054043; Sat, 16 Mar 2019 15:13:53 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201903161513.x2GFDrpa054043@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 16 Mar 2019 15:13:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495881 - head/deskutils/fbreader X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/deskutils/fbreader X-SVN-Commit-Revision: 495881 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A50BD8C4EE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.951,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Sat, 16 Mar 2019 15:13:54 -0000 Author: tcberner Date: Sat Mar 16 15:13:52 2019 New Revision: 495881 URL: https://svnweb.freebsd.org/changeset/ports/495881 Log: deskutils/fbreader: remove GTK2/QT4 options (Qt4 deprecation) Approved by: portmgr (implicit) Modified: head/deskutils/fbreader/Makefile head/deskutils/fbreader/pkg-plist Modified: head/deskutils/fbreader/Makefile ============================================================================== --- head/deskutils/fbreader/Makefile Sat Mar 16 15:11:54 2019 (r495880) +++ head/deskutils/fbreader/Makefile Sat Mar 16 15:13:52 2019 (r495881) @@ -4,7 +4,7 @@ PORTNAME= fbreader PORTVERSION= 0.99.6 DISTVERSIONSUFFIX= -freebsdport -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils MAINTAINER= johannes@perceivon.net @@ -27,35 +27,16 @@ STATUS= debug STATUS= release .endif -USES= compiler gmake iconv localbase pkgconfig sqlite +USES= compiler gmake gnome iconv localbase pkgconfig sqlite +USE_GNOME= gtk20 USE_LDCONFIG= yes INSTALL_TARGET= do_install MAKE_ENV+= TARGET_ARCH=desktop TARGET_STATUS=${STATUS} \ ROOTDIR=${WRKSRC} INSTALLDIR=${PREFIX} LIBDIR=${PREFIX}/lib \ - LD="${CXX}" + LD="${CXX}" UI_TYPE=gtk MAKE_ARGS+= MAKE=${MAKE_CMD} LIBDIR=${PREFIX}/lib - -OPTIONS_SINGLE= GUI -OPTIONS_SINGLE_GUI= GTK2 QT4 -OPTIONS_DEFAULT= GTK2 -OPTIONS_SUB= yes - -GTK2_USE= gnome=gtk20 -GTK2_MAKE_ENV= UI_TYPE=gtk - -QT4_USES= qt:4 -QT4_USE= qt=gui,corelib,imageformats,network,moc_build -QT4_LIBS= -L${QT_LIBDIR} -QT4_MAKE_ENV= UI_TYPE=qt4 - -.include - -.if ${PORT_OPTIONS:MQT4} -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 -.endif post-patch: @${REINPLACE_CMD} -e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},' \ Modified: head/deskutils/fbreader/pkg-plist ============================================================================== --- head/deskutils/fbreader/pkg-plist Sat Mar 16 15:11:54 2019 (r495880) +++ head/deskutils/fbreader/pkg-plist Sat Mar 16 15:13:52 2019 (r495881) @@ -98,8 +98,7 @@ share/pixmaps/FBReader/unknown.png share/pixmaps/FBReader/upfolder.png share/pixmaps/FBReader/weasel.png share/pixmaps/FBReader/zipfolder.png -%%GTK2%%lib/zlibrary/ui/zlui-gtk.so -%%QT4%%lib/zlibrary/ui/zlui-qt4.so +lib/zlibrary/ui/zlui-gtk.so share/zlibrary/default/config.xml share/zlibrary/encodings/Big5 share/zlibrary/encodings/Encodings.xml @@ -124,8 +123,7 @@ share/zlibrary/encodings/KOI8-R share/zlibrary/encodings/windows-1251 share/zlibrary/encodings/windows-1252 share/zlibrary/hyphenationPatterns.zip -%%GTK2%%share/zlibrary/keynames-gtk.xml -%%QT4%%share/zlibrary/keynames-qt4.xml +share/zlibrary/keynames-gtk.xml share/zlibrary/languagePatterns.zip share/zlibrary/resources/ar.xml share/zlibrary/resources/bg.xml