Move devel/libcheck to devel/check

- Bump PORTREVISION for dependent ports

25 files changed, 32 insertions, 29 deletions

diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index b588d2eed781..e2673755769c 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rhythmbox
 PORTVERSION=	3.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 LIB_DEPENDS=	libmusicbrainz5.so:audio/libmusicbrainz5 \
 		libtotem-plparser.so:multimedia/totem-pl-parser \
 		libdbus-glib-1.so:devel/dbus-glib \
-		libcheck.so:devel/libcheck \
+		libcheck.so:devel/check \
 		libpeas-1.0.so:devel/libpeas \
 		libjson-glib-1.0.so:devel/json-glib \
 		libsoup-gnome-2.4.so:devel/libsoup-gnome \
diff --git a/databases/galera/Makefile b/databases/galera/Makefile
index d7743dc65dd5..55d36c07dc4e 100644
--- a/databases/galera/Makefile
+++ b/databases/galera/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Synchronous multi-master replication engine
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	checkmk:devel/libcheck \
+BUILD_DEPENDS=	checkmk:devel/check \
 		doxygen:devel/doxygen \
 		${PYTHON_PKGNAMEPREFIX}cloud_sptheme>=0:textproc/py-cloud_sptheme
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
diff --git a/databases/leofs/Makefile b/databases/leofs/Makefile
index 448060e4f7b5..4f9795e03243 100644
--- a/databases/leofs/Makefile
+++ b/databases/leofs/Makefile
@@ -13,7 +13,7 @@ LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/erlang18/bin/erlc:lang/erlang-runtime18 \
 		${LOCALBASE}/bin/cmake:devel/cmake \
-		${LOCALBASE}/lib/libcheck.a:devel/libcheck
+		${LOCALBASE}/lib/libcheck.a:devel/check
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	leo-project
diff --git a/devel/Makefile b/devel/Makefile
index 3726731a157e..0aa4c0b6e8d3 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -250,6 +250,7 @@
     SUBDIR += cgit
     SUBDIR += cgprof
     SUBDIR += charva
+    SUBDIR += check
     SUBDIR += checkbashisms
     SUBDIR += checkheaders
     SUBDIR += cheritrace-devel
@@ -1227,7 +1228,6 @@
     SUBDIR += libccid
     SUBDIR += libcfg
     SUBDIR += libcfu
-    SUBDIR += libcheck
     SUBDIR += libchipcard
     SUBDIR += libcidr
     SUBDIR += libcii
diff --git a/devel/libcheck/Makefile b/devel/check/Makefile
index 3b5328786039..f8fc7096dba0 100644
--- a/devel/libcheck/Makefile
+++ b/devel/check/Makefile
@@ -1,11 +1,10 @@
 # Created by: mikeh@FreeBSD.org
 # $FreeBSD$
 
-PORTNAME=	libcheck
+PORTNAME=	check
 PORTVERSION=	0.10.0
 CATEGORIES=	devel
 MASTER_SITES=	SF/check/check/${PORTVERSION}
-DISTNAME=	check-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Unit test framework for C
diff --git a/devel/libcheck/distinfo b/devel/check/distinfo
index 7a908d5160c6..7a908d5160c6 100644
--- a/devel/libcheck/distinfo
+++ b/devel/check/distinfo
diff --git a/devel/libcheck/files/patch-check.m4 b/devel/check/files/patch-check.m4
index de169f8486b0..de169f8486b0 100644
--- a/devel/libcheck/files/patch-check.m4
+++ b/devel/check/files/patch-check.m4
diff --git a/devel/libcheck/pkg-descr b/devel/check/pkg-descr
index f4e0e5bc38e1..f4e0e5bc38e1 100644
--- a/devel/libcheck/pkg-descr
+++ b/devel/check/pkg-descr
diff --git a/devel/libcheck/pkg-plist b/devel/check/pkg-plist
index a20d73ce81cb..a20d73ce81cb 100644
--- a/devel/libcheck/pkg-plist
+++ b/devel/check/pkg-plist
diff --git a/devel/libr3/Makefile b/devel/libr3/Makefile
index c83c82f25585..35ecf70d525d 100644
--- a/devel/libr3/Makefile
+++ b/devel/libr3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libr3
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	gasol.wu@gmail.com
@@ -11,7 +11,7 @@ COMMENT=	URL router library with high performance
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libcheck.so:devel/libcheck \
+LIB_DEPENDS=	libcheck.so:devel/check \
 		libgvc.so:graphics/graphviz \
 		libpcre.so:devel/pcre
 
diff --git a/dns/getdns/Makefile b/dns/getdns/Makefile
index 4a9b6fd5e323..3d0352b1c4bd 100644
--- a/dns/getdns/Makefile
+++ b/dns/getdns/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	getdns
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://getdnsapi.net/dist/ \
 		https://mirrors.rit.edu/zi/ \
