CVS commit: pkgsrc/graphics/zbar

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Fri Dec  6 08:03:00 UTC 2019

Modified Files:
        pkgsrc/graphics/zbar: Makefile
Added Files:
        pkgsrc/graphics/zbar: options.mk

Log Message:
zbar: Belatedly add (accidentally missed) options.mk

Thanks to <wiz>!


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/zbar/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/zbar/options.mk

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

Modified files:

Index: pkgsrc/graphics/zbar/Makefile
diff -u pkgsrc/graphics/zbar/Makefile:1.2 pkgsrc/graphics/zbar/Makefile:1.3
--- pkgsrc/graphics/zbar/Makefile:1.2   Thu Dec  5 23:58:06 2019
+++ pkgsrc/graphics/zbar/Makefile       Fri Dec  6 08:03:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/12/05 23:58:06 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2019/12/06 08:03:00 leot Exp $
 
 DISTNAME=      zbar-0.23
 CATEGORIES=    graphics
@@ -25,7 +25,7 @@ PKGCONFIG_OVERRIDE+=  zbar-gtk.pc.in
 PKGCONFIG_OVERRIDE+=   zbar-qt.pc.in
 PKGCONFIG_OVERRIDE+=   zbar.pc.in
 
-#.include "options.mk"
+.include "options.mk"
 
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/graphics/zbar/options.mk
diff -u /dev/null pkgsrc/graphics/zbar/options.mk:1.1
--- /dev/null   Fri Dec  6 08:03:00 2019
+++ pkgsrc/graphics/zbar/options.mk     Fri Dec  6 08:03:00 2019
@@ -0,0 +1,37 @@
+# $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