From d8ba670df20ca7d278f20b6d6de2a3bbea27a52e Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Tue, 8 Feb 2011 13:44:44 +0000 Subject: [PATCH] - Upgrade to 1.0.11 - Add license - Remove workaround for now not supported version of FreeBSD - Mirror it on my own as upstream still rely on github tags instead of providing real distfiles Feature safe: yes --- devel/yajl/Makefile | 21 +++++++++++---------- devel/yajl/distinfo | 5 ++--- devel/yajl/files/patch-src__CMakeLists.txt | 10 ++++++++++ devel/yajl/pkg-plist | 3 ++- 4 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 devel/yajl/files/patch-src__CMakeLists.txt diff --git a/devel/yajl/Makefile b/devel/yajl/Makefile index b213f1247915..138254ab9082 100644 --- a/devel/yajl/Makefile +++ b/devel/yajl/Makefile @@ -6,21 +6,22 @@ # PORTNAME= yajl -PORTVERSION= 1.0.9 -PORTREVISION= 1 +PORTVERSION= 1.0.11 CATEGORIES= devel -MASTER_SITES= http://cloud.github.com/downloads/lloyd/yajl/ +MASTER_SITES= LOCAL/bapt \ + http://files.etoilebsd.net/yajl/ MAINTAINER= bapt@FreeBSD.org COMMENT= A Portable JSON parsing and serialization library in ANSI C +GITREF= f4baae0 +DISTNAME= lloyd-${PORTNAME}-${PORTVERSION}-0-g${GITREF} +WRKSRC= ${WRKDIR}/lloyd-${PORTNAME}-${GITREF} +PLIST_SUB= VERSION=${PORTVERSION} + +LICENSE= BSD + USE_LDCONFIG= yes USE_CMAKE= yes -.include - -.if ${OSVERSION} < 700042 -USE_GCC= 4.2+ -.endif - -.include +.include diff --git a/devel/yajl/distinfo b/devel/yajl/distinfo index 0d6cbb658a3b..dd92019f9b2a 100644 --- a/devel/yajl/distinfo +++ b/devel/yajl/distinfo @@ -1,3 +1,2 @@ -MD5 (yajl-1.0.9.tar.gz) = 8643ff2fef762029e51c86882a4d0fc6 -SHA256 (yajl-1.0.9.tar.gz) = 690e3cf4f879aae623fc6b900665097132a77c504efc5260d36c085b93c84e9b -SIZE (yajl-1.0.9.tar.gz) = 53094 +SHA256 (lloyd-yajl-1.0.11-0-gf4baae0.tar.gz) = 1e98e03b927a8ec466baea527647f5e243f56f71bdec48cdab1c875f0f8b96a9 +SIZE (lloyd-yajl-1.0.11-0-gf4baae0.tar.gz) = 53705 diff --git a/devel/yajl/files/patch-src__CMakeLists.txt b/devel/yajl/files/patch-src__CMakeLists.txt new file mode 100644 index 000000000000..a6e2851dd54b --- /dev/null +++ b/devel/yajl/files/patch-src__CMakeLists.txt @@ -0,0 +1,10 @@ +--- ./src/CMakeLists.txt.orig 2010-07-22 00:12:15.000000000 +0200 ++++ ./src/CMakeLists.txt 2011-02-08 14:32:53.832389559 +0100 +@@ -86,5 +86,6 @@ + # 64-bit systems which use 'lib64' + INSTALL(TARGETS yajl LIBRARY DESTINATION lib${LIB_SUFFIX}) + INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX}) +- INSTALL(DIRECTORY api/ DESTINATION include/yajl) ++ INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl) ++ INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl) + ENDIF() diff --git a/devel/yajl/pkg-plist b/devel/yajl/pkg-plist index ca79de5eb906..28268944aa63 100644 --- a/devel/yajl/pkg-plist +++ b/devel/yajl/pkg-plist @@ -1,10 +1,11 @@ bin/json_reformat bin/json_verify +include/yajl/yajl_version.h include/yajl/yajl_common.h include/yajl/yajl_gen.h include/yajl/yajl_parse.h lib/libyajl.so lib/libyajl.so.1 -lib/libyajl.so.1.0.9 +lib/libyajl.so.%%VERSION%% lib/libyajl_s.a @dirrm include/yajl