@@ -47,7 +47,7 @@ LIBUV_CONFIGURE_WITH=	libuv
 LIBEVENT_LIB_DEPENDS=	libevent.so:devel/libevent2
 LIBEVENT_CONFIGURE_WITH=libevent
 DIAGS_VARS=		PLIST_FILES+=bin/${PORTNAME}_query
-DIAGS_LIB_DEPENDS=	libcheck.so:devel/libcheck
+DIAGS_LIB_DEPENDS=	libcheck.so:devel/check
 
 do-build-DIAGS-on:
 	(cd ${WRKSRC}/src/test && ${MAKE})
diff --git a/games/freedink-engine/Makefile b/games/freedink-engine/Makefile
index c9779fc7b899..19995d86a11b 100644
--- a/games/freedink-engine/Makefile
+++ b/games/freedink-engine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	freedink
 PORTVERSION=	108.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	-engine
@@ -12,7 +12,7 @@ MAINTAINER=	shurd@FreeBSD.org
 COMMENT=	Dink Smallwood RPG and RPG Construction Set
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
-		libcheck.so:devel/libcheck
+		libcheck.so:devel/check
 
 USES=		gettext gmake pkgconfig
 USE_SDL=	sdl gfx ttf image mixer
diff --git a/korean/libhangul/Makefile b/korean/libhangul/Makefile
index 970b5b85d757..1cd4dd50c44b 100644
--- a/korean/libhangul/Makefile
+++ b/korean/libhangul/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for Hangul processing
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-TEST_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/check.pc:devel/libcheck
+TEST_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/check.pc:devel/check
 
 GH_ACCOUNT=	choehwanjin
 GH_TAGNAME=	9fe2d4e
diff --git a/mail/libmapi/Makefile b/mail/libmapi/Makefile
index b0a51dadfba6..2a1cbea650fc 100644
--- a/mail/libmapi/Makefile
+++ b/mail/libmapi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libmapi
 PORTVERSION=	2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/openchange/openchange/archive/
 DISTNAME=	openchange-${PORTVERSION}-${CODENAME}
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${SAMBA_DEP} \
 LIB_DEPENDS=	libical.so:devel/libical \
 		libnanomsg.so:net/nanomsg \
 		libmemcached.so:databases/libmemcached \
-		libcheck.so:devel/libcheck \
+		libcheck.so:devel/check \
 		libtdb.so:databases/tdb \
 		libtevent.so:devel/tevent \
 		libtalloc.so:devel/talloc
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 514bea5534af..7fe151cb3792 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.10.36
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gstreamer/
 
@@ -36,7 +36,7 @@ OPTIONS_DEFINE=	LIBCHECK NLS
 OPTIONS_SUB=	yes
 LIBCHECK_DESC=	Unit tests support
 
-LIBCHECK_LIB_DEPENDS=	libcheck.so:devel/libcheck
+LIBCHECK_LIB_DEPENDS=	libcheck.so:devel/check
 LIBCHECK_CONFIGURE_OFF=	--disable-check
 
 NLS_USES=	gettext
diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile
index 4d1d745f758f..1e67d3e79ee5 100644
--- a/multimedia/gstreamer1/Makefile
+++ b/multimedia/gstreamer1/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gstreamer/
 PKGNAMESUFFIX=	1
@@ -35,7 +36,7 @@ OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	LIBCHECK
 LIBCHECK_DESC=	Unit tests support
 LIBCHECK_CONFIGURE_ENABLE=	check
-LIBCHECK_LIB_DEPENDS=	libcheck.so:devel/libcheck
+LIBCHECK_LIB_DEPENDS=	libcheck.so:devel/check
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
diff --git a/net-im/tox/Makefile b/net-im/tox/Makefile
index 86a7d80dfff8..30e5ef702a07 100644
--- a/net-im/tox/Makefile
+++ b/net-im/tox/Makefile
@@ -11,7 +11,7 @@ COMMENT=	ProjectTox-Core library, a decentralized and secure messenger
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	checkmk:devel/libcheck
+BUILD_DEPENDS=	checkmk:devel/check
 LIB_DEPENDS=	libvpx.so:multimedia/libvpx		\
 		libsndfile.so:audio/libsndfile		\
 		libsodium.so:security/libsodium		\
diff --git a/net-mgmt/riemann-c-client/Makefile b/net-mgmt/riemann-c-client/Makefile
index 4de5fb944a88..d8d32110c00c 100644
--- a/net-mgmt/riemann-c-client/Makefile
+++ b/net-mgmt/riemann-c-client/Makefile
@@ -11,7 +11,7 @@ COMMENT=	C library and command-line tool for Riemann
 
 LICENSE=	LGPL3+
 
