CVS commit: pkgsrc/net

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Tue, 18 Jul 2023 18:36:31 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul 18 18:36:31 UTC 2023

Modified Files:
        pkgsrc/net/bind918: Makefile
        pkgsrc/net/filezilla: Makefile
        pkgsrc/net/lagrange: Makefile
        pkgsrc/net/libtorrent: Makefile
        pkgsrc/net/llnlxdir: distinfo
        pkgsrc/net/powerdns: Makefile.common
        pkgsrc/net/powerdns-recursor: Makefile
        pkgsrc/net/rtorrent: Makefile
        pkgsrc/net/ser: Makefile
        pkgsrc/net/transmission: Makefile.common
        pkgsrc/net/transmission-qt: Makefile

Log Message:
net: Adapt packages to USE_(CC|CXX)_FEATURES where possible


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/bind918/Makefile
cvs rdiff -u -r1.156 -r1.157 pkgsrc/net/filezilla/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/lagrange/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/net/libtorrent/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/llnlxdir/distinfo
cvs rdiff -u -r1.38 -r1.39 pkgsrc/net/powerdns/Makefile.common
cvs rdiff -u -r1.45 -r1.46 pkgsrc/net/powerdns-recursor/Makefile
cvs rdiff -u -r1.87 -r1.88 pkgsrc/net/rtorrent/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/ser/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/transmission/Makefile.common
cvs rdiff -u -r1.76 -r1.77 pkgsrc/net/transmission-qt/Makefile

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

Modified files:

Index: pkgsrc/net/bind918/Makefile
diff -u pkgsrc/net/bind918/Makefile:1.14 pkgsrc/net/bind918/Makefile:1.15
--- pkgsrc/net/bind918/Makefile:1.14    Thu Jul 13 13:45:43 2023
+++ pkgsrc/net/bind918/Makefile Tue Jul 18 18:36:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2023/07/13 13:45:43 nia Exp $
+# $NetBSD: Makefile,v 1.15 2023/07/18 18:36:29 nia Exp $
 
 DISTNAME=      bind-${BIND_VERSION}
 PKGNAME=       ${DISTNAME:S/-P/pl/}
@@ -23,6 +23,8 @@ BUILD_DEFS+=  BIND_DIR VARBASE
 
 USE_TOOLS+=            aclocal autoconf automake pax perl pkg-config
 USE_LIBTOOL=           yes
+# Requires support for C11 atomics.
+USE_CC_FEATURES+=      c11
 GNU_CONFIGURE=         yes
 CHECK_FILES_SKIP=      bin/tests/system/system-test-driver.sh
 MAKE_ENV+=             WRKDIR=${WRKDIR} PREFIX=${PREFIX}

Index: pkgsrc/net/filezilla/Makefile
diff -u pkgsrc/net/filezilla/Makefile:1.156 pkgsrc/net/filezilla/Makefile:1.157
--- pkgsrc/net/filezilla/Makefile:1.156 Sun Apr 30 05:11:47 2023
+++ pkgsrc/net/filezilla/Makefile       Tue Jul 18 18:36:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.156 2023/04/30 05:11:47 wiz Exp $
+# $NetBSD: Makefile,v 1.157 2023/07/18 18:36:29 nia Exp $
 
 VERSION=       3.64.0
 DISTNAME=      FileZilla_${VERSION}_src
@@ -23,8 +23,7 @@ CONFIGURE_ARGS+=      --disable-autoupdateche
 CONFIGURE_ENV+=                ac_cv_path_xdgopen=firefox
 #CONFIGURE_ENV+=       ac_cv_path_WX_CONFIG_PATH=${PREFIX}/bin/wx-config
 
-# For C++17.
-GCC_REQD+=             7
+USE_CXX_FEATURES+=     c++17
 
 .include "options.mk"
 .include "../../databases/sqlite3/buildlink3.mk"

Index: pkgsrc/net/lagrange/Makefile
diff -u pkgsrc/net/lagrange/Makefile:1.14 pkgsrc/net/lagrange/Makefile:1.15
--- pkgsrc/net/lagrange/Makefile:1.14   Wed Jul 12 20:05:53 2023
+++ pkgsrc/net/lagrange/Makefile        Tue Jul 18 18:36:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2023/07/12 20:05:53 nia Exp $
+# $NetBSD: Makefile,v 1.15 2023/07/18 18:36:29 nia Exp $
 
 DISTNAME=      lagrange-1.15.8
 PKGREVISION=   1
@@ -13,8 +13,7 @@ LICENSE=      2-clause-bsd
 USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config
 
-# GCC 4.9 added support for C11 atomics.
-GCC_REQD+=     4.9
+USE_CC_FEATURES+=      c11
 
 DEPENDS+=      zip-[0-9]*:../../archivers/zip
 

