Hello ports,
Following the net/toxcore update, here's the update for net/toxic.
Some notes:
- the makefile tries to call git to fetch the revision number. I've
patched that out
- the ugly patch to cfg/targets/install.mk is because things get
installed in weird places. During fake, for instance, the toxic
binary gets installed at
fake-amd64/usr/ports/pobj/toxic-0.8.3/fake-amd64/usr/local/bin/toxic
I've played a bit with it, but I haven found a better way to educate
the port.
- I've added devel/gettext,-runtime as LIB_DEPENDS because portcheck
complained that, for the no_x11 flavor, the intl library ``look like
masked by RUN_DEPENDS''. I'm not entirely sure if I got the fix
correct, but now portcheck is happy.
Tested only on amd64, checked portcheck and port-lib-depends-check.
Comment? OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/toxic/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 3 Jul 2020 21:11:13 -0000 1.8
+++ Makefile 5 Sep 2020 11:38:48 -0000
@@ -4,8 +4,7 @@ COMMENT = ncurses-based Tox client
GH_ACCOUNT = Jfreegman
GH_PROJECT = toxic
-GH_TAGNAME = v0.8.2
-REVISION = 4
+GH_TAGNAME = v0.8.3
CATEGORIES = net
@@ -16,13 +15,15 @@ WANTLIB += alut c config curses curl int
WANTLIB += qrencode toxcore util z ${MODPY_WANTLIB}
LIB_DEPENDS = audio/freealut \
+ devel/gettext,-runtime \
net/toxcore \
devel/libconfig \
net/curl \
graphics/libqrencode
MAKE_ENV += ENABLE_PYTHON=1 \
- USER_CFLAGS="${CFLAGS}"
+ USER_CFLAGS="${CFLAGS}" \
+ MANDIR=${DESTDIR}${PREFIX}/man
MODULES = lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
CONFIGURE_STYLE = none
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 5 Sep 2020 11:38:48 -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 5 Sep 2020 11:38:48 -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 5 Sep 2020 11:38:48 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+don't invoke git
+
+Index: cfg/global_vars.mk
+--- cfg/global_vars.mk.orig
++++ cfg/global_vars.mk
+@@ -1,6 +1,6 @@
+ # Version
+ TOXIC_VERSION = 0.8.3
+-REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error")
++REV = "error"
+ ifneq (, $(findstring error, $(REV)))
+ VERSION = $(TOXIC_VERSION)
+ else
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 5 Sep 2020 11:38:48 -0000
@@ -1,8 +1,55 @@
$OpenBSD: patch-cfg_targets_install_mk,v 1.1.1.1 2018/04/29 11:16:30 landry
Exp $
+{BIN,APP,DATA}DIR are already within DESTDIR
+
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/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 5 Sep 2020 11:38:48 -0000
@@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2018/07/17 13:49:23 sthen Exp $
-!%%no_x11%%
@bin bin/toxic
@man man/man1/toxic.1
@man man/man5/toxic.conf.5
@@ -15,3 +14,4 @@ share/toxic/sounds/ToxicRecvMessage.wav
share/toxic/sounds/ToxicTransferComplete.wav
share/toxic/sounds/ToxicTransferStart.wav
share/toxic/toxic.conf.example
+@tag update-desktop-database