-BUILD_DEPENDS=	libcheck>0:devel/libcheck
+BUILD_DEPENDS=	check>0:devel/check
 LIB_DEPENDS=	libprotobuf-c.so:devel/protobuf-c \
 		libgnutls.so:security/gnutls \
 		libjson-c.so:devel/json-c
diff --git a/net/axa/Makefile b/net/axa/Makefile
index 0c23cbb16ba5..661a09bb2a53 100644
--- a/net/axa/Makefile
+++ b/net/axa/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	axa
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	net dns
 MASTER_SITES=	FARSIGHT/${PORTNAME} LOCAL/truckman/farsight
 
@@ -15,7 +16,7 @@ LICENSE_FILE_PD=	${WRKSRC}/license_pd
 
 BUILD_DEPENDS=	bash:shells/bash \
 		sie-nmsg>0:net/sie-nmsg
-LIB_DEPENDS=	libcheck.so:devel/libcheck \
+LIB_DEPENDS=	libcheck.so:devel/check \
 		libprotobuf-c.so:devel/protobuf-c \
 		libnmsg.so:net/nmsg \
 		libwdns.so:dns/wdns \
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 2c94a0bbfbda..afc620a04274 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -44,7 +44,7 @@ MILTER_CONFIGURE_ENABLE=milter
 TESTS_CONFIGURE_ENABLE=	check
 JSON_CONFIGURE_WITH=	libjson
 PCRE_CONFIGURE_WITH=	pcre
-TESTS_BUILD_DEPENDS=	${LOCALBASE}/include/check.h:devel/libcheck
+TESTS_BUILD_DEPENDS=	${LOCALBASE}/include/check.h:devel/check
 ICONV_CONFIGURE_ON=	--with-iconv
 ICONV_CONFIGURE_OFF=	--without-iconv
 ICONV_USES=		iconv
diff --git a/security/openvpn-auth-ldap/Makefile b/security/openvpn-auth-ldap/Makefile
index ed3ddb43dd3a..57d8c3bcfd2c 100644
--- a/security/openvpn-auth-ldap/Makefile
+++ b/security/openvpn-auth-ldap/Makefile
@@ -16,7 +16,7 @@ LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	re2c:devel/re2c \
 		${NONEXISTENT}:security/openvpn:extract \
-		libcheck>=0:devel/libcheck
+		check>=0:devel/check
 
 USES=		objc tar:xz
 
diff --git a/textproc/scew/Makefile b/textproc/scew/Makefile
index 7a9007af732c..d7d7fd1bcd15 100644
--- a/textproc/scew/Makefile
+++ b/textproc/scew/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scew
 PORTVERSION=	1.1.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	SAVANNAH/${PORTNAME}/
 
@@ -32,7 +32,7 @@ post-install:
 .endfor
 
 .ifdef MAINTAINER_MODE
-LIB_DEPENDS+=	libcheck.so:devel/libcheck
+LIB_DEPENDS+=	libcheck.so:devel/check
 regression-test: build
 	${MAKE_CMD} -C ${WRKSRC}/tests check
 .endif
diff --git a/www/libhpack/Makefile b/www/libhpack/Makefile
index 87ea116a8bdf..0c31ffbe9411 100644
--- a/www/libhpack/Makefile
+++ b/www/libhpack/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libhpack
 PORTVERSION=	0.0.20140710
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://raw.github.com/http2/http2-spec/master/:ec_xml
 DISTFILES=	draft-ietf-httpbis-header-compression.xml:ec_xml
@@ -14,7 +15,7 @@ COMMENT=	Implementation of HPACK (Header compression for HTTP/2.0)
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcheck.so:devel/libcheck
+LIB_DEPENDS=	libcheck.so:devel/check
 
 CMAKE_ARGS=	-DBUILD_DOCS=OFF \
 		-DBUILD_TESTS=OFF \
diff --git a/www/libjwt/Makefile b/www/libjwt/Makefile
index 784fd5f9bd53..e6ae0aad510a 100644
--- a/www/libjwt/Makefile
+++ b/www/libjwt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libjwt
 PORTVERSION=	1.7.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
@@ -12,7 +13,7 @@ COMMENT=	JSON Web Token implementation in C
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libcheck.so:devel/libcheck \
+LIB_DEPENDS=	libcheck.so:devel/check \
 		libjansson.so:devel/jansson
 
 USE_GITHUB=	yes
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 3bdf76249ef2..dd5cbbc3efee 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	The X protocol C-language Binding (XCB) library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libcheck.a:devel/libcheck \
+BUILD_DEPENDS=	${LOCALBASE}/lib/libcheck.a:devel/check \
 		xcb-proto>=1.9:x11/xcb-proto \
 		${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs