diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2021-02-20 12:11:15 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2021-02-20 12:11:15 +0000 |
| commit | 17adeff54a178234f4cb4392b02b3e1ee21220a4 (patch) | |
| tree | 2b87856c386ca8d3ab703088395a4a6f70dce5d5 /graphics/zbar | |
| parent | 883a1631d22495c83f9c93718ed8461a993fd9e7 (diff) | |
| download | ports-17adeff54a178234f4cb4392b02b3e1ee21220a4.tar.gz ports-17adeff54a178234f4cb4392b02b3e1ee21220a4.zip | |
graphics/zbar: use IMAGEMAGICK_DEFAULT
- switch to USES=localbase
PR: 253444
Submitted by: VVD <vvd@unislabs.com>
Approved by: Oliver Heesakker s<dev2@heesakkers.info> (maintainer)
Notes
Notes:
svn path=/head/; revision=566155
Diffstat (limited to 'graphics/zbar')
| -rw-r--r-- | graphics/zbar/Makefile | 27 | ||||
| -rw-r--r-- | graphics/zbar/pkg-plist | 6 |
2 files changed, 9 insertions, 24 deletions
diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile index 2daa53b0f4e4..7a86c724f8ee 100644 --- a/graphics/zbar/Makefile +++ b/graphics/zbar/Makefile @@ -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,17 +29,9 @@ 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 +IMAGEMAGICK_LIB_DEPENDS= libMagick++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} +IMAGEMAGICK_CONFIGURE_ON= --with-imagemagick=yes +IMAGEMAGICK_CONFIGURE_OFF= --with-imagemagick=no # To avoid patching configure even more: CONFIGURE_ENV+= ac_cv_header_wand_MagickWand_h=yes @@ -55,9 +45,6 @@ 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 diff --git a/graphics/zbar/pkg-plist b/graphics/zbar/pkg-plist index 8bfcf73ca596..f37c255ce749 100644 --- a/graphics/zbar/pkg-plist +++ b/graphics/zbar/pkg-plist @@ -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 |