diff --git a/net-im/toxic/Makefile b/net-im/toxic/Makefile index f058237a2b43..060579e78541 100644 --- a/net-im/toxic/Makefile +++ b/net-im/toxic/Makefile @@ -1,64 +1,65 @@ PORTNAME= toxic -PORTVERSION= 0.16.0 +PORTVERSION= 0.16.1 DISTVERSIONPREFIX= v CATEGORIES= net-im MAINTAINER= thierry@FreeBSD.org COMMENT= Console client for Tox WWW= https://tox.chat/ LICENSE= GPLv3+ 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 \ libpng.so:graphics/png \ 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 USES= compiler:c11 desktop-file-utils gettext-runtime gmake ncurses \ openal:al,alut pkgconfig +MAKE_ARGS= ENABLE_RELEASE=1 USE_GITHUB= yes GH_ACCOUNT= JFreegman OPTIONS_DEFINE= GAMES X11 PYTHON OPTIONS_DEFAULT=GAMES X11 GAMES_DESC= Includes a games module GAMES_MAKE_ARGS_OFF= DISABLE_GAMES=1 X11_USES= gnome xorg 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 PYTHON_MAKE_ARGS= ENABLE_PYTHON=1 CFLAGS+= -I${NCURSESINC} -pthread LDFLAGS+= -L${NCURSESLIB} LDFLAGS_i386= -Wl,-znotext MAKE_ENV= USER_CFLAGS="${CFLAGS}" USER_LDFLAGS="${LDFLAGS}" \ MANDIR="${PREFIX}/share/man" SUB_FILES= pkg-message pre-configure-PYTHON-on: ${REINPLACE_CMD} -e '/PYTHON3_LIBS/ s|python3|python-${PYTHON_VER}|' \ -e 's|python3-config|${PYTHON_VERSION}-config|g' \ -e 's|--ldflags|--ldflags --embed|' \ ${WRKSRC}/cfg/checks/python.mk 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}${PREFIX}/share/man/man1/toxic.1-e ${STAGEDIR}${PREFIX}/share/man/man5/toxic.conf.5-e ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/toxic .include diff --git a/net-im/toxic/distinfo b/net-im/toxic/distinfo index 3cdf5595d104..d5e5fc6b36d9 100644 --- a/net-im/toxic/distinfo +++ b/net-im/toxic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1737130567 -SHA256 (JFreegman-toxic-v0.16.0_GH0.tar.gz) = 9b58f87941c5638e6169f972292351205bb6335bde8121c103d7dc6fc5174ac7 -SIZE (JFreegman-toxic-v0.16.0_GH0.tar.gz) = 1246725 +TIMESTAMP = 1742072930 +SHA256 (JFreegman-toxic-v0.16.1_GH0.tar.gz) = 4969f0a72e40e0ed296cfff5a5bcd58b999ace52759327c29f23866c96d64f00 +SIZE (JFreegman-toxic-v0.16.1_GH0.tar.gz) = 1249306 diff --git a/net-im/toxic/files/patch-Makefile b/net-im/toxic/files/patch-Makefile index 26f08944f975..08559d6285cb 100644 --- a/net-im/toxic/files/patch-Makefile +++ b/net-im/toxic/files/patch-Makefile @@ -1,13 +1,13 @@ ---- Makefile.orig 2019-07-14 18:05:38 UTC +--- Makefile.orig 2025-01-09 14:41:43 UTC +++ Makefile -@@ -23,6 +23,10 @@ UNAME_S = $(shell uname -s) +@@ -38,6 +38,10 @@ endif ifeq ($(UNAME_S), Linux) LDFLAGS += -ldl -lrt endif +ifeq ($(UNAME_S), FreeBSD) +LIBS := $(filter-out ncursesw, $(LIBS)) +LDFLAGS += -lncursesw +endif ifeq ($(UNAME_S), OpenBSD) LIBS := $(filter-out ncursesw, $(LIBS)) LDFLAGS += -lncursesw diff --git a/net-im/toxic/files/patch-cfg_global__vars.mk b/net-im/toxic/files/patch-cfg_global__vars.mk index b5bec75e4a7a..f4a1d953f96a 100644 --- a/net-im/toxic/files/patch-cfg_global__vars.mk +++ b/net-im/toxic/files/patch-cfg_global__vars.mk @@ -1,15 +1,15 @@ ---- cfg/global_vars.mk.orig 2018-10-30 22:03:44 UTC +--- cfg/global_vars.mk.orig 2025-01-09 14:41:43 UTC +++ cfg/global_vars.mk -@@ -1,11 +1,6 @@ +@@ -1,11 +1,6 @@ TOXIC_VERSION = 0.16.1 # Version - TOXIC_VERSION = 0.8.3 + TOXIC_VERSION = 0.16.1 -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 +#REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error") # Project directories BUILD_DIR = $(BASE_DIR)/build diff --git a/net-im/toxic/files/patch-src_main.c b/net-im/toxic/files/patch-src_main.c new file mode 100644 index 000000000000..e9ba5f448454 --- /dev/null +++ b/net-im/toxic/files/patch-src_main.c @@ -0,0 +1,23 @@ +--- src/main.c.orig 2025-01-09 14:41:43 UTC ++++ src/main.c +@@ -477,7 +477,7 @@ static void init_tox_options(const Run_Options *run_op + tox_options_set_tcp_port(tox_opts, run_opts->tcp_port); + tox_options_set_local_discovery_enabled(tox_opts, !run_opts->disable_local_discovery); + tox_options_set_experimental_groups_persistence(tox_opts, true); +- tox_options_set_experimental_disable_dns(tox_opts, false); ++ // tox_options_set_experimental_disable_dns(tox_opts, false); + + if (run_opts->logging) { + tox_options_set_log_callback(tox_opts, cb_toxcore_logger); +@@ -508,9 +508,10 @@ static void init_tox_options(const Run_Options *run_op + } + + if (!tox_options_get_udp_enabled(tox_opts)) { ++ /* + if (proxy_set) { + tox_options_set_experimental_disable_dns(tox_opts, true); +- } ++ } */ + + init_queue_add(init_q, "UDP disabled"); + } else if (proxy_set) {