[pkgsrc/trunk]: pkgsrc/devel/devIL devIL: Disable jp2 support by default

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/eaa6bde64e19
branches:  trunk
changeset: 336524:eaa6bde64e19
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Jul 16 22:45:42 2019 +0000

description:
devIL: Disable jp2 support by default

Re-enable it with the 'jasper' option.

Part of the process of trying to minimize the potential impact of a
vulnerable jasper.

While here, define LICENSE.

Bump PKGREVISION

diffstat:

 devel/devIL/Makefile      |   7 ++++---
 devel/devIL/buildlink3.mk |   7 +++++--
 devel/devIL/options.mk    |  13 +++++++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diffs (74 lines):

diff -r 9582b5e316a6 -r eaa6bde64e19 devel/devIL/Makefile
--- a/devel/devIL/Makefile      Tue Jul 16 22:37:17 2019 +0000
+++ b/devel/devIL/Makefile      Tue Jul 16 22:45:42 2019 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2015/04/25 14:20:33 tnn Exp $
+# $NetBSD: Makefile,v 1.39 2019/07/16 22:45:42 nia Exp $
 #
 
 DISTNAME=      DevIL-${DEVIL_VERSION}
 PKGNAME=       ${DISTNAME:S/D/d/}
-PKGREVISION=   13
+PKGREVISION=   14
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=openil/}
 
@@ -12,6 +12,7 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://openil.sourceforge.net/
 COMMENT=       Developer's Image Library
+LICENSE=       gnu-lgpl-v2.1
 
 WRKSRC=                        ${WRKDIR}/devil-${DEVIL_VERSION}
 GNU_CONFIGURE=         yes
@@ -24,9 +25,9 @@
 CONFIGURE_ARGS+=       --enable-ILU
 CONFIGURE_ARGS+=       --enable-ILUT
 
+.include "options.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/jasper/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
diff -r 9582b5e316a6 -r eaa6bde64e19 devel/devIL/buildlink3.mk
--- a/devel/devIL/buildlink3.mk Tue Jul 16 22:37:17 2019 +0000
+++ b/devel/devIL/buildlink3.mk Tue Jul 16 22:45:42 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2015/04/25 14:20:33 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2019/07/16 22:45:42 nia Exp $
 
 BUILDLINK_TREE+=       devIL
 
@@ -9,9 +9,12 @@
 BUILDLINK_ABI_DEPENDS.devIL+=  devIL>=1.7.8nb13
 BUILDLINK_PKGSRCDIR.devIL?=    ../../devel/devIL
 
+.include "../../mk/pkg-build-options.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/jasper/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.opencv:Mjasper)
+.  include "../../graphics/jasper/buildlink3.mk"
+.endif
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
diff -r 9582b5e316a6 -r eaa6bde64e19 devel/devIL/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/devIL/options.mk    Tue Jul 16 22:45:42 2019 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2019/07/16 22:45:42 nia Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.devIL
+PKG_SUPPORTED_OPTIONS= jasper
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mjasper)
+CONFIGURE_ARGS+=       --enable-jp2
+.include "../../graphics/jasper/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-jp2
+.endif