Index: pkgsrc/net/libtorrent/Makefile
diff -u pkgsrc/net/libtorrent/Makefile:1.62 pkgsrc/net/libtorrent/Makefile:1.63
--- pkgsrc/net/libtorrent/Makefile:1.62 Sat Jan 18 21:48:20 2020
+++ pkgsrc/net/libtorrent/Makefile      Tue Jul 18 18:36:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2020/01/18 21:48:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.63 2023/07/18 18:36:29 nia Exp $
 
 DISTNAME=      libtorrent-0.13.8
 PKGREVISION=   1
@@ -10,22 +10,15 @@ HOMEPAGE=   https://github.com/rakshasa/li
 COMMENT=       BitTorrent library written in C++ for *nix
 LICENSE=       gnu-gpl-v2
 
-USE_LANGUAGES=         c c++11
+USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config
+USE_CXX_FEATURES+=     c++11
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --disable-debug
 LDFLAGS+=              -lz
 
 .include "../../mk/bsd.prefs.mk"
-.if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "powerpc" || \
-    ${MACHINE_ARCH} == "x86_64"
-GCC_REQD+=             4.1.3
-.else
-GCC_REQD+=             4.2.1
-.endif
 
 # configure check is fooled by trap & emulate of unaligned access on alpha
 .if (${MACHINE_ARCH} == "alpha")

Index: pkgsrc/net/llnlxdir/distinfo
diff -u pkgsrc/net/llnlxdir/distinfo:1.7 pkgsrc/net/llnlxdir/distinfo:1.8
--- pkgsrc/net/llnlxdir/distinfo:1.7    Tue Oct 26 11:05:57 2021
+++ pkgsrc/net/llnlxdir/distinfo        Tue Jul 18 18:36:30 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 11:05:57 nia Exp $
+$NetBSD: distinfo,v 1.8 2023/07/18 18:36:30 nia Exp $
 
 BLAKE2s (llnlxdir2_1_2.tar.Z) = e98238f2d9a18a6fde57d6156fd5eabcf3650d3edd175252017ce12a2ecee641
 SHA512 (llnlxdir2_1_2.tar.Z) = 02526c0457bdaaab31351ff230cb4ecbcdb77970399a823df1302d90dea8df0dd296461e1515187851af0e3ac2b84f56f82b760508595c6e014f68a2eae276a9
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 4bc2943612db8b22d7b782
 SHA1 (patch-ab) = 977e88048bccc4ba8fe0fd95709d1762e4b1ece5
 SHA1 (patch-ac) = bfa98390b65d2bc26fa23212a349aaadd7a0d300
 SHA1 (patch-ad) = c46dd7785488b42c90d731d78fca87c80f549e81
+SHA1 (patch-str.h) = 5a8d4ee451833700e9acb8d6901fe24f99f8e9f4

Index: pkgsrc/net/powerdns/Makefile.common
diff -u pkgsrc/net/powerdns/Makefile.common:1.38 pkgsrc/net/powerdns/Makefile.common:1.39
--- pkgsrc/net/powerdns/Makefile.common:1.38    Wed Jul 12 20:23:14 2023
+++ pkgsrc/net/powerdns/Makefile.common Tue Jul 18 18:36:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2023/07/12 20:23:14 nia Exp $
+# $NetBSD: Makefile.common,v 1.39 2023/07/18 18:36:30 nia Exp $
 # used by net/powerdns/Makefile.backend
 
 PDNS_VERSION=  4.6.4
@@ -20,8 +20,7 @@ GNU_CONFIGURE=                yes
 CONFIGURE_ARGS+=       --with-boost=${BUILDLINK_PREFIX.boost-headers}
 CONFIGURE_ARGS+=       --with-lua=lua-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
 
-# "A compiler with support for C++17 language features is required."
-GCC_REQD+=             7
+USE_CXX_FEATURES+=     c++17
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"

Index: pkgsrc/net/powerdns-recursor/Makefile
diff -u pkgsrc/net/powerdns-recursor/Makefile:1.45 pkgsrc/net/powerdns-recursor/Makefile:1.46
--- pkgsrc/net/powerdns-recursor/Makefile:1.45  Thu Jul 13 13:49:16 2023
+++ pkgsrc/net/powerdns-recursor/Makefile       Tue Jul 18 18:36:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2023/07/13 13:49:16 nia Exp $
+# $NetBSD: Makefile,v 1.46 2023/07/18 18:36:30 nia Exp $
 
 DISTNAME=      pdns-recursor-4.7.3
 PKGNAME=       ${DISTNAME:S/pdns/powerdns/}
@@ -11,10 +11,12 @@ HOMEPAGE=   https://www.powerdns.com/
 COMMENT=       PowerDNS resolver/recursing nameserver
 LICENSE=       gnu-gpl-v2
 
-USE_LANGUAGES=         c c++11
+USE_LANGUAGES=         c c++
+USE_CXX_FEATURES+=     c++17
 USE_TOOLS+=            gmake pkg-config
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --without-net-snmp
+
 # currently not portable
 CONFIGURE_ENV.NetBSD+= ac_cv_search_pthread_setaffinity_np=no
 

