svn commit: r566155 - head/graphics/zbar

[Tobias C. Berner]

Author: tcberner
Date: Sat Feb 20 12:11:15 2021
New Revision: 566155
URL: https://svnweb.freebsd.org/changeset/ports/566155

Log:
  graphics/zbar: use IMAGEMAGICK_DEFAULT
  
  - switch to USES=localbase
  
  PR:		253444
  Submitted by:	VVD <vvd at unislabs.com>
  Approved by:	Oliver Heesakker s<dev2 at heesakkers.info> (maintainer)

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

Modified: head/graphics/zbar/Makefile
==============================================================================
--- head/graphics/zbar/Makefile	Sat Feb 20 10:48:02 2021	(r566154)
+++ head/graphics/zbar/Makefile	Sat Feb 20 12:11:15 2021	(r566155)
@@ -3,7 +3,7 @@
 
 PORTNAME=	zbar
 PORTVERSION=	0.10
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -12,17 +12,15 @@ COMMENT=	ZBar barcode reader
 
 LICENSE=	LGPL21
 
-USES=		iconv jpeg libtool gmake pathfix pkgconfig
+USES=		iconv jpeg libtool localbase:ldflags gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--with-jpeg=yes --with-python=no --with-qt=no
 
-OPTIONS_DEFINE=	X11 V4L GTK2 DOCS
-OPTIONS_DEFAULT=X11 V7
-OPTIONS_RADIO=	IMAGEMAGICK
-OPTIONS_RADIO_IMAGEMAGICK=	V6 V7
+OPTIONS_DEFINE=	DOCS GTK2 IMAGEMAGICK V4L X11
+OPTIONS_DEFAULT=IMAGEMAGICK X11
 OPTIONS_SUB=	yes
 V4L_DESC=	Build zbarcam video scanner
 
@@ -31,18 +29,10 @@ X11_USE=	XORG=ice,sm,x11,xau,xcb,xdmcp,xext,xv
 X11_CONFIGURE_ON=	--with-x=yes
 X11_CONFIGURE_OFF=	--with-x=no --without-xshm --without-xv
 
-V6_DESC=	With ImageMagick6
-V6_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick6
-V6_CONFIGURE_ON=	--with-imagemagick=yes
+IMAGEMAGICK_LIB_DEPENDS=	libMagick++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
+IMAGEMAGICK_CONFIGURE_ON=	--with-imagemagick=yes
+IMAGEMAGICK_CONFIGURE_OFF=	--with-imagemagick=no
 
-V7_DESC=	With ImageMagick7
-V7_LIB_DEPENDS=	libMagick++-7.so:graphics/ImageMagick7
-V7_CONFIGURE_ON=	--with-imagemagick=yes
-
-.if empty(VARIABLE:MV6) && empty(VARIABLE:MV7)
-CONFIGURE_ARGS+=	--with-imagemagick=no
-.endif
-
 # To avoid patching configure even more:
 CONFIGURE_ENV+=			ac_cv_header_wand_MagickWand_h=yes
 
@@ -54,9 +44,6 @@ GTK2_USES=	gnome
 GTK2_USE=	GNOME=gtk20
 GTK2_CONFIGURE_ON=	--with-gtk=yes
 GTK2_CONFIGURE_OFF=	--with-gtk=no
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 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 Feb 20 10:48:02 2021	(r566154)
+++ head/graphics/zbar/pkg-plist	Sat Feb 20 12:11:15 2021	(r566155)
@@ -1,6 +1,5 @@
 %%V4L%%bin/zbarcam
-%%V6%%bin/zbarimg
-%%V7%%bin/zbarimg
+%%IMAGEMAGICK%%bin/zbarimg
 include/zbar.h
 include/zbar/Decoder.h
 include/zbar/Exception.h
@@ -23,8 +22,7 @@ lib/libzbar.so.0.2.0
 %%GTK2%%libdata/pkgconfig/zbar-gtk.pc
 libdata/pkgconfig/zbar.pc
 %%V4L%%man/man1/zbarcam.1.gz
-%%V6%%man/man1/zbarimg.1.gz
-%%V7%%man/man1/zbarimg.1.gz
+%%IMAGEMAGICK%%man/man1/zbarimg.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/HACKING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS