- Update to 0.8.1.

- Use OPTIONSng.
- Improve COMMENT.

4 files changed, 22 insertions, 26 deletions

diff --git a/devel/qjson/Makefile b/devel/qjson/Makefile
index 7f734beb89ba..cef1920de5f4 100644
--- a/devel/qjson/Makefile
+++ b/devel/qjson/Makefile
@@ -1,47 +1,40 @@
-# New ports collection makefile for:	qjson
-# Date created:				19 December 2009
-# Whom:					Alberto Villa <villa.alberto@gmail.com>
-#
 # $FreeBSD$
 
 PORTNAME=	qjson
-PORTVERSION=	0.7.1
-PORTREVISION=	2
+PORTVERSION=	0.8.1
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
 MAINTAINER=	avilla@FreeBSD.org
-COMMENT=	Qt-based library that maps JSON data to QVariant objects
+COMMENT=	Library to manage JSON objects with Qt
 
 LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_BZIP2=	yes
 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
-MAKE_JOBS_SAFE=	yes
+USE_BZIP2=	yes
 USE_CMAKE=	yes
+MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
 PORTDOCS=	*
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+.include <bsd.port.options.mk>
 
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
 .endif
 
-pre-configure:
-	${REINPLACE_CMD} -e '/pkgconfig/ s/$${LIB_SUFFIX}/data/' \
-		-e 's|apps/cmake/modules|cmake/Modules|' \
+post-patch:
+	@${REINPLACE_CMD} -e 's,/pkgconfig,/../libdata/pkgconfig,' \
 		${WRKSRC}/CMakeLists.txt
 
 post-build:
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	cd ${WRKSRC}/doc && doxygen
 .endif
 
 post-install:
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} \* ${DOCSDIR}
 .endif
diff --git a/devel/qjson/distinfo b/devel/qjson/distinfo
index 5e306eecfdc4..cfed232ca40c 100644
--- a/devel/qjson/distinfo
+++ b/devel/qjson/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qjson-0.7.1.tar.bz2) = 3b8e94345fe846171c4b4d7d3518891d5fc864fda1e0c10d935bdb77bd3db994
-SIZE (qjson-0.7.1.tar.bz2) = 38075
+SHA256 (qjson-0.8.1.tar.bz2) = cd4db5b956247c4991a9c3e95512da257cd2a6bd011357e363d02300afc814d9
+SIZE (qjson-0.8.1.tar.bz2) = 64398
diff --git a/devel/qjson/pkg-descr b/devel/qjson/pkg-descr
index f13201aefed2..3fd6cf776b4e 100644
--- a/devel/qjson/pkg-descr
+++ b/devel/qjson/pkg-descr
@@ -2,8 +2,8 @@ JSON (JavaScript Object Notation) is a lightweight data-interchange
 format. It can represent integers, real numbers, strings, an ordered
 sequence of values, and a collection of name/value pairs.
 
-QJson is a Qt-based library that maps JSON data to QVariant objects.
-JSON arrays will be mapped to QVariantList instances, while JSON's
-objects will be mapped to QVariantMap.
+QJson is a Qt-based library that maps JSON data to QVariant objects
+and vice versa. JSON arrays will be mapped to QVariantList instances,
+while JSON objects will be mapped to QVariantMap.
 
 WWW: http://qjson.sourceforge.net
diff --git a/devel/qjson/pkg-plist b/devel/qjson/pkg-plist
index 6943e462f8b4..eec72325d2fe 100644
--- a/devel/qjson/pkg-plist
+++ b/devel/qjson/pkg-plist
@@ -4,11 +4,14 @@ include/qjson/qjson_export.h
 include/qjson/qobjecthelper.h
 include/qjson/serializer.h
 include/qjson/serializerrunnable.h
+lib/cmake/qjson/QJSONConfig.cmake
+lib/cmake/qjson/QJSONConfigVersion.cmake
+lib/cmake/qjson/QJSONTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/qjson/QJSONTargets.cmake
 lib/libqjson.so
 lib/libqjson.so.0
-lib/libqjson.so.0.7.1
+lib/libqjson.so.0.8.1
 libdata/pkgconfig/QJson.pc
-share/cmake/Modules/FindQJSON.cmake
-@dirrmtry share/cmake/Modules
-@dirrmtry share/cmake
+@dirrm lib/cmake/qjson
+@dirrmtry lib/cmake
 @dirrm include/qjson