Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Mar 2019 15:13:53 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r495881 - head/deskutils/fbreader
Message-ID:  <201903161513.x2GFDrpa054043@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
-
-.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



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