Attachment 144216 Details for Bug 187923 – Fix build and staging for all OPTIONS

[patch] Fix build and staging for all OPTIONS

zbar.diff.txt (text/plain), 2.05 KB, created by Thomas Zander on 2014-06-28 10:34:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Zander

Created: 2014-06-28 10:34:51 UTC

Size: 2.05 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 359656)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	zbar
> PORTVERSION=	0.10
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	graphics
> MASTER_SITES=	SF
> 
>@@ -16,7 +16,7 @@
> 
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>-USES=		iconv gmake pkgconfig
>+USES=		iconv libtool gmake pkgconfig
> 
> CONFIGURE_ARGS=		--with-jpeg=yes
> 
>@@ -37,7 +37,6 @@
> LIB_DEPENDS+=	libMagick++-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
> CONFIGURE_ARGS+=	--with-imagemagick=yes
> PLIST_SUB+=	IMAGEMAGICK=""
>-MAN1=	zbarimg.1
> .else
> CONFIGURE_ARGS+=	--with-imagemagick=no
> PLIST_SUB+=	IMAGEMAGICK="@comment "
>@@ -47,7 +46,6 @@
> BUILD_DEPENDS+=	v4l_compat>=1.0.20101027:${PORTSDIR}/multimedia/v4l_compat
> CONFIGURE_ARGS+=	--enable-video=yes
> PLIST_SUB+=	V4L=""
>-MAN1+=	zbarcam.1
> .else
> CONFIGURE_ARGS+=	--enable-video=no
> PLIST_SUB+=	V4L="@comment "
>@@ -81,6 +79,7 @@
> PLIST_SUB+=	QT4="@comment "
> .endif
> 
>+CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
> post-patch:
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 359656)
>+++ pkg-plist	(working copy)
>@@ -14,23 +14,23 @@
> include/zbar/Window.h
> %%GTK2%%include/zbar/zbargtk.h
> lib/libzbar.a
>-lib/libzbar.la
> lib/libzbar.so
>-lib/libzbar.so.2
>+lib/libzbar.so.0
>+lib/libzbar.so.0.2.0
> %%GTK2%%lib/libzbargtk.a
>-%%GTK2%%lib/libzbargtk.la
> %%GTK2%%lib/libzbargtk.so
> %%GTK2%%lib/libzbargtk.so.0
>+%%GTK2%%lib/libzbargtk.so.0.0.2
> %%QT4%%lib/libzbarqt.a
>-%%QT4%%lib/libzbarqt.la
> %%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
>-%%PYTHON%%%%PYTHON_SITELIBDIR%%/zbar.la
>+%%V4L%%man/man1/zbarcam.1.gz
>+%%IMAGEMAGICK%%man/man1/zbarimg.1.gz
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/zbar.so
>-%%PYTHON%%%%GTK2%%%%PYTHON_SITELIBDIR%%/zbarpygtk.la
> %%PYTHON%%%%GTK2%%%%PYTHON_SITELIBDIR%%/zbarpygtk.so
> %%PORTDOCS%%%%DOCSDIR%%/HACKING
> %%PORTDOCS%%%%DOCSDIR%%/INSTALL

Flags:

riggs: maintainer-approval?

Actions: View | Diff

Attachments on bug 187923: 141180 | 143624 | 144216