Looks good to me.

The reason I made building less noisy is because it's easier to see
important compiler messages like warnings.

I further detected that the newly introduced option -P didn't work as
expected. It actually disables SASL authentication but it doesn't end
IRCv3 capability negotiation. So I generated a patch for that too.

Yours faithfully
Markus
diff -Nru /tmp/ports/net/swirc/Makefile /usr/ports/net/swirc/Makefile
--- /tmp/ports/net/swirc/Makefile       Wed Apr  8 18:52:57 2020
+++ /usr/ports/net/swirc/Makefile       Thu Apr  9 15:15:54 2020
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.6 2020/04/05 18:08:29 solene Exp $
 
 COMMENT =      curses icb and irc client
-DISTNAME =     swirc-3.2.3
+DISTNAME =     swirc-3.2.4
 CATEGORIES =   net
 HOMEPAGE =     https://www.nifty-networks.net/swirc/
 
@@ -19,11 +19,13 @@
 LIB_DEPENDS =          devel/libidn net/curl
 CONFIGURE_STYLE =      simple
 
-NO_TEST =              Yes
+TEST_DEPENDS =         devel/cmocka
+TEST_TARGET =          check
 
 MAKE_FLAGS =           DEST_CONFMAN=${WRKINST}${PREFIX}/man/man5 \
                        DEST_MANUAL=${WRKINST}${PREFIX}/man/man1 \
                        INSTALL_DEPS=swirc src/swirc.1 swirc.conf.5 \
-                       PREFIX=${PREFIX}
+                       PREFIX=${PREFIX} CC="${CC}" CXX="${CXX}" \
+                       E=@: Q=
 
 .include <bsd.port.mk>
diff -Nru /tmp/ports/net/swirc/distinfo /usr/ports/net/swirc/distinfo
--- /tmp/ports/net/swirc/distinfo       Wed Apr  8 18:52:57 2020
+++ /usr/ports/net/swirc/distinfo       Thu Apr  9 15:42:53 2020
@@ -1,2 +1,2 @@
-SHA256 (swirc-3.2.3.tgz) = UuJzu8nqY4SEGUeFjWDLdAplvYDSJXx8qznZpOuRnwY=
-SIZE (swirc-3.2.3.tgz) = 230048
+SHA256 (swirc-3.2.4.tgz) = yMFe62zHaKG5aVIxRCD+pgyUK02tJfYxjSjdLwCgK8k=
+SIZE (swirc-3.2.4.tgz) = 241352
diff -Nru /tmp/ports/net/swirc/patches/patch-configure 
/usr/ports/net/swirc/patches/patch-configure
--- /tmp/ports/net/swirc/patches/patch-configure        Thu Jan  1 01:00:00 1970
+++ /usr/ports/net/swirc/patches/patch-configure        Thu Apr  9 15:15:54 2020
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Index: configure
+--- configure.orig
++++ configure
+@@ -50,9 +50,9 @@ SHARED_FLAGS=-DBSD=1\\
+       -I/usr/local/include\\
+       -Wall
+ CC=cc
+-CFLAGS=\$(SHARED_FLAGS) -std=c99
++CFLAGS=\$(SHARED_FLAGS) -std=c99 ${CFLAGS}
+ CXX=c++
+-CXXFLAGS=\$(SHARED_FLAGS) -std=c++14
++CXXFLAGS=\$(SHARED_FLAGS) -std=c++14 ${CXXFLAGS}
+ LDFLAGS=-L/usr/local/lib
+ LDLIBS=-lcrypto\\
+       -lcurl\\
diff -Nru /tmp/ports/net/swirc/patches/patch-src_events_cap_c 
/usr/ports/net/swirc/patches/patch-src_events_cap_c
--- /tmp/ports/net/swirc/patches/patch-src_events_cap_c Thu Jan  1 01:00:00 1970
+++ /usr/ports/net/swirc/patches/patch-src_events_cap_c Thu Apr  9 15:33:34 2020
@@ -0,0 +1,38 @@
+$OpenBSD$
+
+Index: src/events/cap.c
+--- src/events/cap.c.orig
++++ src/events/cap.c
+@@ -89,7 +89,7 @@ shouldContinueCapabilityNegotiation_case1()
+     return (config_bool_unparse("away_notify", false) ||
+           config_bool_unparse("invite_notify", false) ||
+           config_bool_unparse("ircv3_server_time", false) ||
+-          config_bool_unparse("sasl", false));
++          sasl_is_enabled());
+ }
+ 
+ static bool
+@@ -97,20 +97,20 @@ shouldContinueCapabilityNegotiation_case2()
+ {
+     return (config_bool_unparse("invite_notify", false) ||
+           config_bool_unparse("ircv3_server_time", false) ||
+-          config_bool_unparse("sasl", false));
++          sasl_is_enabled());
+ }
+ 
+ static bool
+ shouldContinueCapabilityNegotiation_case3()
+ {
+     return (config_bool_unparse("ircv3_server_time", false) ||
+-          config_bool_unparse("sasl", false));
++          sasl_is_enabled());
+ }
+ 
+ static bool
+ shouldContinueCapabilityNegotiation_case4()
+ {
+-    return (config_bool_unparse("sasl", false));
++    return (sasl_is_enabled());
+ }
+ 
+ /**

Reply via email to