Index: pkgsrc/net/rtorrent/Makefile
diff -u pkgsrc/net/rtorrent/Makefile:1.87 pkgsrc/net/rtorrent/Makefile:1.88
--- pkgsrc/net/rtorrent/Makefile:1.87   Wed Apr 19 08:11:12 2023
+++ pkgsrc/net/rtorrent/Makefile        Tue Jul 18 18:36:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2023/04/19 08:11:12 adam Exp $
+# $NetBSD: Makefile,v 1.88 2023/07/18 18:36:30 nia Exp $
 
 DISTNAME=      rtorrent-0.9.8
 PKGREVISION=   11
@@ -10,22 +10,13 @@ HOMEPAGE=   https://github.com/rakshasa/rt
 COMMENT=       Ncurses based torrent client with support for sessions
 LICENSE=       gnu-gpl-v2
 
-USE_LANGUAGES=         c c++11
+USE_LANGUAGES=         c c++
+USE_CXX_FEATURES+=     c++11
 USE_LIBTOOL=           yes
 USE_NCURSES=           yes # chgat
 USE_TOOLS+=            gmake pkg-config
 GNU_CONFIGURE=         yes
 
-.include "../../mk/bsd.prefs.mk"
-.if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "powerpc" || \
-    ${MACHINE_ARCH} == "x86_64"
-GCC_REQD+=             4.1.3
-.else
-GCC_REQD+=             4.2.1
-.endif
-
 .include "../../mk/pthread.buildlink3.mk"
 LDFLAGS+=      ${PTHREAD_LDFLAGS}
 

Index: pkgsrc/net/ser/Makefile
diff -u pkgsrc/net/ser/Makefile:1.10 pkgsrc/net/ser/Makefile:1.11
--- pkgsrc/net/ser/Makefile:1.10        Mon Nov 21 18:20:44 2022
+++ pkgsrc/net/ser/Makefile     Tue Jul 18 18:36:31 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2022/11/21 18:20:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2023/07/18 18:36:31 nia Exp $
 #
 
 DISTNAME=      ser-0.8.14_src
 PKGNAME=       ser-0.8.14
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    net comms
 MASTER_SITES=  ftp://ftp.berlios.de/pub/ser/0.8.14/src/
 
@@ -25,10 +25,10 @@ REQD_DIRS=  ${PREFIX}/${EGDIR}
 MAKE_ENV+=     BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread:Q}
 MAKE_ENV+=     cfg-prefix=${PREFIX}/share/examples
 MAKE_ENV+=     EGDIR=${EGDIR:Q}
+# Override its attempt to override LDFLAGS
+MAKE_FLAGS+=   LDFLAGS=${LDFLAGS:Q}
 INSTALL_ENV+=  BASEDIR=${DESTDIR}
 
-BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,-O2 rm:-Wl,-E
-
 CHECK_PORTABILITY_SKIP+=       scripts/sc
 
 INSTALLATION_DIRS+=    ${EGDIR}

Index: pkgsrc/net/transmission/Makefile.common
diff -u pkgsrc/net/transmission/Makefile.common:1.17 pkgsrc/net/transmission/Makefile.common:1.18
--- pkgsrc/net/transmission/Makefile.common:1.17        Wed Jul 12 20:38:31 2023
+++ pkgsrc/net/transmission/Makefile.common     Tue Jul 18 18:36:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2023/07/12 20:38:31 nia Exp $
+# $NetBSD: Makefile.common,v 1.18 2023/07/18 18:36:31 nia Exp $
 #
 # used by net/transmission-common/Makefile
 # used by net/transmission-gtk/Makefile
@@ -19,10 +19,8 @@ COMMENT?=    Free, lightweight BitTorrent c
 # optionally, gnu-gpl-v3 instead of gnu-gpl-v2
 LICENSE=       gnu-gpl-v2 AND mit
 
-# Requires a C++17 compiler.
-GCC_REQD+=     7
-
 USE_LANGUAGES=         c c++
+USE_CXX_FEATURES+=     c++17
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config intltool msgfmt
 

Index: pkgsrc/net/transmission-qt/Makefile
diff -u pkgsrc/net/transmission-qt/Makefile:1.76 pkgsrc/net/transmission-qt/Makefile:1.77
--- pkgsrc/net/transmission-qt/Makefile:1.76    Mon May 22 21:00:42 2023
+++ pkgsrc/net/transmission-qt/Makefile Tue Jul 18 18:36:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2023/05/22 21:00:42 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2023/07/18 18:36:31 nia Exp $
 
 PKGNAME=       transmission-qt-${VERSION}
 PKGREVISION=   2
@@ -16,7 +16,7 @@ CMAKE_ARGS+=  -DENABLE_CLI=OFF
 CMAKE_ARGS+=   -DINSTALL_DOC=OFF
 CMAKE_ARGS+=   -DENABLE_TESTS=OFF
 
-GCC_REQD+=             8 # std::filesystem
+USE_CXX_FEATURES+=     filesystem
 
 CONFLICTS+=            Transmission-gui-[0-9]*

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/news/neix
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/news/neix
Indexes:

Home | Main Index | Thread Index | Old Index