pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/zbar zbar: Belatedly add (accidentally missed...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f763d72caab4
branches:  trunk
changeset: 405726:f763d72caab4
user:      leot <leot%pkgsrc.org@localhost>
date:      Fri Dec 06 08:03:00 2019 +0000

description:
zbar: Belatedly add (accidentally missed) options.mk

Thanks to <wiz>!

diffstat:

 graphics/zbar/Makefile   |   4 ++--
 graphics/zbar/options.mk |  37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diffs (59 lines):

diff -r 0feaa2ab3e19 -r f763d72caab4 graphics/zbar/Makefile
--- a/graphics/zbar/Makefile    Fri Dec 06 05:38:02 2019 +0000
+++ b/graphics/zbar/Makefile    Fri Dec 06 08:03:00 2019 +0000
@@ -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-qt.pc.in
 PKGCONFIG_OVERRIDE+=   zbar.pc.in
 
-#.include "options.mk"
+.include "options.mk"
 
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 0feaa2ab3e19 -r f763d72caab4 graphics/zbar/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/zbar/options.mk  Fri Dec 06 08:03:00 2019 +0000
@@ -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



Home | Main Index | Thread Index | Old Index