Index: head/graphics/zbar/Makefile =================================================================== --- head/graphics/zbar/Makefile (revision 526503) +++ head/graphics/zbar/Makefile (revision 526504) @@ -1,74 +1,69 @@ # Created by: Oliver Heesakkers # $FreeBSD$ PORTNAME= zbar PORTVERSION= 0.10 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= graphics MASTER_SITES= SF MAINTAINER= dev2@heesakkers.info COMMENT= ZBar barcode reader LICENSE= LGPL21 USES= iconv jpeg libtool gmake pathfix pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -CONFIGURE_ARGS= --with-jpeg=yes --with-qt=no +CONFIGURE_ARGS= --with-jpeg=yes --with-python=no --with-qt=no -OPTIONS_DEFINE= X11 V4L PYTHON GTK2 DOCS +OPTIONS_DEFINE= X11 V4L GTK2 DOCS OPTIONS_DEFAULT=X11 V7 OPTIONS_RADIO= IMAGEMAGICK OPTIONS_RADIO_IMAGEMAGICK= V6 V7 OPTIONS_SUB= yes V4L_DESC= Build zbarcam video scanner X11_USES= xorg 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 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= gnome python:2.7 -PYTHON_CONFIGURE_ON= --with-python=yes -PYTHON_CONFIGURE_OFF= --with-python=no 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//' \ ${WRKSRC}/Makefile.in post-install: # make check-plist happy ${RMDIR} ${STAGEDIR}${DATADIR} .include Index: head/graphics/zbar/pkg-plist =================================================================== --- head/graphics/zbar/pkg-plist (revision 526503) +++ head/graphics/zbar/pkg-plist (revision 526504) @@ -1,34 +1,32 @@ %%V4L%%bin/zbarcam %%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 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 %%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 -%%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