Re: update: net/swirc 3.2.3 -> 3.2.4

On 2020/04/08 17:10, Markus Uhlin wrote:
> Hi,
>
> Here comes an update for net/swirc 3.2.3 -> 3.2.4.
>
> Full changelog:
> https://github.com/uhlin/swirc/blob/master/CHANGELOG.md#324---2020-04-08
>
> I attach a diff for the port.
>
> Markus

> diff -ru /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 Wed Apr 8 18:39:38 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,7 +19,8 @@
> 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 \
> diff -ru /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 Wed Apr 8 18:41:59 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


Here's a modified diff which honours CFLAGS/CXXFLAGS/CC/CXX and
doesn't hide compiler command lines.


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/swirc/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 5 Apr 2020 18:08:29 -0000 1.6
+++ Makefile 8 Apr 2020 17:51:25 -0000
@@ -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 @@ COMPILER = base-clang ports-gcc
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>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/swirc/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 5 Apr 2020 18:08:29 -0000 1.6
+++ distinfo 8 Apr 2020 17:51:25 -0000
@@ -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
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 8 Apr 2020 17:51:25 -0000
@@ -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\\