Index: head/net-im/toxic/Makefile =================================================================== --- head/net-im/toxic/Makefile (revision 483602) +++ head/net-im/toxic/Makefile (revision 483603) @@ -1,55 +1,56 @@ # Created by: Thierry Thomas # $FreeBSD$ PORTNAME= toxic -PORTVERSION= 0.8.2 -PORTREVISION= 2 +PORTVERSION= 0.8.3 DISTVERSIONPREFIX= v CATEGORIES= net-im MAINTAINER= thierry@FreeBSD.org COMMENT= Console client for Tox LICENSE= GPLv3+ -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/lib/libtoxcore.a:net-im/tox \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat LIB_DEPENDS= libvpx.so:multimedia/libvpx \ libsodium.so:security/libsodium \ libpng.so:graphics/png \ libopus.so:audio/opus \ libcurl.so:ftp/curl \ libv4l2.so:multimedia/libv4l \ libqrencode.so:graphics/libqrencode \ libconfig.so:devel/libconfig RUN_DEPENDS= ${LOCALBASE}/lib/libtoxcore.a:net-im/tox USE_GITHUB= yes GH_ACCOUNT= JFreegman +USES= desktop-file-utils gettext-runtime gmake ncurses openal:al,alut pkgconfig + OPTIONS_DEFINE= X11 PYTHON OPTIONS_DEFAULT=X11 +X11_USES= gnome X11_USE= GNOME=gdkpixbuf2,glib20 XORG=x11 X11_MAKE_ARGS_OFF= DISABLE_X11=1 DISABLE_DESKTOP_NOTIFY=1 X11_LIB_DEPENDS=libnotify.so:devel/libnotify PYTHON_USES= python:3.3+ PYTHON_MAKE_ARGS= ENABLE_PYTHON=1 -MAKE_ENV= USER_CFLAGS="${CFLAGS}" USER_LDFLAGS="${LDFLAGS}" +MAKE_ENV= USER_CFLAGS="${CFLAGS}" USER_LDFLAGS="${LDFLAGS}" \ + MANDIR="${MANPREFIX}/man" LLD_UNSAFE= yes SUB_FILES= pkg-message - -USES= desktop-file-utils gettext-runtime gmake ncurses openal:al,alut pkgconfig pre-configure: ${REINPLACE_CMD} -e 's|PREFIX =|PREFIX?=|;s|$$(shell git rev-list HEAD.*$$|${GH_TAGNAME}|' \ ${WRKSRC}/cfg/global_vars.mk post-install: ${RM} ${STAGEDIR}${MANPREFIX}/man/man1/toxic.1-e ${STAGEDIR}${MANPREFIX}/man/man5/toxic.conf.5-e ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/toxic .include Index: head/net-im/toxic/distinfo =================================================================== --- head/net-im/toxic/distinfo (revision 483602) +++ head/net-im/toxic/distinfo (revision 483603) @@ -1,3 +1,3 @@ -TIMESTAMP = 1520022095 -SHA256 (JFreegman-toxic-v0.8.2_GH0.tar.gz) = 53bdbed3d72d000f9e43b8823523c589540b811bc237ed6f3b4ddf0fe6f9a6b7 -SIZE (JFreegman-toxic-v0.8.2_GH0.tar.gz) = 1146526 +TIMESTAMP = 1541009709 +SHA256 (JFreegman-toxic-v0.8.3_GH0.tar.gz) = 97f26ba2c257c10439fd2ff280ca90c37ed225d86f46740a08f02ff2e4459e0e +SIZE (JFreegman-toxic-v0.8.3_GH0.tar.gz) = 1147100 Index: head/net-im/toxic/files/patch-src_video__device.c =================================================================== --- head/net-im/toxic/files/patch-src_video__device.c (revision 483602) +++ head/net-im/toxic/files/patch-src_video__device.c (nonexistent) @@ -1,11 +0,0 @@ ---- src/video_device.c.orig 2017-11-17 22:44:56 UTC -+++ src/video_device.c -@@ -37,7 +37,7 @@ - #include - #include - #include --#if defined(__linux__) -+#if defined(__linux__) || defined(__FreeBSD__) - #include - #else - #include Property changes on: head/net-im/toxic/files/patch-src_video__device.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-im/toxic/files/patch-cfg_global__vars.mk =================================================================== --- head/net-im/toxic/files/patch-cfg_global__vars.mk (revision 483602) +++ head/net-im/toxic/files/patch-cfg_global__vars.mk (revision 483603) @@ -1,17 +1,15 @@ ---- cfg/global_vars.mk.orig 2018-02-27 23:46:56 UTC +--- cfg/global_vars.mk.orig 2018-10-30 22:03:44 UTC +++ cfg/global_vars.mk -@@ -1,11 +1,7 @@ +@@ -1,11 +1,6 @@ # Version --TOXIC_VERSION = 0.8.1 + TOXIC_VERSION = 0.8.3 -REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error") -ifneq (, $(findstring error, $(REV))) - VERSION = $(TOXIC_VERSION) -else - VERSION = $(TOXIC_VERSION)_r$(REV) -endif -+TOXIC_VERSION = 0.8.2 +#REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error") -+VERSION = $(TOXIC_VERSION) # Project directories BUILD_DIR = $(BASE_DIR)/build