hello misc,
Here's the diff to update net/toxic from 0.8.2 to the latest 0.8.3.
Tested on an amd64 -CURRENT with a friend running 0.8.2 on OpenBSD
and 0.8.3 on linux. Text, notifications and file transfer works,
can't say if voice/video works.
I'm not sure if the revision bump is needed, nothing in bsd.port.mk(5)
makes me think so, but I got a "loud complaint" during make package.
The other thing I'm not 100% sure is the cfg/targets/install.mk
patch. Basically, the port tried to install its things in
/usr/ports/pobj/toxic-0.8.3/fake-amd64/usr/ports/pobj/toxic-0.8.3/fake-amd64/usr/local/...
instead of
/usr/ports/pobj/toxic-0.8.3/fake-amd64/usr/local/...
and given that BINDIR/MISC_DIR/etc are already defined as $(PREFIX)/{bin,
share/..., man} now it uses the correct directory layout.
Lastly, portcheck complains about two things:
1) a missing RDEP on desktop-file-utils for the no-x11 flavor
2) intl WANTLIB that looks like masked by RUN_DEPENDS
while for the 2) I have no clue, for the 1) shouldn't the desktop
files be skipped on the no-x11 flavor?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/toxic/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 12 Jul 2019 20:48:50 -0000 1.6
+++ Makefile 6 Apr 2020 08:40:02 -0000
@@ -4,8 +4,8 @@ COMMENT = ncurses-based Tox client
GH_ACCOUNT = Jfreegman
GH_PROJECT = toxic
-GH_TAGNAME = v0.8.2
-REVISION = 3
+GH_TAGNAME = v0.8.3
+REVISION = 4
CATEGORIES = net
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/toxic/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 29 Apr 2018 11:16:30 -0000 1.1.1.1
+++ distinfo 6 Apr 2020 08:40:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (toxic-0.8.2.tar.gz) = U72+09ctAA+eQ7iCNSPFiVQLgRvCN+1vO03fD+b5prc=
-SIZE (toxic-0.8.2.tar.gz) = 1146526
+SHA256 (toxic-0.8.3.tar.gz) = l/JrosJXwQQ5/S/ygMqQw37SJdhvRnQKCPAv8uRFng4=
+SIZE (toxic-0.8.3.tar.gz) = 1147100
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/net/toxic/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 29 Apr 2018 11:16:30 -0000 1.1.1.1
+++ patches/patch-Makefile 6 Apr 2020 08:40:02 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2018/
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -62,20 +62,17 @@ OBJ := $(addprefix $(BUILD_DIR)/, $(OBJ))
+@@ -57,20 +57,17 @@ OBJ := $(addprefix $(BUILD_DIR)/, $(OBJ))
all: $(BUILD_DIR)/toxic
$(BUILD_DIR)/toxic: $(OBJ)
Index: patches/patch-cfg_global_vars_mk
===================================================================
RCS file: patches/patch-cfg_global_vars_mk
diff -N patches/patch-cfg_global_vars_mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cfg_global_vars_mk 6 Apr 2020 08:40:02 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: cfg/global_vars.mk
+--- cfg/global_vars.mk.orig
++++ cfg/global_vars.mk
+@@ -26,7 +26,7 @@ SNDFILES += ToxicTransferComplete.wav ToxicTransferSta
+ PREFIX ?= /usr/local
+ BINDIR = $(PREFIX)/bin
+ DATADIR = $(PREFIX)/share/toxic
+-MANDIR ?= $(PREFIX)/share/man
++MANDIR ?= $(PREFIX)/man
+ APPDIR = $(PREFIX)/share/applications
+
+ # Platform tools
Index: patches/patch-cfg_targets_install_mk
===================================================================
RCS file: /cvs/ports/net/toxic/patches/patch-cfg_targets_install_mk,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-cfg_targets_install_mk
--- patches/patch-cfg_targets_install_mk 29 Apr 2018 11:16:30 -0000
1.1.1.1
+++ patches/patch-cfg_targets_install_mk 6 Apr 2020 08:40:02 -0000
@@ -3,6 +3,51 @@ $OpenBSD: patch-cfg_targets_install_mk,v
Index: cfg/targets/install.mk
--- cfg/targets/install.mk.orig
+++ cfg/targets/install.mk
+@@ -1,33 +1,33 @@
+ # Install target
+ install: $(BUILD_DIR)/toxic
+ @echo "Installing toxic executable"
+- @mkdir -p $(abspath $(DESTDIR)/$(BINDIR))
+- @install -m 0755 $(BUILD_DIR)/toxic $(abspath
$(DESTDIR)/$(BINDIR)/toxic)
++ mkdir -p $(abspath $(BINDIR))
++ install -m 0755 $(BUILD_DIR)/toxic $(abspath $(BINDIR)/toxic)
+
+ @echo "Installing desktop file"
+- @mkdir -p $(abspath $(DESTDIR)/$(APPDIR))
+- @install -m 0644 $(MISC_DIR)/$(DESKFILE) $(abspath
$(DESTDIR)/$(APPDIR)/$(DESKFILE))
++ mkdir -p $(abspath $(APPDIR))
++ install -m 0644 $(MISC_DIR)/$(DESKFILE) $(abspath $(APPDIR)/$(DESKFILE))
+
+ @echo "Installing data files"
+- @mkdir -p $(abspath $(DESTDIR)/$(DATADIR))
++ mkdir -p $(abspath $(DATADIR))
+ @for f in $(DATAFILES) ; do \
+- install -m 0644 $(MISC_DIR)/$$f $(abspath
$(DESTDIR)/$(DATADIR)/$$f) ;\
+- file=$(abspath $(DESTDIR)/$(DATADIR)/$$f) ;\
++ install -m 0644 $(MISC_DIR)/$$f $(abspath $(DATADIR)/$$f) ;\
++ file=$(abspath $(DATADIR)/$$f) ;\
+ sed -e 's:__DATADIR__:'$(abspath $(DATADIR))':g' $$file >
temp_file && \
+ mv temp_file $$file ;\
+ done
+- @mkdir -p $(abspath $(DESTDIR)/$(DATADIR))/sounds
++ mkdir -p $(abspath $(DATADIR))/sounds
+ @for f in $(SNDFILES) ; do \
+- install -m 0644 $(SND_DIR)/$$f $(abspath
$(DESTDIR)/$(DATADIR)/sounds/$$f) ;\
++ install -m 0644 $(SND_DIR)/$$f $(abspath $(DATADIR)/sounds/$$f)
;\
+ done
+
+ @echo "Installing man pages"
+- @mkdir -p $(abspath $(DESTDIR)/$(MANDIR))
++ mkdir -p $(abspath $(MANDIR))
+ @for f in $(MANFILES) ; do \
+ if [ ! -e "$(DOC_DIR)/$$f" ]; then \
+ continue ;\
+ fi ;\
+- section=$(abspath $(DESTDIR)/$(MANDIR))/man`echo $${f##*.}` ;\
++ section=$(abspath $(MANDIR))/man`echo $${f##*.}` ;\
+ file=$$section/$$f ;\
+ mkdir -p $$section ;\
+ install -m 0644 $(DOC_DIR)/$$f $$file ;\
@@ -35,7 +35,6 @@ install: $(BUILD_DIR)/toxic
mv temp_file $$file ;\
sed -e 's:__DATADIR__:'$(abspath $(DATADIR))':g' $$file >
temp_file && \
Index: pkg/PFRAG.no-no_x11
===================================================================
RCS file: /cvs/ports/net/toxic/pkg/PFRAG.no-no_x11,v
retrieving revision 1.1
diff -u -p -r1.1 PFRAG.no-no_x11
--- pkg/PFRAG.no-no_x11 17 Jul 2018 13:49:23 -0000 1.1
+++ pkg/PFRAG.no-no_x11 6 Apr 2020 08:40:02 -0000
@@ -1,3 +1,2 @@
@comment $OpenBSD: PFRAG.no-no_x11,v 1.1 2018/07/17 13:49:23 sthen Exp $
-share/applications/toxic.desktop
@tag update-desktop-database
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/toxic/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 17 Jul 2018 13:49:23 -0000 1.3
+++ pkg/PLIST 6 Apr 2020 08:40:02 -0000
@@ -3,6 +3,7 @@
@bin bin/toxic
@man man/man1/toxic.1
@man man/man5/toxic.conf.5
+share/applications/toxic.desktop
share/toxic/
share/toxic/nameservers
share/toxic/sounds/
