Omar Polo <[email protected]> writes:
> 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.
Of course, bsd.port.mk has a solution: PREFIX=${PREFIX}
Attaching an update patch that doesn't rewrite targets/install.mk.
> - 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 13 Sep 2020 09:36:38 -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,16 @@ 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=${PREFIX}/man
+FAKE_FLAGS += PREFIX=${PREFIX}
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 13 Sep 2020 09:36:38 -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 13 Sep 2020 09:36:38 -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 13 Sep 2020 09:36:38 -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
