CVS commit: pkgsrc/devel/devIL

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul 16 22:45:43 UTC 2019

Modified Files:
        pkgsrc/devel/devIL: Makefile buildlink3.mk
Added Files:
        pkgsrc/devel/devIL: options.mk

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/devel/devIL/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/devIL/buildlink3.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/devIL/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/devel/devIL/Makefile
diff -u pkgsrc/devel/devIL/Makefile:1.38 pkgsrc/devel/devIL/Makefile:1.39
--- pkgsrc/devel/devIL/Makefile:1.38    Sat Apr 25 14:20:33 2015
+++ pkgsrc/devel/devIL/Makefile Tue Jul 16 22:45:42 2019
@@ -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 @@ DEVIL_VERSION=        1.7.8
 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 @@ INFO_FILES=           yes
 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"

Index: pkgsrc/devel/devIL/buildlink3.mk
diff -u pkgsrc/devel/devIL/buildlink3.mk:1.30 pkgsrc/devel/devIL/buildlink3.mk:1.31
--- pkgsrc/devel/devIL/buildlink3.mk:1.30       Sat Apr 25 14:20:33 2015
+++ pkgsrc/devel/devIL/buildlink3.mk    Tue Jul 16 22:45:42 2019
@@ -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_API_DEPENDS.devIL+=  devIL>=1.7
 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"

Added files:

Index: pkgsrc/devel/devIL/options.mk
diff -u /dev/null pkgsrc/devel/devIL/options.mk:1.1
--- /dev/null   Tue Jul 16 22:45:43 2019
+++ pkgsrc/devel/devIL/options.mk       Tue Jul 16 22:45:42 2019
@@ -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