CVS commit: pkgsrc/devel/jq

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jan 15 08:51:55 UTC 2018

Modified Files:
        pkgsrc/devel/jq: Makefile distinfo
Added Files:
        pkgsrc/devel/jq/patches: patch-Makefile.in

Log Message:
jq: fixed dynamic linking (now bin/jq is tiny); cleaned pkglint warnings


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/jq/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/jq/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/jq/patches/patch-Makefile.in

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.11 pkgsrc/devel/jq/Makefile:1.12
--- pkgsrc/devel/jq/Makefile:1.11       Fri Jan 12 14:41:24 2018
+++ pkgsrc/devel/jq/Makefile    Mon Jan 15 08:51:55 2018
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.11 2018/01/12 14:41:24 fhajny Exp $
+# $NetBSD: Makefile,v 1.12 2018/01/15 08:51:55 adam Exp $
 
 DISTNAME=      jq-1.5
 PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=stedolan/}
-GITHUB_PROJECT=        jq
-GITHUB_TAG=    jq-${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/stedolan/jq/
 COMMENT=       Command-line JSON processor
 LICENSE=       mit
 
+GITHUB_PROJECT=        jq
+GITHUB_TAG=    jq-${PKGVERSION_NOREV}
+
 USE_LANGUAGES= c99
 USE_LIBTOOL=   yes
 USE_TOOLS+=    bison flex gmake
-
 GNU_CONFIGURE= yes
 
 CFLAGS.SunOS+= -D_XPG6 -D__EXTENSIONS__

Index: pkgsrc/devel/jq/distinfo
diff -u pkgsrc/devel/jq/distinfo:1.7 pkgsrc/devel/jq/distinfo:1.8
--- pkgsrc/devel/jq/distinfo:1.7        Tue May 10 09:20:52 2016
+++ pkgsrc/devel/jq/distinfo    Mon Jan 15 08:51:55 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2016/05/10 09:20:52 tnn Exp $
+$NetBSD: distinfo,v 1.8 2018/01/15 08:51:55 adam Exp $
 
 SHA1 (jq-1.5.tar.gz) = 664638b560d9e734178e8cafb21d98817af5b5f3
 RMD160 (jq-1.5.tar.gz) = 33ac77ac93e0539f6d66d29cd717013cdab8cf61
 SHA512 (jq-1.5.tar.gz) = 3f9049321e8430b04dbccf81d7f2ab691b89383e91526eaf585bbeeb67698dea73a36b3aa179f6a95ef97cd73a8a9b6dc53cb1a5b0398b6422c11289b705de7b
 Size (jq-1.5.tar.gz) = 1118086 bytes
+SHA1 (patch-Makefile.in) = 446be0fa3517fb6fc1e2f5761d1f8fb28339c79c
 SHA1 (patch-src_jv__parse.c) = efca86e70daf27291a01bf538487b745b7bd600c

Added files:

Index: pkgsrc/devel/jq/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/devel/jq/patches/patch-Makefile.in:1.1
--- /dev/null   Mon Jan 15 08:51:55 2018
+++ pkgsrc/devel/jq/patches/patch-Makefile.in   Mon Jan 15 08:51:55 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2018/01/15 08:51:55 adam Exp $
+
+Fix dynamic linking.
+
+--- Makefile.in.orig   2018-01-15 08:41:01.000000000 +0000
++++ Makefile.in
+@@ -681,7 +681,7 @@ include_HEADERS = jv.h jq.h
+ @ENABLE_ERROR_INJECTION_TRUE@libinject_errors_la_LDFLAGS = -module
+ generate_ver = ver="`{ $(srcdir)/scripts/version || echo '$(VERSION)' ; } | sed 's/.*/\#define JQ_VERSION \"&\"/'`"
+ jq_SOURCES = main.c version.h
+-jq_LDFLAGS = -static-libtool-libs $(am__append_3)
++jq_LDFLAGS = @ENABLE_ALL_STATIC_TRUE@-static-libtool-libs $(am__append_3)
+ jq_LDADD = libjq.la -lm
+ 
+ ### Tests (make check)