Sun Mar 18 23:22:03 2012 UTC ()
Use CMAKE rather than custom Makefile. Add additional items to PLIST


(abs)
diff -r1.1.1.1 -r1.2 pkgsrc/devel/yajl/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/devel/yajl/PLIST
diff -r1.1.1.1 -r0 pkgsrc/devel/yajl/files/Makefile
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/yajl/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/yajl/Makefile 2012/03/18 16:56:32 1.1.1.1
+++ pkgsrc/devel/yajl/Makefile 2012/03/18 23:22:03 1.2
@@ -1,36 +1,30 @@ @@ -1,36 +1,30 @@
1# $NetBSD: Makefile,v 1.1.1.1 2012/03/18 16:56:32 abs Exp $ 1# $NetBSD: Makefile,v 1.2 2012/03/18 23:22:03 abs Exp $
2 2
3DISTNAME= 2.0.1 3DISTNAME= 2.0.1
4PKGNAME= yajl-${DISTNAME} 4PKGNAME= yajl-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= devel 6CATEGORIES= devel
6MASTER_SITES= https://github.com/lloyd/yajl/tarball/ 7MASTER_SITES= https://github.com/lloyd/yajl/tarball/
7DIST_SUBDIR= yajl 8DIST_SUBDIR= yajl
8EXTRACT_SUFX= 9EXTRACT_SUFX=
9 10
10MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://lloyd.github.com/yajl/ 12HOMEPAGE= http://lloyd.github.com/yajl/
12COMMENT= Small JSON library written in ANSI C 13COMMENT= Small JSON library written in ANSI C
13LICENSE= modified-bsd 14LICENSE= modified-bsd
14 15
15EXTRACT_CMD= ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} 16EXTRACT_CMD= ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
16# Force using "curl" for fetching the distribution file. It is only available 17# Force using "curl" for fetching the distribution file. It is only available
17# over HTTPS and "curl" is the only fetch program which always supports HTTPS. 18# over HTTPS and "curl" is the only fetch program which always supports HTTPS.
18FETCH_USING= curl 19FETCH_USING= curl
19 20
20WRKSRC= ${WRKDIR}/lloyd-yajl-f4b2b1a 21WRKSRC= ${WRKDIR}/lloyd-yajl-f4b2b1a
21 22
22PKG_DESTDIR_SUPPORT= user-destdir 23PKG_DESTDIR_SUPPORT= user-destdir
23 24
24USE_LANGUAGES= c 25USE_LANGUAGES= c
25USE_LIBTOOL= yes 26USE_LIBTOOL= yes
26USE_TOOLS+= tar 27USE_TOOLS+= tar
27 28USE_CMAKE= yes
28MAKE_ENV+= MKDIR="${MKDIR}" 
29MAKE_ENV+= CP="${CP}" 
30 
31BUILD_DIRS= src 
32 
33post-extract: 
34 ${CP} ${FILESDIR}/Makefile ${WRKSRC}/src/ 
35 29
36.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/yajl/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/yajl/PLIST 2012/03/18 16:56:32 1.1.1.1
+++ pkgsrc/devel/yajl/PLIST 2012/03/18 23:22:03 1.2
@@ -1,5 +1,12 @@ @@ -1,5 +1,12 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2012/03/18 16:56:32 abs Exp $ 1@comment $NetBSD: PLIST,v 1.2 2012/03/18 23:22:03 abs Exp $
 2bin/json_reformat
 3bin/json_verify
2include/yajl/yajl_common.h 4include/yajl/yajl_common.h
3include/yajl/yajl_gen.h 5include/yajl/yajl_gen.h
4include/yajl/yajl_parse.h 6include/yajl/yajl_parse.h
5lib/libyajl.la 7include/yajl/yajl_tree.h
 8include/yajl/yajl_version.h
 9lib/libyajl.so
 10lib/libyajl.so.2
 11lib/libyajl.so.2.0.1
 12lib/libyajl_s.a
File Deleted: pkgsrc/devel/yajl/files/Attic/Makefile