kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update from 1.0.4 to 2.0.0.

Browse source
This commit is contained in:
Sergey A. Osokin 2012-01-27 12:10:14 +00:00
parent 17833bdd00
commit f90647f6ec
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=289875
3 changed files with 17 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
devel/lua-cjson/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= cjson
PORTVERSION= 1.0.4
PORTVERSION= 2.0.0
CATEGORIES= devel
MASTER_SITES= http://www.kyne.com.au/~mark/software/download/
PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}

4
devel/lua-cjson/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (lua-cjson-1.0.4.tar.gz) = 3d353821977b4aa97bbba0d2386a73172a7ef246a3f799b677225275145d0b72
SIZE (lua-cjson-1.0.4.tar.gz) = 33336
SHA256 (lua-cjson-2.0.0.tar.gz) = 800ff64cfb33ff75eec8ec2313d3750ecbe665f7becc6c5a0c58ae740853c27c
SIZE (lua-cjson-2.0.0.tar.gz) = 85149

63
devel/lua-cjson/files/patch-Makefile
View file

@ -1,51 +1,16 @@
--- Makefile.orig 2011-11-29 17:46:33.000000000 +0400
+++ Makefile 2012-01-12 13:50:30.000000000 +0400
@@ -13,7 +13,7 @@
# USE_INTERNAL_ISINF: Workaround for Solaris platforms missing isinf().
## Common build defaults
--- Makefile.orig 2012-01-23 09:42:17.000000000 +0400
+++ Makefile 2012-01-23 09:44:46.000000000 +0400
@@ -13,12 +13,10 @@
##### Build defaults #####
LUA_VERSION = 5.1
TARGET = cjson.so
-PREFIX = /usr/local
+#PREFIX = /usr/local
CFLAGS_EXTRA = -DUSE_POSIX_SETLOCALE
LDFLAGS_EXTRA = -shared
@@ -25,10 +25,10 @@
# specific details.
## Linux
-CFLAGS_EXTRA = -DUSE_POSIX_USELOCALE
+#CFLAGS_EXTRA = -DUSE_POSIX_USELOCALE
## FreeBSD
-#LUA_INCLUDE_DIR = $(PREFIX)/include/lua51
#CFLAGS = -g -Wall -pedantic -fno-inline
-CFLAGS = -O3 -Wall -pedantic -DNDEBUG
CJSON_CFLAGS = -fpic
CJSON_LDFLAGS = -shared
-LUA_INCLUDE_DIR = $(PREFIX)/include
+LUA_INCLUDE_DIR = $(PREFIX)/include/lua51
## MacOSX (Macports)
#PREFIX = /opt/local
@@ -40,13 +40,13 @@
## End platform specific section
-LUA_INCLUDE_DIR ?= $(PREFIX)/include
+#LUA_INCLUDE_DIR ?= $(PREFIX)/include
LUA_LIB_DIR ?= $(PREFIX)/lib/lua/$(LUA_VERSION)
#CFLAGS ?= -g -Wall -pedantic -fno-inline
-CFLAGS ?= -O3 -Wall -pedantic
-override CFLAGS += $(CFLAGS_EXTRA) -fpic -I$(LUA_INCLUDE_DIR) -DVERSION=\"$(CJSON_VERSION)\"
-override LDFLAGS += $(LDFLAGS_EXTRA)
+#CFLAGS ?= -O3 -Wall -pedantic
+CFLAGS += $(CFLAGS_EXTRA) -fpic -I$(LUA_INCLUDE_DIR) -DVERSION=\"$(CJSON_VERSION)\"
+LDFLAGS += $(LDFLAGS_EXTRA)
INSTALL ?= install
@@ -55,7 +55,7 @@
all: cjson.so
cjson.so: lua_cjson.o strbuf.o
- $(CC) $(LDFLAGS) -o $@ $^
+ $(CC) $(LDFLAGS) -o $@ lua_cjson.o strbuf.o
install:
$(INSTALL) -d $(DESTDIR)/$(LUA_LIB_DIR)
LUA_CMODULE_DIR = $(PREFIX)/lib/lua/$(LUA_VERSION)
LUA_MODULE_DIR = $(PREFIX)/share/lua/$(LUA_VERSION)
LUA_BIN_DIR = $(PREFIX)/bin