View | Details | Raw Unified | Return to bug 221391 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-8 / +17 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	zbar
4
PORTNAME=	zbar
5
PORTVERSION=	0.10
5
PORTVERSION=	0.10
6
PORTREVISION=	16
6
PORTREVISION=	17
7
CATEGORIES=	graphics
7
CATEGORIES=	graphics
8
MASTER_SITES=	SF
8
MASTER_SITES=	SF
9
9
Lines 12-26 Link Here
12
12
13
LICENSE=	LGPL21
13
LICENSE=	LGPL21
14
14
15
USES=		iconv jpeg libtool gmake pathfix pkgconfig
16
USE_LDCONFIG=	yes
15
GNU_CONFIGURE=	yes
17
GNU_CONFIGURE=	yes
16
USE_LDCONFIG=	yes
18
17
USES=		iconv jpeg libtool gmake pathfix pkgconfig
18
INSTALL_TARGET=	install-strip
19
INSTALL_TARGET=	install-strip
19
20
20
CONFIGURE_ARGS=	--with-jpeg=yes
21
CONFIGURE_ARGS=	--with-jpeg=yes
21
22
22
OPTIONS_DEFINE=	X11 IMAGEMAGICK V4L PYTHON GTK2 QT4 DOCS
23
OPTIONS_DEFINE=	X11 V4L PYTHON GTK2 QT4 DOCS
23
OPTIONS_DEFAULT=X11 IMAGEMAGICK
24
OPTIONS_DEFAULT=X11 V7
25
OPTIONS_RADIO=	IMAGEMAGICK
26
OPTIONS_RADIO_IMAGEMAGICK=	V6 V7
24
OPTIONS_SUB=	yes
27
OPTIONS_SUB=	yes
25
V4L_DESC=	Build zbarcam video scanner
28
V4L_DESC=	Build zbarcam video scanner
26
29
Lines 28-37 Link Here
28
X11_CONFIGURE_ON=	--with-x=yes
31
X11_CONFIGURE_ON=	--with-x=yes
29
X11_CONFIGURE_OFF=	--with-x=no --without-xshm --without-xv
32
X11_CONFIGURE_OFF=	--with-x=no --without-xshm --without-xv
30
33
31
IMAGEMAGICK_LIB_DEPENDS=	libMagick++-7.so:graphics/ImageMagick7
34
V6_DESC=	With ImageMagick6
32
IMAGEMAGICK_CONFIGURE_ON=	--with-imagemagick=yes
35
V6_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick6
33
IMAGEMAGICK_CONFIGURE_OFF=	--with-imagemagick=no
36
V6_CONFIGURE_ON=	--with-imagemagick=yes
37
V6_CONFIGURE_OFF=	--with-imagemagick=no
34
38
39
V7_DESC=	With ImageMagick7
40
V7_LIB_DEPENDS=	libMagick++-7.so:graphics/ImageMagick7
41
V7_CONFIGURE_ON=	--with-imagemagick=yes
42
V7_CONFIGURE_OFF=	--with-imagemagick=no
43
35
# To avoid patching configure even more:
44
# To avoid patching configure even more:
36
CONFIGURE_ENV+=			ac_cv_header_wand_MagickWand_h=yes
45
CONFIGURE_ENV+=			ac_cv_header_wand_MagickWand_h=yes
37
46
(-)pkg-plist (-2 / +4 lines)
Lines 1-5 Link Here
1
%%V4L%%bin/zbarcam
1
%%V4L%%bin/zbarcam
2
%%IMAGEMAGICK%%bin/zbarimg
2
%%V6%%bin/zbarimg
3
%%V7%%bin/zbarimg
3
include/zbar.h
4
include/zbar.h
4
include/zbar/Decoder.h
5
include/zbar/Decoder.h
5
include/zbar/Exception.h
6
include/zbar/Exception.h
Lines 29-35 Link Here
29
%%QT4%%libdata/pkgconfig/zbar-qt.pc
30
%%QT4%%libdata/pkgconfig/zbar-qt.pc
30
libdata/pkgconfig/zbar.pc
31
libdata/pkgconfig/zbar.pc
31
%%V4L%%man/man1/zbarcam.1.gz
32
%%V4L%%man/man1/zbarcam.1.gz
32
%%IMAGEMAGICK%%man/man1/zbarimg.1.gz
33
%%V6%%man/man1/zbarimg.1.gz
34
%%V7%%man/man1/zbarimg.1.gz
33
%%PYTHON%%%%PYTHON_SITELIBDIR%%/zbar.so
35
%%PYTHON%%%%PYTHON_SITELIBDIR%%/zbar.so
34
%%PYTHON%%%%GTK2%%%%PYTHON_SITELIBDIR%%/zbarpygtk.so
36
%%PYTHON%%%%GTK2%%%%PYTHON_SITELIBDIR%%/zbarpygtk.so
35
%%PORTDOCS%%%%DOCSDIR%%/HACKING
37
%%PORTDOCS%%%%DOCSDIR%%/HACKING

Return to bug 221391