CVS commit: pkgsrc/textproc/lua-cjson

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jul  8 17:11:52 UTC 2020

Modified Files:
        pkgsrc/textproc/lua-cjson: Makefile PLIST distinfo
Added Files:
        pkgsrc/textproc/lua-cjson/patches: patch-Makefile

Log Message:
lua-cjson: Respect CFLAGS


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/lua-cjson/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/lua-cjson/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/lua-cjson/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/lua-cjson/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/lua-cjson/Makefile
diff -u pkgsrc/textproc/lua-cjson/Makefile:1.5 pkgsrc/textproc/lua-cjson/Makefile:1.6
--- pkgsrc/textproc/lua-cjson/Makefile:1.5      Thu Jul  2 10:26:19 2020
+++ pkgsrc/textproc/lua-cjson/Makefile  Wed Jul  8 17:11:52 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2020/07/02 10:26:19 nia Exp $
+# $NetBSD: Makefile,v 1.6 2020/07/08 17:11:52 nia Exp $
 
 DISTNAME=      lua-cjson-2.1.0
-PKGNAME=       ${LUA_PKGPREFIX}-cjson-2.1.0
-PKGREVISION=   2
+PKGNAME=       ${LUA_PKGPREFIX}-${DISTNAME:S/^lua-//1}
+PKGREVISION=   3
 CATEGORIES=    textproc lua
 MASTER_SITES=  http://www.kyne.com.au/~mark/software/download/
 

Index: pkgsrc/textproc/lua-cjson/PLIST
diff -u pkgsrc/textproc/lua-cjson/PLIST:1.1 pkgsrc/textproc/lua-cjson/PLIST:1.2
--- pkgsrc/textproc/lua-cjson/PLIST:1.1 Sat Mar 22 13:44:02 2014
+++ pkgsrc/textproc/lua-cjson/PLIST     Wed Jul  8 17:11:52 2020
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2014/03/22 13:44:02 imil Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/07/08 17:11:52 nia Exp $
 ${LUA_CDIR}/cjson.so

Index: pkgsrc/textproc/lua-cjson/distinfo
diff -u pkgsrc/textproc/lua-cjson/distinfo:1.2 pkgsrc/textproc/lua-cjson/distinfo:1.3
--- pkgsrc/textproc/lua-cjson/distinfo:1.2      Wed Nov  4 01:59:39 2015
+++ pkgsrc/textproc/lua-cjson/distinfo  Wed Jul  8 17:11:52 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 01:59:39 agc Exp $
+$NetBSD: distinfo,v 1.3 2020/07/08 17:11:52 nia Exp $
 
 SHA1 (lua-cjson-2.1.0.tar.gz) = 48f5546b28059c68545a7fb76146540df8be266c
 RMD160 (lua-cjson-2.1.0.tar.gz) = badd55a5a2ec0ec544938ceeb62d1d9e0b6bd175
 SHA512 (lua-cjson-2.1.0.tar.gz) = 4343513b942f2ed98dc1ea6d7e852303bc1263f8acc5c70c8d674aec7adfc8279c5af7d5173a417b6f9a74543b8f6c8f98742d002f4f75832bbf23bb5a30ad2f
 Size (lua-cjson-2.1.0.tar.gz) = 86024 bytes
+SHA1 (patch-Makefile) = 2c29aaaf8f731a73a58f9a5f0712819cb9a0cd3f

Added files:

Index: pkgsrc/textproc/lua-cjson/patches/patch-Makefile
diff -u /dev/null pkgsrc/textproc/lua-cjson/patches/patch-Makefile:1.1
--- /dev/null   Wed Jul  8 17:11:52 2020
+++ pkgsrc/textproc/lua-cjson/patches/patch-Makefile    Wed Jul  8 17:11:52 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2020/07/08 17:11:52 nia Exp $
+
+Respect CFLAGS.
+
+--- Makefile.orig      2012-03-01 12:22:50.000000000 +0000
++++ Makefile
+@@ -15,7 +15,7 @@ LUA_VERSION =       5.1
+ TARGET =            cjson.so
+ PREFIX =            /usr/local
+ #CFLAGS =            -g -Wall -pedantic -fno-inline
+-CFLAGS =            -O3 -Wall -pedantic -DNDEBUG
++CFLAGS +=           -Wall -pedantic -DNDEBUG
+ CJSON_CFLAGS =      -fpic
+ CJSON_LDFLAGS =     -shared
+ LUA_INCLUDE_DIR =   $(PREFIX)/include