CVS commit: pkgsrc/devel/jq

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Mon Jan 22 13:27:41 UTC 2018

Modified Files:
        pkgsrc/devel/jq: Makefile
Added Files:
        pkgsrc/devel/jq: options.mk

Log Message:
Turn oniguruma support into a (default) option.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/jq/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/jq/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/jq/Makefile
diff -u pkgsrc/devel/jq/Makefile:1.12 pkgsrc/devel/jq/Makefile:1.13
--- pkgsrc/devel/jq/Makefile:1.12       Mon Jan 15 08:51:55 2018
+++ pkgsrc/devel/jq/Makefile    Mon Jan 22 13:27:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/01/15 08:51:55 adam Exp $
+# $NetBSD: Makefile,v 1.13 2018/01/22 13:27:41 fhajny Exp $
 
 DISTNAME=      jq-1.5
 PKGREVISION=   2
@@ -10,17 +10,17 @@ HOMEPAGE=   https://github.com/stedolan/jq
 COMMENT=       Command-line JSON processor
 LICENSE=       mit
 
-GITHUB_PROJECT=        jq
-GITHUB_TAG=    jq-${PKGVERSION_NOREV}
+GITHUB_TAG=    ${DISTNAME}
 
 USE_LANGUAGES= c99
 USE_LIBTOOL=   yes
 USE_TOOLS+=    bison flex gmake
 GNU_CONFIGURE= yes
 
+.include "options.mk"
+
 CFLAGS.SunOS+= -D_XPG6 -D__EXTENSIONS__
 
 TEST_TARGET=   check
 
-.include "../../textproc/oniguruma/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/devel/jq/options.mk
diff -u /dev/null pkgsrc/devel/jq/options.mk:1.1
--- /dev/null   Mon Jan 22 13:27:41 2018
+++ pkgsrc/devel/jq/options.mk  Mon Jan 22 13:27:41 2018
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2018/01/22 13:27:41 fhajny Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.jq
+PKG_SUPPORTED_OPTIONS= oniguruma
+PKG_SUGGESTED_OPTIONS= oniguruma
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Moniguruma)
+.include "../../textproc/oniguruma/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       ac_cv_lib_onig_onig_version=no
+.endif