svn commit: r495921 - head/graphics/zbar

[Tobias C. Berner]

Author: tcberner
Date: Sat Mar 16 17:48:14 2019
New Revision: 495921
URL: https://svnweb.freebsd.org/changeset/ports/495921

Log:
  graphics/zbar: remove QT4 option (Qt4 deprecation)
  
  Approved by:	portmgr (implicit)

Modified:
  head/graphics/zbar/Makefile
  head/graphics/zbar/pkg-plist

Modified: head/graphics/zbar/Makefile
==============================================================================
--- head/graphics/zbar/Makefile	Sat Mar 16 17:47:30 2019	(r495920)
+++ head/graphics/zbar/Makefile	Sat Mar 16 17:48:14 2019	(r495921)
@@ -3,7 +3,7 @@
 
 PORTNAME=	zbar
 PORTVERSION=	0.10
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -17,9 +17,9 @@ USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-CONFIGURE_ARGS=	--with-jpeg=yes
+CONFIGURE_ARGS=	--with-jpeg=yes --with-qt=no
 
-OPTIONS_DEFINE=	X11 V4L PYTHON GTK2 QT4 DOCS
+OPTIONS_DEFINE=	X11 V4L PYTHON GTK2 DOCS
 OPTIONS_DEFAULT=X11 V7
 OPTIONS_RADIO=	IMAGEMAGICK
 OPTIONS_RADIO_IMAGEMAGICK=	V6 V7
@@ -58,19 +58,8 @@ GTK2_USE=	GNOME=gtk20
 GTK2_CONFIGURE_ON=	--with-gtk=yes
 GTK2_CONFIGURE_OFF=	--with-gtk=no
 
-QT4_USES=	qt:4
-QT4_USE=	QT=gui,moc_build
-QT4_CONFIGURE_ON=	--with-qt=yes
-QT4_CONFIGURE_OFF=	--with-qt=no
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-
-.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-DOCS-off:
 	@${REINPLACE_CMD} '/^install-data-am: /s/install-dist_docDATA//' \

Modified: head/graphics/zbar/pkg-plist
==============================================================================
--- head/graphics/zbar/pkg-plist	Sat Mar 16 17:47:30 2019	(r495920)
+++ head/graphics/zbar/pkg-plist	Sat Mar 16 17:48:14 2019	(r495921)
@@ -7,8 +7,6 @@ include/zbar/Exception.h
 include/zbar/Image.h
 include/zbar/ImageScanner.h
 include/zbar/Processor.h
-%%QT4%%include/zbar/QZBar.h
-%%QT4%%include/zbar/QZBarImage.h
 include/zbar/Scanner.h
 include/zbar/Symbol.h
 include/zbar/Video.h
@@ -22,12 +20,7 @@ lib/libzbar.so.0.2.0
 %%GTK2%%lib/libzbargtk.so
 %%GTK2%%lib/libzbargtk.so.0
 %%GTK2%%lib/libzbargtk.so.0.0.2
-%%QT4%%lib/libzbarqt.a
-%%QT4%%lib/libzbarqt.so
-%%QT4%%lib/libzbarqt.so.0
-%%QT4%%lib/libzbarqt.so.0.0.2
 %%GTK2%%libdata/pkgconfig/zbar-gtk.pc
-%%QT4%%libdata/pkgconfig/zbar-qt.pc
 libdata/pkgconfig/zbar.pc
 %%V4L%%man/man1/zbarcam.1.gz
 %%V6%%man/man1/zbarimg.1.gz