svn commit: r452583 - in head/net-im/qTox: . files

[Tobias C. Berner]

Author: tcberner
Date: Sat Oct 21 09:39:18 2017
New Revision: 452583
URL: https://svnweb.freebsd.org/changeset/ports/452583

Log:
  Update net-im/qTox to 1.12.1
  
  * the port option PLATFORM_EXTENSIONS to reflect the option in
    CMakeLists.txt for Xorg and screensaver integration. It should
    be normally "on".
  * pkg-message is moved into the main folder
  * added LICENSE_FILE
  * cmake now installs and compresses icon files
  
  * while here, switch it to DISTVERSION.
  
  PR:		222949
  Submitted by:	Yuri Victorovich <yuri at rawbw.com> (maintainer)

Added:
  head/net-im/qTox/pkg-message
     - copied unchanged from r452582, head/net-im/qTox/files/pkg-message.in
Deleted:
  head/net-im/qTox/files/pkg-message.in
Modified:
  head/net-im/qTox/Makefile
  head/net-im/qTox/distinfo

Modified: head/net-im/qTox/Makefile
==============================================================================
--- head/net-im/qTox/Makefile	Sat Oct 21 09:38:52 2017	(r452582)
+++ head/net-im/qTox/Makefile	Sat Oct 21 09:39:18 2017	(r452583)
@@ -2,15 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	qTox
-PORTVERSION=	1.11.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+DISTVERSION=	1.12.1
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	yuri at rawbw.com
 COMMENT=	Qt 5 based Tox client
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 LIB_DEPENDS=	libtoxcore.so:net-im/tox \
@@ -26,29 +26,32 @@ LIB_DEPENDS=	libtoxcore.so:net-im/tox \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
+OPTIONS_DEFINE=	PLATFORM_EXTENSIONS
+OPTIONS_DEFAULT=PLATFORM_EXTENSIONS
+PLATFORM_EXTENSIONS_DESC=	Enable platform specific extensions
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	qTox
+GH_TAGNAME=	cd8a7ad
 
-SUB_FILES=	pkg-message
-
 USES=		compiler:c++11-lib desktop-file-utils gettext openal:soft pkgconfig cmake
-USE_GNOME=	glib20 gtk20 cairo gdkpixbuf2
-USE_XORG=	x11 xscrnsaver
-USE_GL=		gl
-USE_QT5=	core gui network xml opengl sql sql-sqlite3_run widgets svg testlib \
-		concurrent buildtools_build linguisttools_build
-# bug#220813: qmake isn't needed, but the build fails without qmake_build
+USE_GNOME=	gtk20 cairo
+USE_QT5=	core gui network xml opengl sql sql-sqlite3_run widgets svg \
+		concurrent_build buildtools_build linguisttools_build testlib_build
+# bug#220813: qmake isn't needed, but build fails without qmake_build
 USE_QT5+=	qmake_build
 CMAKE_ARGS=	-DGIT_DESCRIBE:STRING=${FULLVERSION}
 INSTALLS_ICONS=	yes
-ICON_SIZES=	14x14 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512
 
+PLATFORM_EXTENSIONS_CMAKE_OFF=	-DPLATFORM_EXTENSIONS:BOOL=OFF
+PLATFORM_EXTENSIONS_USE=	XORG=x11,xscrnsaver
+
 PLIST_FILES=	bin/qtox \
 		share/applications/qtox.desktop \
 		share/icons/hicolor/scalable/apps/qtox.svgz \
 		share/appdata/qTox.appdata.xml
-.for SZ in ${ICON_SIZES}
-PLIST_FILES+=	share/icons/hicolor/${SZ}/apps/qtox.png
+.for SZ in 14 16 22 24 32 36 48 64 72 96 128 192 256 512
+PLIST_FILES+=	share/icons/hicolor/${SZ}x${SZ}/apps/qtox.png
 .endfor
 
 .include <bsd.port.pre.mk>
@@ -72,17 +75,5 @@ pre-everything::
 pre-configure:
 	@${REINPLACE_CMD} '/Comment/s,=.*,=${COMMENT},' \
 		${WRKSRC}/qtox.desktop
-
-post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
-	@${GZIP_CMD} \
-		< ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/qtox.svg \
-		> ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/qtox.svgz
-	@${RM} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/qtox.svg
-.for SZ in ${ICON_SIZES}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}/apps
-	${INSTALL_DATA} ${WRKSRC}/img/icons/${SZ}/qtox.png \
-		${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}/apps/qtox.png
-.endfor
 
 .include <bsd.port.post.mk>

Modified: head/net-im/qTox/distinfo
==============================================================================
--- head/net-im/qTox/distinfo	Sat Oct 21 09:38:52 2017	(r452582)
+++ head/net-im/qTox/distinfo	Sat Oct 21 09:39:18 2017	(r452583)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500321399
-SHA256 (qTox-qTox-v1.11.0_GH0.tar.gz) = be38517cd915727dbd9b3cd2a51bbaf1cae28290de07a34c759ec8b77c502cd4
-SIZE (qTox-qTox-v1.11.0_GH0.tar.gz) = 3946782
+TIMESTAMP = 1507800999
+SHA256 (qTox-qTox-v1.12.1-cd8a7ad_GH0.tar.gz) = 90709402c93f6529d88c05ff106072e3e4e42ac06917d7b955f3ae39813c13dd
+SIZE (qTox-qTox-v1.12.1-cd8a7ad_GH0.tar.gz) = 3957662

Copied: head/net-im/qTox/pkg-message (from r452582, head/net-im/qTox/files/pkg-message.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/qTox/pkg-message	Sat Oct 21 09:39:18 2017	(r452583, copy of r452582, head/net-im/qTox/files/pkg-message.in)
@@ -0,0 +1,10 @@
+======================================================================
+You installed qTox: Qt 5 based Tox client.
+
+To have video working, you need:
+1. Have multimedia/webcamd installed and running. The usual way to
+   start webcamd is to have these two lines in /etc/rc.conf:
+   webcamd_enable="YES"
+   webcamd_flags="-H"
+2. Make sure V4L option is "on" in multimedia/ffmpeg.
+======================================================================