On Sat, Dec 11, 2021 at 07:17:02PM +0100, Omar Polo wrote:
> Ricky Cintron <boro...@protonmail.com> writes:
>
> > While troubleshooting some error messages I was seeing while running
> > telephony/baresip, I was asked to test the latest development version.
> > I was hoping to do that within the ports infrastructure, but after
> > looking at the Porter's Handbook and the bsd.port.mk(5) man page,
> > it doesn't appear to be supported. Is that correct, or is there a
> > way to make it work? Otherwise, I'll just need to build/patch it
> > manually.
> >
> > If interested, you can read about the issue at:
> > https://github.com/baresip/re/issues/187
>
> I'm not familiar with the baresip suite, but a simple way is to just
> comment GH_TAGNAME and set GH_COMMIT to the latest commit on the master
> branch. Then you can run `make makesum' to fetch the sources and do the
> usual `make build', `make fake' ... etc as needed.
Try this:
Index: Makefile
===================================================================
RCS file: /cvs/ports/telephony/baresip/re/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile 4 Dec 2021 21:30:04 -0000 1.23
+++ Makefile 11 Dec 2021 21:52:51 -0000
@@ -1,11 +1,12 @@
# $OpenBSD: Makefile,v 1.23 2021/12/04 21:30:04 tb Exp $
COMMENT = portable library for real-time communications
+DISTNAME = re
+PKGNAME = re-2.0.1pl0
GH_ACCOUNT = baresip
GH_PROJECT = re
-GH_TAGNAME = v2.0.1
-REVISION = 0
+GH_COMMIT = e52c244a802b124d3611b2127824db99785c1e2e
SHARED_LIBS = re 6.0
CATEGORIES += devel
Index: distinfo
===================================================================
RCS file: /cvs/ports/telephony/baresip/re/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 15 Jun 2021 06:51:31 -0000 1.17
+++ distinfo 11 Dec 2021 21:53:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (re-2.0.1.tar.gz) = Q6pDm5av91/ldoufnUneqXBC5C52R99Hs0VGV2Pi9+0=
-SIZE (re-2.0.1.tar.gz) = 342897
+SHA256 (re-e52c244a.tar.gz) = rr9pXJuPwAxysPuLdap9+eAupvaD/KaebSl3+j0Iz7w=
+SIZE (re-e52c244a.tar.gz) = 347952
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/telephony/baresip/re/patches/patch-Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 patch-Makefile
--- patches/patch-Makefile 15 Jun 2021 06:51:31 -0000 1.11
+++ patches/patch-Makefile 11 Dec 2021 21:47:32 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-Makefile,v 1.11 2021/06/
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -20,10 +20,6 @@ ABI_MAJOR := $(shell expr $(ABI_CUR) - $(ABI_AGE))
- PROJECT := re
- VERSION := $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
+@@ -28,10 +28,6 @@ else
+ VERSION := $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)-$(VER_PRE)
+ endif
-MK := mk/re.mk
-
@@ -13,7 +13,7 @@ Index: Makefile
# List of modules
MODULES += sip sipevent sipreg sipsess
MODULES += uri http httpauth msg websock
-@@ -54,6 +50,10 @@ endif
+@@ -62,6 +58,10 @@ endif
INCDIR := $(PREFIX)/include/re
MKDIR := $(PREFIX)/share/re
CFLAGS += -Iinclude
@@ -24,23 +24,23 @@ Index: Makefile
MODMKS := $(patsubst %,src/%/mod.mk,$(MODULES))
SHARED := libre$(LIB_SUFFIX)
-@@ -78,13 +78,11 @@ all: $(SHARED) $(STATIC)
+@@ -86,13 +86,11 @@ all: $(SHARED) $(STATIC)
- $(SHARED): $(OBJS)
+ $(SHARED): $(OBJS) libre.pc
- @echo " LD $@"
-- @$(LD) $(LFLAGS) $(SH_LFLAGS) $^ $(LIBS) -o $@
-+ $(LD) $(LFLAGS) $(SH_LFLAGS) $^ $(LIBS) -o $@
+- @$(LD) $(LFLAGS) $(SH_LFLAGS) $(OBJS) $(LIBS) -o $@
++ $(LD) $(LFLAGS) $(SH_LFLAGS) $(OBJS) $(LIBS) -o $@
- $(STATIC): $(OBJS)
+ $(STATIC): $(OBJS) libre.pc
- @echo " AR $@"
-- @$(AR) $(AFLAGS) $@ $^
-+ $(AR) $(AFLAGS) $@ $^
+- @$(AR) $(AFLAGS) $@ $(OBJS)
++ $(AR) $(AFLAGS) $@ $(OBJS)
ifneq ($(RANLIB),)
@$(RANLIB) $@
endif
-@@ -103,12 +101,11 @@ libre.pc:
+@@ -112,12 +110,11 @@ libre.pc: Makefile
@echo 'Libs.private: -L$${libdir} -lre ${LIBS}' >> libre.pc
@echo 'Cflags: -I$${includedir}' >> libre.pc
@@ -56,7 +56,7 @@ Index: Makefile
@mkdir -p $(patsubst %,$(BUILD)/%,$(sort $(dir $(SRCS))))
@touch $@
-@@ -132,7 +129,6 @@ else
+@@ -143,7 +140,6 @@ else
endif
$(INSTALL) -m 0755 $(STATIC) $(DESTDIR)$(LIBDIR)
$(INSTALL) -m 0644 libre.pc $(DESTDIR)$(LIBDIR)/pkgconfig
@@ -64,7 +64,7 @@ Index: Makefile
uninstall:
@rm -rf $(DESTDIR)$(INCDIR)
-@@ -144,13 +140,11 @@ uninstall:
+@@ -155,13 +151,11 @@ uninstall:
-include test.d
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/telephony/baresip/re/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 15 Jun 2021 06:51:31 -0000 1.3
+++ pkg/PLIST 11 Dec 2021 21:53:59 -0000
@@ -5,6 +5,7 @@ include/re/re_aes.h
include/re/re_base64.h
include/re/re_bfcp.h
include/re/re_bitv.h
+include/re/re_btrace.h
include/re/re_conf.h
include/re/re_crc32.h
include/re/re_dbg.h
