On Fri, 10 Jul 2015, Jonathan Gray wrote:
> There is an abi addition of yajl_gen_reset() hence the minor crank.
>
> The port is converted to use the archive tarball instead of the previous
> otherwise the directory structure has a short git hash in it.
I'd prefer to use GH_* variables.
The diff below does this and also fixes WANTLIB, regenerates patches
and removes a whitespace from pkg/DESCR.
x11/i3 is happy with it so far.
Thanks!
David
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/libyajl/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile 22 May 2015 11:36:16 -0000 1.12
+++ Makefile 12 Jul 2015 17:26:00 -0000
@@ -2,24 +2,22 @@
COMMENT = small JSON library written in ANSI C
-V = 2.0.4
-PKGNAME = libyajl-${V}
-DISTNAME = lloyd-yajl-${V}
-REVISION = 2
+GH_ACCOUNT = lloyd
+GH_PROJECT = yajl
+GH_TAGNAME = 2.1.0
+DISTNAME = ${GH_PROJECT}-${GH_TAGNAME}
+PKGNAME = lib${DISTNAME}
CATEGORIES = devel
-SHARED_LIBS = yajl 2.0 # 2.0.4
+SHARED_LIBS = yajl 2.1 # 2.1.0
-HOMEPAGE = https://lloyd.github.com/yajl/
-
-MASTER_SITES = http://distfiles.nl/ \
- https://github.com/lloyd/yajl/tarball/${V}/
+HOMEPAGE = https://lloyd.github.io/yajl/
# BSD
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB = c
+WANTLIB = c m
MODULES = devel/cmake
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/libyajl/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 18 Jan 2015 03:13:17 -0000 1.6
+++ distinfo 12 Jul 2015 17:26:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (lloyd-yajl-2.0.4.tar.gz) = perBFf/xV/ayuM7wKiyf5WGe7Lroivxb8leU281d8n4=
-SIZE (lloyd-yajl-2.0.4.tar.gz) = 82928
+SHA256 (yajl-2.1.0.tar.gz) = P7czZKWjDv5hUEbQfm250J/StBx2PF99O/sSHNXFrFo=
+SIZE (yajl-2.1.0.tar.gz) = 83997
Index: patches/patch-reformatter_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/devel/libyajl/patches/patch-reformatter_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-reformatter_CMakeLists_txt
--- patches/patch-reformatter_CMakeLists_txt 28 Jun 2012 08:50:49 -0000
1.1
+++ patches/patch-reformatter_CMakeLists_txt 12 Jul 2015 17:26:00 -0000
@@ -3,8 +3,8 @@ $OpenBSD: patch-reformatter_CMakeLists_t
Fix static linking and tests
(from gentoo linux)
---- reformatter/CMakeLists.txt.orig Tue Dec 20 01:23:22 2011
-+++ reformatter/CMakeLists.txt Thu Jun 28 10:09:59 2012
+--- reformatter/CMakeLists.txt.orig Wed Mar 19 05:58:29 2014
++++ reformatter/CMakeLists.txt Sun Jul 12 19:16:24 2015
@@ -26,7 +26,7 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL
ADD_EXECUTABLE(json_reformat ${SRCS})
@@ -12,5 +12,5 @@ Fix static linking and tests
-TARGET_LINK_LIBRARIES(json_reformat yajl_s)
+TARGET_LINK_LIBRARIES(json_reformat yajl)
- # copy the binary into the output directory
- GET_TARGET_PROPERTY(binPath json_reformat LOCATION)
+ # In some environments, we must explicitly link libm (like qnx,
+ # thanks @shahbag)
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/devel/libyajl/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 16 Jul 2010 08:09:13 -0000 1.1.1.1
+++ pkg/DESCR 12 Jul 2015 17:26:00 -0000
@@ -1,2 +1,2 @@
-YAJL is a small event-driven (SAX-style) JSON parser written in
+YAJL is a small event-driven (SAX-style) JSON parser written in
ANSI C and a small validating JSON generator.
