Index: head/graphics/zbar/Makefile =================================================================== --- head/graphics/zbar/Makefile (revision 491339) +++ head/graphics/zbar/Makefile (revision 491340) @@ -1,73 +1,83 @@ # Created by: Oliver Heesakkers # $FreeBSD$ PORTNAME= zbar PORTVERSION= 0.10 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= graphics MASTER_SITES= SF MAINTAINER= dev2@heesakkers.info COMMENT= ZBar barcode reader LICENSE= LGPL21 -GNU_CONFIGURE= yes -USE_LDCONFIG= yes USES= iconv jpeg libtool gmake pathfix pkgconfig -INSTALL_TARGET= install-strip +USE_LDCONFIG= yes +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip CONFIGURE_ARGS= --with-jpeg=yes -OPTIONS_DEFINE= X11 IMAGEMAGICK V4L PYTHON GTK2 QT4 DOCS -OPTIONS_DEFAULT=X11 IMAGEMAGICK +OPTIONS_DEFINE= X11 V4L PYTHON GTK2 QT4 DOCS +OPTIONS_DEFAULT=X11 V7 +OPTIONS_RADIO= IMAGEMAGICK +OPTIONS_RADIO_IMAGEMAGICK= V6 V7 OPTIONS_SUB= yes V4L_DESC= Build zbarcam video scanner 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 -IMAGEMAGICK_LIB_DEPENDS= libMagick++-7.so:graphics/ImageMagick7 -IMAGEMAGICK_CONFIGURE_ON= --with-imagemagick=yes -IMAGEMAGICK_CONFIGURE_OFF= --with-imagemagick=no +V6_DESC= With ImageMagick6 +V6_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 +V6_CONFIGURE_ON= --with-imagemagick=yes + +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 V4L_BUILD_DEPENDS= v4l_compat>=1.0.20101027:multimedia/v4l_compat V4L_CONFIGURE_ON= --enable-video=yes V4L_CONFIGURE_OFF= --enable-video=no PYTHON_USE= GNOME=pygtk2 PYTHON_USES= python:2.7 PYTHON_CONFIGURE_ON= --with-python=yes PYTHON_CONFIGURE_OFF= --with-python=no 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 .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//' \ ${WRKSRC}/Makefile.in post-install: # make check-plist happy ${RMDIR} ${STAGEDIR}${DATADIR} .include Index: head/graphics/zbar/files/patch-zbarimg.c =================================================================== --- head/graphics/zbar/files/patch-zbarimg.c (revision 491339) +++ head/graphics/zbar/files/patch-zbarimg.c (nonexistent) @@ -1,12 +0,0 @@ ---- zbarimg/zbarimg.c 2009-10-23 14:16:44.000000000 -0400 -+++ zbarimg/zbarimg.c 2017-08-10 10:22:08.707599000 -0400 -@@ -39,5 +39,9 @@ - - #include -+#if MAGICK_MAJOR < 7 - #include -+#else -+#include -+#endif - - /* in 6.4.5.4 MagickGetImagePixels changed to MagickExportImagePixels. Property changes on: head/graphics/zbar/files/patch-zbarimg.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/zbar/files/patch-Makefile.in =================================================================== --- head/graphics/zbar/files/patch-Makefile.in (revision 491339) +++ head/graphics/zbar/files/patch-Makefile.in (revision 491340) @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2010-12-09 17:52:23.862954369 +0000 -+++ Makefile.in 2010-12-09 17:53:00.865045766 +0000 -@@ -697,7 +697,7 @@ +--- Makefile.in.orig 2019-01-09 19:05:01 UTC ++++ Makefile.in +@@ -697,7 +697,7 @@ EXTRA_DIST = $(am__append_33) $(am__append_39) $(am__a perl/t/Scanner.t perl/t/pod.t perl/t/pod-coverage.t - pkgconfigdir = $(libdir)/pkgconfig + pkgconfigdir = $(prefix)/libdata/pkgconfig pkgconfig_DATA = zbar.pc $(am__append_44) $(am__append_52) -dist_doc_DATA = COPYING HACKING INSTALL LICENSE NEWS README TODO \ +dist_doc_DATA = HACKING INSTALL NEWS README TODO \ $(am__append_61) zincludedir = $(includedir)/zbar include_HEADERS = include/zbar.h Index: head/graphics/zbar/files/patch-configure =================================================================== --- head/graphics/zbar/files/patch-configure (revision 491339) +++ head/graphics/zbar/files/patch-configure (revision 491340) @@ -1,16 +1,18 @@ ---- configure.orig 2009-10-23 18:17:24.000000000 +0000 +--- configure.orig 2009-10-23 18:17:24 UTC +++ configure -@@ -21369,6 +21369,7 @@ if test "x$ac_cv_lib_jpeg_jpeg_read_head +@@ -21369,6 +21369,7 @@ if test "x$ac_cv_lib_jpeg_jpeg_read_header" = x""yes; #define HAVE_LIBJPEG 1 _ACEOF + have_jpeg="yes" LIBS="-ljpeg $LIBS" else -@@ -21736,4 +21737,5 @@ +@@ -21735,6 +21736,7 @@ $as_echo "yes" >&6; } + : fi MAGICK_VERSION=`$PKG_CONFIG MagickWand --modversion` + MAGICK_CFLAGS="$MAGICK_CFLAGS -DMAGICK_MAJOR=${MAGICK_VERSION%%.*}" { $as_echo "$as_me:$LINENO: using ImageMagick version $MAGICK_VERSION" >&5 $as_echo "$as_me: using ImageMagick version $MAGICK_VERSION" >&6;} + Index: head/graphics/zbar/files/patch-zbarimg_zbarimg.c =================================================================== --- head/graphics/zbar/files/patch-zbarimg_zbarimg.c (nonexistent) +++ head/graphics/zbar/files/patch-zbarimg_zbarimg.c (revision 491340) @@ -0,0 +1,14 @@ +--- zbarimg/zbarimg.c.orig 2009-10-23 18:16:44 UTC ++++ zbarimg/zbarimg.c +@@ -38,7 +38,11 @@ + #include + + #include ++#if MAGICK_MAJOR < 7 + #include ++#else ++#include ++#endif + + /* in 6.4.5.4 MagickGetImagePixels changed to MagickExportImagePixels. + * (still not sure this check is quite right... Property changes on: head/graphics/zbar/files/patch-zbarimg_zbarimg.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/zbar/pkg-plist =================================================================== --- head/graphics/zbar/pkg-plist (revision 491339) +++ head/graphics/zbar/pkg-plist (revision 491340) @@ -1,39 +1,41 @@ %%V4L%%bin/zbarcam -%%IMAGEMAGICK%%bin/zbarimg +%%V6%%bin/zbarimg +%%V7%%bin/zbarimg include/zbar.h include/zbar/Decoder.h 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 include/zbar/Window.h %%GTK2%%include/zbar/zbargtk.h lib/libzbar.a lib/libzbar.so lib/libzbar.so.0 lib/libzbar.so.0.2.0 %%GTK2%%lib/libzbargtk.a %%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 -%%IMAGEMAGICK%%man/man1/zbarimg.1.gz +%%V6%%man/man1/zbarimg.1.gz +%%V7%%man/man1/zbarimg.1.gz %%PYTHON%%%%PYTHON_SITELIBDIR%%/zbar.so %%PYTHON%%%%GTK2%%%%PYTHON_SITELIBDIR%%/zbarpygtk.so %%PORTDOCS%%%%DOCSDIR%%/HACKING %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO