zbar: Remove, used to update graphics/zbar

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: zbar: Remove, used to update graphics/zbar
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Sat, 20 Jun 2020 10:45:40 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sat Jun 20 12:45:40 2020 +0200
Changeset:	4730370e0e42ed510ab7595c567c82fabacd28ef

Modified Files:
	Makefile
Removed Files:
	zbar/DESCR
	zbar/Makefile
	zbar/PLIST
	zbar/buildlink3.mk
	zbar/distinfo
	zbar/options.mk
	zbar/patches/patch-configure
	zbar/patches/patch-gtk_Makefile.in
	zbar/patches/patch-test_test__examples.sh.in

Log Message:
zbar: Remove, used to update graphics/zbar

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4730370e0e42ed510ab7595c567c82fabacd28ef

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                     |  1 -
 zbar/DESCR                                   | 12 -----
 zbar/Makefile                                | 31 ------------
 zbar/PLIST                                   | 22 --------
 zbar/buildlink3.mk                           | 25 ----------
 zbar/distinfo                                |  9 ----
 zbar/options.mk                              | 37 --------------
 zbar/patches/patch-configure                 | 44 ----------------
 zbar/patches/patch-gtk_Makefile.in           | 17 -------
 zbar/patches/patch-test_test__examples.sh.in | 75 ----------------------------
 10 files changed, 273 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 67b63a5b60..59e1ad5f61 100644
--- a/Makefile
+++ b/Makefile
@@ -5094,7 +5094,6 @@ SUBDIR+=	ypbind-mt
 SUBDIR+=	ypserv
 SUBDIR+=	zapping
 SUBDIR+=	zbackup
-SUBDIR+=	zbar
 SUBDIR+=	zdbsp
 SUBDIR+=	zenity
 SUBDIR+=	zero-epwing-git
