Hi!
Below is an update for re and restund from telephony/baresip. I grouped
these updates together because of changes in Makefile.inc that are
required by both ports.
--
Dmitrij D. Czarkoff
Index: Makefile.inc
===================================================================
RCS file: /var/cvs/ports/telephony/baresip/Makefile.inc,v
retrieving revision 1.1.1.1
diff -u -p -n -u -r1.1.1.1 Makefile.inc
--- Makefile.inc 25 Sep 2014 19:32:37 -0000 1.1.1.1
+++ Makefile.inc 11 Dec 2014 07:29:42 -0000
@@ -25,7 +25,7 @@ MAKE_FLAGS += LD="${CC}"
MAKE_FLAGS += APP_LFLAGS+="-rdynamic"
MAKE_FLAGS += AFLAGS="${ARFLAGS}"
MAKE_FLAGS += BUILD="build-${ARCH}"
-MAKE_FLAGS += USE_OPENSSL=yes USE_TLS=yes
+MAKE_FLAGS += USE_OPENSSL=yes USE_TLS=yes USE_DTLS=yes
MAKE_FLAGS += USE_ZLIB=yes
MAKE_FLAGS += HAVE_PTHREAD=1 HAVE_PTHREAD_RWLOCK=1 HAVE_LIBPTHREAD=1
MAKE_FLAGS += HAVE_GETIFADDRS=1
@@ -48,9 +48,9 @@ FAKE_FLAGS += PREFIX=${PREFIX}
CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include \
-DOPENBSD -DOS=\"openbsd\" -DARCH=\"${ARCH}\" \
-DVERSION=\"${V}\" -fPIC -std=c99 -pedantic \
- -DUSE_OPENSSL -DUSE_TLS -DUSE_ZLIB -DHAVE_PTHREAD \
- -DHAVE_GETIFADDRS -DHAVE_STRERROR_R -DHAVE_GETOPT \
- -DHAVE_INTTYPES_H -DHAVE_NET_ROUTE_H \
+ -DUSE_OPENSSL -DUSE_TLS -DUSE_DTLS -DUSE_ZLIB \
+ -DHAVE_PTHREAD -DHAVE_GETIFADDRS -DHAVE_STRERROR_R \
+ -DHAVE_GETOPT -DHAVE_INTTYPES_H -DHAVE_NET_ROUTE_H \
-DHAVE_SYS_SYSCTL_H -DHAVE_STDBOOL_H -DHAVE_INET6 \
-DHAVE_LIBRESOLV -DHAVE_SYSLOG -DHAVE_FORK \
-DHAVE_INET_NTOP -DHAVE_PWD_H -DHAVE_POLL \
Index: re/Makefile
===================================================================
RCS file: /var/cvs/ports/telephony/baresip/re/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -n -u -r1.1.1.1 Makefile
--- re/Makefile 25 Sep 2014 19:32:37 -0000 1.1.1.1
+++ re/Makefile 11 Dec 2014 06:09:39 -0000
@@ -2,9 +2,9 @@
COMMENT = portable library for real-time communications
-V = 0.4.9
+V = 0.4.11
DISTNAME = re-${V}
-SHARED_LIBS = re 0.0
+SHARED_LIBS = re 0.1
CATEGORIES += devel
WANTLIB = crypto pthread ssl z
Index: re/distinfo
===================================================================
RCS file: /var/cvs/ports/telephony/baresip/re/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -n -u -r1.1.1.1 distinfo
--- re/distinfo 25 Sep 2014 19:32:37 -0000 1.1.1.1
+++ re/distinfo 11 Dec 2014 06:09:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (re-0.4.9.tar.gz) = A5xk2FOAEbvyOZo2QD7FneEBUd4JhRQIVvPKwXH6KMU=
-SIZE (re-0.4.9.tar.gz) = 291214
+SHA256 (re-0.4.11.tar.gz) = gmQZLvH8HHrMJB34u718WvXquxOnK0AIDv7bsJDKWII=
+SIZE (re-0.4.11.tar.gz) = 295558
Index: re/patches/patch-src_dns_mod_mk
===================================================================
RCS file: re/patches/patch-src_dns_mod_mk
diff -N re/patches/patch-src_dns_mod_mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ re/patches/patch-src_dns_mod_mk 11 Dec 2014 07:00:35 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/dns/mod.mk.orig Thu Dec 11 08:00:09 2014
++++ src/dns/mod.mk Thu Dec 11 08:00:21 2014
+@@ -13,7 +13,7 @@ SRCS += dns/rr.c
+ SRCS += dns/rrlist.c
+
+ ifneq ($(HAVE_LIBRESOLV),)
+-ifeq ($(filter-out netbsd openbsd,$(OS)),)
++ifeq ($(filter-out netbsd,$(OS)),)
+ SRCS += dns/bsd/srv.c
+ else
+ SRCS += dns/res.c
Index: restund/Makefile
===================================================================
RCS file: /var/cvs/ports/telephony/baresip/restund/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -n -u -r1.1.1.1 Makefile
--- restund/Makefile 25 Sep 2014 19:32:37 -0000 1.1.1.1
+++ restund/Makefile 11 Dec 2014 07:20:02 -0000
@@ -4,7 +4,7 @@ SHARED_ONLY = Yes
COMMENT = modular and flexible STUN and TURN Server
-V = 0.4.2
+V = 0.4.11
DISTNAME = restund-${V}
WANTLIB = c crypto mysqlclient pthread re ssl z
Index: restund/distinfo
===================================================================
RCS file: /var/cvs/ports/telephony/baresip/restund/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -n -u -r1.1.1.1 distinfo
--- restund/distinfo 25 Sep 2014 19:32:37 -0000 1.1.1.1
+++ restund/distinfo 11 Dec 2014 07:23:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (restund-0.4.2.tar.gz) = 21Jgk51AyyzlMQdb7wK51kMQZ73VLzFopvJSRr33ufI=
-SIZE (restund-0.4.2.tar.gz) = 177607
+SHA256 (restund-0.4.11.tar.gz) = 1GMN+4d38SzEjtEY2g6mRFvGDpT/kWqwyl1DbHS9wtc=
+SIZE (restund-0.4.11.tar.gz) = 182923
Index: restund/patches/patch-Makefile
===================================================================
RCS file: /var/cvs/ports/telephony/baresip/restund/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -n -u -r1.1.1.1 patch-Makefile
--- restund/patches/patch-Makefile 25 Sep 2014 19:32:37 -0000 1.1.1.1
+++ restund/patches/patch-Makefile 11 Dec 2014 07:27:41 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2014/09/25 19:32:37 sthen Exp $
---- Makefile.orig Thu Sep 25 10:51:23 2014
-+++ Makefile Thu Sep 25 10:51:33 2014
-@@ -79,16 +79,14 @@ all: $(MOD_BINS) $(BIN)
+--- Makefile.orig Wed Dec 10 09:39:12 2014
++++ Makefile Thu Dec 11 08:25:18 2014
+@@ -97,16 +97,14 @@ all: $(MOD_BINS) $(BIN)
# GPROF requires static linking
$(BIN): $(OBJS)
Index: restund/patches/patch-mk_mod_mk
===================================================================
RCS file: restund/patches/patch-mk_mod_mk
diff -N restund/patches/patch-mk_mod_mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ restund/patches/patch-mk_mod_mk 11 Dec 2014 07:27:41 -0000
@@ -0,0 +1,33 @@
+$OpenBSD$
+--- mk/mod.mk.orig Thu Dec 11 08:26:15 2014
++++ mk/mod.mk Thu Dec 11 08:27:30 2014
+@@ -19,15 +19,13 @@ ifeq ($(STATIC),)
+ #
+
+ $(MOD)$(MOD_SUFFIX): $($(MOD)_OBJS)
+- @echo " LD [M] $@"
+- @$(LD) $(LFLAGS) $(SH_LFLAGS) $(MOD_LFLAGS) $($(basename $@)_OBJS) \
++ $(LD) $(LFLAGS) $(SH_LFLAGS) $(MOD_LFLAGS) $($(basename $@)_OBJS) \
+ $($(basename $@)_LFLAGS) -L$(LIBRE_SO) -lre -o $@
+
+ $(BUILD)/modules/$(MOD)/%.o: modules/$(MOD)/%.c $(BUILD) Makefile mk/mod.mk \
+ modules/$(MOD)/module.mk
+- @echo " CC [M] $@"
+- @mkdir -p $(dir $@)
+- @$(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
++ mkdir -p $(dir $@)
++ $(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
+
+ else
+
+@@ -41,8 +39,7 @@ APP_LFLAGS := $(APP_LFLAGS) $($(MOD)_LFLAGS)
+
+ $(BUILD)/modules/$(MOD)/%.o: modules/$(MOD)/%.c $(BUILD) Makefile mk/mod.mk \
+ modules/$(MOD)/module.mk
+- @echo " CC [m] $@"
+- @mkdir -p $(dir $@)
+- @$(CC) $(CFLAGS) -DMOD_NAME=\"$(MOD)\" -c $< -o $@ $(DFLAGS)
++ mkdir -p $(dir $@)
++ $(CC) $(CFLAGS) -DMOD_NAME=\"$(MOD)\" -c $< -o $@ $(DFLAGS)
+
+ endif
Index: restund/pkg/PLIST
===================================================================
RCS file: /var/cvs/ports/telephony/baresip/restund/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -n -u -r1.1.1.1 PLIST
--- restund/pkg/PLIST 25 Sep 2014 19:32:37 -0000 1.1.1.1
+++ restund/pkg/PLIST 11 Dec 2014 07:40:54 -0000
@@ -5,7 +5,9 @@ lib/restund/
lib/restund/modules/
lib/restund/modules/auth.so
lib/restund/modules/binding.so
+lib/restund/modules/filedb.so
lib/restund/modules/mysql_ser.so
+lib/restund/modules/restauth.so
lib/restund/modules/stat.so
lib/restund/modules/status.so
lib/restund/modules/syslog.so
