CVS commit: pkgsrc/sysutils/radmind

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Fri Jul 12 13:26:40 UTC 2024

Modified Files:
        pkgsrc/sysutils/radmind: Makefile distinfo
        pkgsrc/sysutils/radmind/patches: patch-libsnet_snet.c
Removed Files:
        pkgsrc/sysutils/radmind: MESSAGE

Log Message:
libsnet:
  Do not build profiled version, it breaks on FreeBSD
  Fix function declaration
  Don't warn about K&R style function declarations

Remove obsolete MESSAGE


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/radmind/MESSAGE
cvs rdiff -u -r1.44 -r1.45 pkgsrc/sysutils/radmind/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/sysutils/radmind/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/radmind/patches/patch-libsnet_snet.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/radmind/Makefile
diff -u pkgsrc/sysutils/radmind/Makefile:1.44 pkgsrc/sysutils/radmind/Makefile:1.45
--- pkgsrc/sysutils/radmind/Makefile:1.44       Tue Oct 24 22:11:12 2023
+++ pkgsrc/sysutils/radmind/Makefile    Fri Jul 12 13:26:40 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2023/10/24 22:11:12 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2024/07/12 13:26:40 hauke Exp $
 #
 
 DISTNAME=      radmind-1.14.1
-PKGREVISION=   12
+PKGREVISION=   13
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=radmind/}
 
@@ -14,11 +14,21 @@ LICENSE=    modified-bsd
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=       --with-radminddir=${RADMINDDIR}
+CONFIGURE_ARGS+=       --enable-profiled=no
 CONFIGURE_ENV+=                diffpath=${TOOLS_DIFF:Q}
 # XXX configure script checks for path to echo, which pkgsrc does not
 # provide, so we need to side-step {echopath}.
 CONFIGURE_ENV+=                ac_cv_path_echopath=${TOOLS_ECHO:Q}
 
+.include "../../mk/compiler.mk"
+
+USE_LANGUAGES=         c
+USE_CC_FEATURES=       c99
+# libsnet uses K&R function declarations
+.if !empty(CC_VERSION:Mclang-1[5-9].*) || !empty(CC_VERSION:Mclang-[2-9][1-9].*)
+CFLAGS+=               -Wno-deprecated-non-prototype
+.endif
+
 MAKE_JOBS_SAFE=                no
 
 BUILD_TARGET=          all man rash

Index: pkgsrc/sysutils/radmind/distinfo
diff -u pkgsrc/sysutils/radmind/distinfo:1.27 pkgsrc/sysutils/radmind/distinfo:1.28
--- pkgsrc/sysutils/radmind/distinfo:1.27       Tue Oct 26 11:20:06 2021
+++ pkgsrc/sysutils/radmind/distinfo    Fri Jul 12 13:26:40 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2021/10/26 11:20:06 nia Exp $
+$NetBSD: distinfo,v 1.28 2024/07/12 13:26:40 hauke Exp $
 
 BLAKE2s (radmind-1.14.1.tar.gz) = ecab16cf79583ade0b5064fb8f61e2882017b696f04184c6825b9e2cf8d1c34e
 SHA512 (radmind-1.14.1.tar.gz) = bccf9681a6899be3b500065237dd1e04cd83ffb6f9be0e355412e7b0c556325f7d13435cec65a8a5e156e4411da915744f01a615472f6361d52c4d54d8be20eb
@@ -13,7 +13,7 @@ SHA1 (patch-configure.ac) = 12968655962a
 SHA1 (patch-ktcheck.c) = 83c03e417fc93863a8575b0cb2f93e09cba1d937
 SHA1 (patch-largefile.h) = 806f12878aa628f30355b82ac23a5c92740f42a1
 SHA1 (patch-lcksum.c) = 7b7b4da338bb13f2508c5b22307263eaedb32347
-SHA1 (patch-libsnet_snet.c) = 29484ae6775a1fe9d02980a84503762b55a093e9
+SHA1 (patch-libsnet_snet.c) = f47b805d68c1e55581503fe33a748bd495c5db33
 SHA1 (patch-openssl__compat.c) = 0076abec076f29764d86ec1fc3b0bf7092c7dd18
 SHA1 (patch-openssl__compat.h) = d73ce65dde6e48e378feded637b7b6a4d8e36047
 SHA1 (patch-ra.sh) = 05ba697814bf4833a9c38f881e43639067afba29

Index: pkgsrc/sysutils/radmind/patches/patch-libsnet_snet.c
diff -u pkgsrc/sysutils/radmind/patches/patch-libsnet_snet.c:1.2 pkgsrc/sysutils/radmind/patches/patch-libsnet_snet.c:1.3
--- pkgsrc/sysutils/radmind/patches/patch-libsnet_snet.c:1.2    Tue Dec 18 14:16:18 2018
+++ pkgsrc/sysutils/radmind/patches/patch-libsnet_snet.c        Fri Jul 12 13:26:40 2024
@@ -1,10 +1,20 @@
-$NetBSD: patch-libsnet_snet.c,v 1.2 2018/12/18 14:16:18 hauke Exp $
+$NetBSD: patch-libsnet_snet.c,v 1.3 2024/07/12 13:26:40 hauke Exp $
 
-Remove stale extern declaration
+snet_open(): Add missing function parameter
+
+Remove stale errno declaration
 
 --- libsnet/snet.c.orig        2010-12-13 03:43:00.000000000 +0000
 +++ libsnet/snet.c
-@@ -792,7 +792,6 @@ snet_read1( sn, buf, len, tv )
+@@ -102,6 +102,7 @@ snet_open( path, flags, mode, max )
+     char      *path;
+     int               flags;
+     int               mode;
++    int               max;
+ {
+     int               fd;
+ 
+@@ -792,7 +793,6 @@ snet_read1( sn, buf, len, tv )
      fd_set            fds;
      ssize_t           rc;
      struct timeval    default_tv;
@@ -12,7 +22,7 @@ Remove stale extern declaration
      int                       oflags = 0, dontblock = 0;
  
      if (( tv == NULL ) && ( sn->sn_flag & SNET_READ_TIMEOUT )) {
-@@ -976,7 +975,6 @@ snet_getline( sn, tv )
+@@ -976,7 +976,6 @@ snet_getline( sn, tv )
  {
      char              *eol, *line;
      ssize_t           rc;