diff --git a/zbar/DESCR b/zbar/DESCR
deleted file mode 100644
index 75d22efb80..0000000000
--- a/zbar/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-ZBar is an open source software suite for reading bar codes from various
-sources, such as video streams, image files and raw intensity sensors. It
-supports many popular symbologies (types of bar codes) including
-EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR
-Code.
-
-The flexible, layered implementation facilitates bar code scanning and
-decoding for any application: use it stand-alone with the included GUI and
-command line programs, easily integrate a bar code scanning widget into
-your Qt, GTK+ or PyGTK GUI application, leverage one of the script or
-programming interfaces (Python, Perl, C++) ...all the way down to a
-streamlined C library suitable for embedded use.
diff --git a/zbar/Makefile b/zbar/Makefile
deleted file mode 100644
index e34e423604..0000000000
--- a/zbar/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2020/06/02 08:24:08 adam Exp $
-
-DISTNAME=	zbar-0.23.1
-CATEGORIES=	graphics
-MASTER_SITES=	https://linuxtv.org/downloads/zbar/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	leot%NetBSD.org@localhost
-HOMEPAGE=	https://github.com/mchehab/zbar
-COMMENT=	Bar code reader
-LICENSE=	gnu-lgpl-v2.1
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-
-CONFIGURE_ARGS+=	--with-jpeg
-CONFIGURE_ARGS+=	--disable-nls
-CONFIGURE_ARGS+=	--disable-video
-CONFIGURE_ARGS+=	--without-gtk
-CONFIGURE_ARGS+=	--without-python
-CONFIGURE_ARGS+=	--without-java
-CONFIGURE_ARGS+=	--without-qt
-
-PKGCONFIG_OVERRIDE+=	zbar-gtk.pc.in
-PKGCONFIG_OVERRIDE+=	zbar.pc.in
-
-.include "options.mk"
-
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/zbar/PLIST b/zbar/PLIST
deleted file mode 100644
index 6f35c35231..0000000000
--- a/zbar/PLIST
+++ /dev/null
@@ -1,22 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2019/12/04 11:17:32 leot Exp $
-${PLIST.imagemagick}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
-lib/libzbar.la
-lib/pkgconfig/zbar.pc
-${PLIST.imagemagick}man/man1/zbarimg.1
-share/doc/zbar/COPYING
-share/doc/zbar/HACKING.md
-share/doc/zbar/INSTALL.md
-share/doc/zbar/LICENSE.md
-share/doc/zbar/NEWS.md
-share/doc/zbar/README.md
-share/doc/zbar/TODO.md
diff --git a/zbar/buildlink3.mk b/zbar/buildlink3.mk
deleted file mode 100644
index 94bce3768a..0000000000
--- a/zbar/buildlink3.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2019/12/04 11:17:32 leot Exp $
-
-BUILDLINK_TREE+=	zbar
-
-.if !defined(ZBAR_BUILDLINK3_MK)
-ZBAR_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.zbar+=	zbar>=0.23
-BUILDLINK_PKGSRCDIR.zbar?=	../../wip/zbar
-
-pkgbase:=	zbar
-.include "../../mk/pkg-build-options.mk"
-
-.if !empty(PKG_BUILD_OPTIONS.zbar:Mx11)
-.include "../../x11/libICE/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXv/buildlink3.mk"
-.endif
-
-.include "../../mk/jpeg.buildlink3.mk"
-
-.endif # ZBAR_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-zbar
diff --git a/zbar/distinfo b/zbar/distinfo
deleted file mode 100644
index 57aa06f57c..0000000000
--- a/zbar/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.2 2020/03/26 21:51:11 joerg Exp $
-
-SHA1 (zbar-0.23.1.tar.bz2) = 6a047e29895dd9248cc3dbac6fe0ac454d86f45b
-RMD160 (zbar-0.23.1.tar.bz2) = d4a8f17d7bc5874677c5bc301028b2fd236f221c
-SHA512 (zbar-0.23.1.tar.bz2) = e27765d380daa907b50817f4efa9b16a906f01ddb4ad7d7fd4a5193582a3fabc5a34d01c5dd8bdeb16cad9ccb62e6d72279294fbdcf8163815394be9722bfba4
-Size (zbar-0.23.1.tar.bz2) = 1195599 bytes
-SHA1 (patch-configure) = 98a156737fd6058ba39f9f7e43cac8c63034beb2
-SHA1 (patch-gtk_Makefile.in) = bf32ac312d0d00ed7ac152ddd849dae0fc681e74
-SHA1 (patch-test_test__examples.sh.in) = d5739c5e4670d602b36ac62e7544f25709fc0d61
diff --git a/zbar/options.mk b/zbar/options.mk
deleted file mode 100644
index 2e3adaf7d5..0000000000
--- a/zbar/options.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2019/12/06 08:03:00 leot Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.zbar
-PKG_SUPPORTED_OPTIONS=	imagemagick x11
-PKG_SUGGESTED_OPTIONS=	imagemagick x11
-
-.include "../../mk/bsd.options.mk"
-
-#
-# ImageMagick support
-#
-PLIST_VARS+=	imagemagick
-.if !empty(PKG_OPTIONS:Mimagemagick)
-PLIST.imagemagick=	yes
-CONFIGURE_ARGS+=	--with-imagemagick
-.  include "../../graphics/ImageMagick/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-imagemagick
-.endif
-
-#
-# X11 support
-#
-.if !empty(PKG_OPTIONS:Mx11)
-CONFIGURE_ARGS+=	--with-x
-CONFIGURE_ARGS+=	--with-xshm
-CONFIGURE_ARGS+=	--with-xv
-.  include "../../x11/libX11/buildlink3.mk"
-.  include "../../x11/libXext/buildlink3.mk"
-.  include "../../x11/libXv/buildlink3.mk"
-.  include "../../x11/libICE/buildlink3.mk"
-.  include "../../x11/libSM/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--with-x=no
-CONFIGURE_ARGS+=	--without-xshm
-CONFIGURE_ARGS+=	--without-xv
-.endif
diff --git a/zbar/patches/patch-configure b/zbar/patches/patch-configure
deleted file mode 100644
index 0b2e4cdcb8..0000000000
--- a/zbar/patches/patch-configure
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2019/12/04 11:17:32 leot Exp $
-
-- Avoid `${parameter/pattern/string}' bash-ism
-- Only honor `--with-python' configure argument and completely ignore
-  possible PYTHON environment variable that could be passed via
-  CONFIGURE_ENV by pkgsrc
-- Use standard `=' test(1) operator
-
---- configure.orig	2020-04-20 21:13:55.000000000 +0000
-+++ configure
-@@ -23896,6 +23896,7 @@ fi
- 
- 
- 
-+if false; then
- if test -z "$PYTHON"; then :
-   if test "x$with_python" = "xauto"; then :
-   for ac_prog in python3 python2 python
-@@ -24052,6 +24053,7 @@ else
-   with_python="auto"
- 
- fi
-+fi
- 
- if test "x$with_python" != "xno"; then :
- 
-@@ -25064,7 +25066,7 @@ else
- fi
- 
- 
--JAVAC=${JAVAC/ecj/ecj -1.5}
-+JAVAC=`echo "$JAVAC" | sed -e 's/ecj/ecj -1.5/'`
- 
- # Javah was obsoleted on Java 8 and removed on Java 11. So, we need to
- # look strictly at the $JAVA_HOME in order to avoid mixing different versions
-@@ -29146,7 +29148,7 @@ fi
- echo ""
- echo "please verify that the detected configuration matches your expectations:"
- echo "------------------------------------------------------------------------"
--if test "x$USE_NLS" == "xyes"; then :
-+if test "x$USE_NLS" = "xyes"; then :
-   echo    "gettext                $USE_NLS"
- 
- fi
diff --git a/zbar/patches/patch-gtk_Makefile.in b/zbar/patches/patch-gtk_Makefile.in
deleted file mode 100644
index 68c8209ae1..0000000000
--- a/zbar/patches/patch-gtk_Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-gtk_Makefile.in,v 1.1 2019/12/04 11:17:32 leot Exp $
-
-Avoid gmake-isms.
-
-XXX: Probably that's wrong and needs to be discussed with upstream!
-
---- gtk/Makefile.in.orig	2019-05-23 21:12:07.000000000 +0000
-+++ gtk/Makefile.in
-@@ -887,7 +887,7 @@ uninstall-am: uninstall-dist_girDATA uni
- 
- # GObject Introspection
- 
--include $(INTROSPECTION_MAKEFILE)
-+include $(INTROSPECTION_MAKEFILE) # am--include-marker
- 
- # This may generate some warnings, but it is needed for "make dist"
- ZBar-1.0.gir: $(lib_LTLIBRARIES)
diff --git a/zbar/patches/patch-test_test__examples.sh.in b/zbar/patches/patch-test_test__examples.sh.in
deleted file mode 100644
index 5f8720ad44..0000000000
--- a/zbar/patches/patch-test_test__examples.sh.in
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-test_test__examples.sh.in,v 1.1 2020/03/26 21:51:11 joerg Exp $
-
-Use standard `=' test(1) operator.
-
---- test/test_examples.sh.in.orig	2020-03-13 09:49:04.000000000 +0000
-+++ test/test_examples.sh.in
-@@ -31,28 +31,28 @@ test()
- 	fi
- }
- 
--if [ "@ENABLE_CODE128@" == "1" ]; then
-+if [ "@ENABLE_CODE128@" = "1" ]; then
- 	test code-128.png
- fi
- 
--if [ "@ENABLE_CODE93@" == "1" ]; then
-+if [ "@ENABLE_CODE93@" = "1" ]; then
-         test code-93.png
- fi
- 
--if [ "@ENABLE_CODE39@" == "1" ]; then
-+if [ "@ENABLE_CODE39@" = "1" ]; then
-         test code-39.png
- fi
- 
--if [ "@ENABLE_CODABAR@" == "1" ]; then
-+if [ "@ENABLE_CODABAR@" = "1" ]; then
-         test codabar.png
- fi
- 
--if [ "@ENABLE_DATABAR@" == "1" ]; then
-+if [ "@ENABLE_DATABAR@" = "1" ]; then
-         test databar.png
-         test databar-exp.png
- fi
- 
--if [ "@ENABLE_EAN@" == "1" ]; then
-+if [ "@ENABLE_EAN@" = "1" ]; then
-         test -Sean2.enable ean-2.png
-         test -Sean5.enable ean-5.png
-         test ean-8.png
-@@ -62,28 +62,28 @@ if [ "@ENABLE_EAN@" == "1" ]; then
-         test -Supca.enable code-upc-a.png
- fi
- 
--if [ "@ENABLE_I25@" == "1" ]; then
-+if [ "@ENABLE_I25@" = "1" ]; then
-         test i2-5.png
- fi
- 
--if [ "@ENABLE_QRCODE@" == "1" ]; then
-+if [ "@ENABLE_QRCODE@" = "1" ]; then
-         test qr-code.png
-         test -Stest-inverted qr-code-inverted.png
-         test '--raw --oneshot -Sbinary' qr-code-binary.png
- fi
- 
--if [ "@ENABLE_SQCODE@" == "1" ]; then
-+if [ "@ENABLE_SQCODE@" = "1" ]; then
-         test sqcode1-generated.png
-         test sqcode1-scanned.png
- fi
- 
- # The pdf417 code is incomplete: it doesn't output any results
- #
--#if [ "@ENABLE_PDF417@" == "1" ]; then
-+#if [ "@ENABLE_PDF417@" = "1" ]; then
- #        test code-pdf417.png
- #fi
- 
--if [ "$ERR" == "" ]; then
-+if [ "$ERR" = "" ]; then
- 	echo "zbarimg PASSED."
- else
- 	exit 1
Prev by Date: zbar: Adjust patch-configure last hunk lines (NFCI)
Next by Date: wip/colord: Restore PLIST.introspection variable
Previous by Thread: zbar: Adjust patch-configure last hunk lines (NFCI)
Next by Thread: wip/colord: Restore PLIST.introspection variable
Indexes:
Home | Main Index | Thread Index | Old Index