diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2018-10-31 18:49:19 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2018-10-31 18:49:19 +0000 |
commit | 1aebcf8032ac15971a8c9b273aa1b1449745797d (patch) | |
tree | 36abe5011b6b09ed5c5f7805aa13e89c432fed11 /net-im | |
parent | 1af69d755b1ddd9643d2ce482e62cf6f28355199 (diff) | |
download | ports-1aebcf8032ac15971a8c9b273aa1b1449745797d.tar.gz ports-1aebcf8032ac15971a8c9b273aa1b1449745797d.zip |
Notes
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/toxic/Makefile | 13 | ||||
-rw-r--r-- | net-im/toxic/distinfo | 6 | ||||
-rw-r--r-- | net-im/toxic/files/patch-cfg_global__vars.mk | 8 | ||||
-rw-r--r-- | net-im/toxic/files/patch-src_video__device.c | 11 |
4 files changed, 13 insertions, 25 deletions
diff --git a/net-im/toxic/Makefile b/net-im/toxic/Makefile index 79661acad1fe..360cc04f6a71 100644 --- a/net-im/toxic/Makefile +++ b/net-im/toxic/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= toxic -PORTVERSION= 0.8.2 -PORTREVISION= 2 +PORTVERSION= 0.8.3 DISTVERSIONPREFIX= v CATEGORIES= net-im @@ -11,7 +10,7 @@ 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 @@ -28,9 +27,12 @@ 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 @@ -38,12 +40,11 @@ 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 diff --git a/net-im/toxic/distinfo b/net-im/toxic/distinfo index 00f77aff61d7..783ae04d0b31 100644 --- a/net-im/toxic/distinfo +++ b/net-im/toxic/distinfo @@ -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 diff --git a/net-im/toxic/files/patch-cfg_global__vars.mk b/net-im/toxic/files/patch-cfg_global__vars.mk index 89cf3af61923..b5bec75e4a7a 100644 --- a/net-im/toxic/files/patch-cfg_global__vars.mk +++ b/net-im/toxic/files/patch-cfg_global__vars.mk @@ -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 diff --git a/net-im/toxic/files/patch-src_video__device.c b/net-im/toxic/files/patch-src_video__device.c deleted file mode 100644 index 3736e86a933b..000000000000 --- a/net-im/toxic/files/patch-src_video__device.c +++ /dev/null @@ -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 <sys/stat.h> - #include <sys/mman.h> - #include <fcntl.h> --#if defined(__linux__) -+#if defined(__linux__) || defined(__FreeBSD__) - #include <linux/videodev2.h> - #else - #include <sys/videoio.h> |