diff options
| author | rillig <rillig@pkgsrc.org> | 2019-11-03 11:45:28 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-11-03 11:45:28 +0000 |
| commit | 6d1d2ca41e824dc78d236dd7507b72a54ede5a88 (patch) | |
| tree | 97ee76f3981200121bbba776c699b2cf57cc3af5 | |
| parent | c541c77da9d5d98e1ba6000a10bd6ad0d291105c (diff) | |
| download | pkgsrc-6d1d2ca41e824dc78d236dd7507b72a54ede5a88.tar.gz | |
net: align variable assignments
pkglint -Wall -F --only aligned --only indent -r
No manual corrections.
255 files changed, 1072 insertions, 1072 deletions
diff --git a/net/6tunnel/Makefile b/net/6tunnel/Makefile index a3f335880e4..d388a7bbecd 100644 --- a/net/6tunnel/Makefile +++ b/net/6tunnel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2016/09/11 12:46:46 mef Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:28 rillig Exp $ # DISTNAME= 6tunnel-0.11 @@ -10,7 +10,7 @@ HOMEPAGE= http://toxygen.net/6tunnel/ COMMENT= Tunnelling for applications that don't speak IPv6 LICENSE= gnu-gpl-v2 -NOT_FOR_PLATFORM+= Interix-*-* # no IPv6 support +NOT_FOR_PLATFORM+= Interix-*-* # no IPv6 support LDFLAGS.SunOS+= -lsocket -lnsl diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile index 93c260d9f85..4d3fb46ff5c 100644 --- a/net/DarwinStreamingServer/Makefile +++ b/net/DarwinStreamingServer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2019/08/11 13:22:06 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/03 11:45:28 rillig Exp $ DISTNAME= DarwinStreamingSrvr5.5.5-Source PKGNAME= DarwinStreamingServer-5.5.5 @@ -13,9 +13,9 @@ LICENSE= apple-public-source-license MAKE_JOBS_SAFE= no -RESTRICTED= Under APSL (see http://www.opensource.apple.com/apsl/). -NO_BIN_ON_CDROM=${RESTRICTED} -NO_BIN_ON_FTP= ${RESTRICTED} +RESTRICTED= Under APSL (see http://www.opensource.apple.com/apsl/). +NO_BIN_ON_CDROM= ${RESTRICTED} +NO_BIN_ON_FTP= ${RESTRICTED} USE_LANGUAGES= c c++03 @@ -71,10 +71,10 @@ REPLACE_PERL+= WebAdmin/src/streamingadminserver.pl REPLACE_PERL+= WinNTSupport/WinPasswdAssistant.pl PKG_SYSCONFSUBDIR= streaming -CONF_FILES= share/examples/streaming/qtgroups ${PKG_SYSCONFDIR}/qtgroups -CONF_FILES+= share/examples/streaming/qtusers ${PKG_SYSCONFDIR}/qtusers -CONF_FILES+= share/examples/streaming/relayconfig.xml-Sample ${PKG_SYSCONFDIR}/relayconfig.xml -CONF_FILES+= share/examples/streaming/streamingserver.xml-POSIX ${PKG_SYSCONFDIR}/streamingserver.xml +CONF_FILES= share/examples/streaming/qtgroups ${PKG_SYSCONFDIR}/qtgroups +CONF_FILES+= share/examples/streaming/qtusers ${PKG_SYSCONFDIR}/qtusers +CONF_FILES+= share/examples/streaming/relayconfig.xml-Sample ${PKG_SYSCONFDIR}/relayconfig.xml +CONF_FILES+= share/examples/streaming/streamingserver.xml-POSIX ${PKG_SYSCONFDIR}/streamingserver.xml SUBST_CLASSES+= makefile SUBST_STAGE.makefile= pre-configure diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile index 5034c5c4610..038a609c269 100644 --- a/net/ORBit/Makefile +++ b/net/ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.126 2017/07/30 22:47:53 wiz Exp $ +# $NetBSD: Makefile,v 1.127 2019/11/03 11:45:29 rillig Exp $ DISTNAME= ORBit-0.5.17 PKGREVISION= 2 @@ -14,7 +14,7 @@ USE_TOOLS+= bison flex gmake xgettext USE_LIBTOOL= YES PTHREAD_AUTO_VARS= YES -GNU_CONFIGURE= YES +GNU_CONFIGURE= YES CONFIGURE_ENV+= LIBWRAP_PATH=${BUILDLINK_PREFIX.tcp_wrappers}/lib/libwrap.a CONFIGURE_ENV+= LIB_WRAP="-lwrap" diff --git a/net/Radicale/options.mk b/net/Radicale/options.mk index 3fc1b9e5b24..2a91e964efe 100644 --- a/net/Radicale/options.mk +++ b/net/Radicale/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2019/09/02 13:19:49 adam Exp $ +# $NetBSD: options.mk,v 1.10 2019/11/03 11:45:29 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.Radicale PKG_SUPPORTED_OPTIONS= git ldap @@ -10,6 +10,6 @@ DEPENDS+= ${PYPKGPREFIX}-dulwich-[0-9]*:../../devel/py-dulwich .endif .if !empty(PKG_OPTIONS:Mldap) -PYTHON_VERSIONS_ACCEPTED= 27 # py-ldap +PYTHON_VERSIONS_ACCEPTED= 27 # py-ldap DEPENDS+= ${PYPKGPREFIX}-ldap-[0-9]*:../../databases/py-ldap .endif diff --git a/net/Radicale2/Makefile b/net/Radicale2/Makefile index 38f939b7550..a68ae865200 100644 --- a/net/Radicale2/Makefile +++ b/net/Radicale2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2019/04/25 07:33:09 maya Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/03 11:45:29 rillig Exp $ DISTNAME= Radicale-2.1.5 PKGREVISION= 1 @@ -12,10 +12,10 @@ LICENSE= gnu-gpl-v3 EGDIR= share/examples/radicale -RADICALE_USER?= www -RADICALE_GROUP?= www -PKG_GROUPS= ${RADICALE_GROUP} -PKG_USERS= ${RADICALE_USER}:${RADICALE_GROUP} +RADICALE_USER?= www +RADICALE_GROUP?= www +PKG_GROUPS= ${RADICALE_GROUP} +PKG_USERS= ${RADICALE_USER}:${RADICALE_GROUP} PYTHON_VERSIONS_INCOMPATIBLE= 27 INSTALLATION_DIRS= ${EGDIR} diff --git a/net/Radicale2/options.mk b/net/Radicale2/options.mk index 07c13364cdc..2fb28d41478 100644 --- a/net/Radicale2/options.mk +++ b/net/Radicale2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2019/09/02 13:19:49 adam Exp $ +# $NetBSD: options.mk,v 1.6 2019/11/03 11:45:29 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.Radicale @@ -8,6 +8,6 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.Radicale .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mldap) -PYTHON_VERSIONS_ACCEPTED= 27 # py-ldap +PYTHON_VERSIONS_ACCEPTED= 27 # py-ldap DEPENDS+= ${PYPKGPREFIX}-ldap-[0-9]*:../../databases/py-ldap .endif diff --git a/net/SDL2_net/options.mk b/net/SDL2_net/options.mk index e3a9bd9eb99..375922c1b38 100644 --- a/net/SDL2_net/options.mk +++ b/net/SDL2_net/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2014/02/02 15:56:29 rodent Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/03 11:45:29 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.SDL2_net PKG_SUPPORTED_OPTIONS= static tests @@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS+= static .if !empty(PKG_OPTIONS:Mstatic) CONFIGURE_ARGS+= --enable-static=yes .else -CONFIGURE_ARGS+= --enable-static=no +CONFIGURE_ARGS+= --enable-static=no .endif .if !empty(PKG_OPTIONS:Mtests) diff --git a/net/aiccu/Makefile b/net/aiccu/Makefile index 2e3f85549ec..f6a52f1acc4 100644 --- a/net/aiccu/Makefile +++ b/net/aiccu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/07/20 22:46:36 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/03 11:45:29 rillig Exp $ DISTNAME= aiccu_20070115 PKGNAME= ${DISTNAME:S/_/-/:S/.//g} @@ -12,7 +12,7 @@ COMMENT= Automatic IPv6 Connectivity Client Utility USE_TOOLS+= gmake USE_FEATURES+= inet6 -CHECK_PORTABILITY_SKIP+=debian/* +CHECK_PORTABILITY_SKIP+= debian/* SUBST_CLASSES+= sysconfdir SUBST_STAGE.sysconfdir= pre-configure diff --git a/net/argus/Makefile b/net/argus/Makefile index 044675f2071..48a512fae77 100644 --- a/net/argus/Makefile +++ b/net/argus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2019/08/11 13:22:06 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2019/11/03 11:45:29 rillig Exp $ DISTNAME= argus-3.7 PKGREVISION= 5 @@ -21,7 +21,7 @@ DEPENDS+= p5-Crypt-DES-[0-9]*:../../security/p5-Crypt-DES DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI USE_TOOLS+= perl:run -HAS_CONFIGURE= yes +HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ${WRKSRC}/Configure CONFIGURE_ARGS+= --bin_dir ${PREFIX}/bin CONFIGURE_ARGS+= --sbin_dir ${PREFIX}/sbin @@ -35,7 +35,7 @@ REPLACE_PERL+= ${WRKSRC}/built/argus-config RCD_SCRIPTS= argusd -INSTALL_MAKE_FLAGS+= INSTALL_BIN=${DESTDIR}${PREFIX}/bin \ +INSTALL_MAKE_FLAGS+= INSTALL_BIN=${DESTDIR}${PREFIX}/bin \ INSTALL_SBIN=${DESTDIR}${PREFIX}/sbin \ INSTALL_CGI=${DESTDIR}${PREFIX}/libexec/cgi-bin \ INSTALL_LIB=${DESTDIR}${PREFIX}/lib/argus \ diff --git a/net/autonet/Makefile b/net/autonet/Makefile index 2293ca4dc32..845630b558b 100644 --- a/net/autonet/Makefile +++ b/net/autonet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2015/03/13 17:17:11 tnn Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 11:45:29 rillig Exp $ DISTNAME= autonet-0.22 CATEGORIES= net @@ -8,7 +8,7 @@ EXTRACT_SUFX= .tbz MAINTAINER= abs@absd.org COMMENT= Automatically configure network interface & WEP keys -ONLY_FOR_PLATFORM= NetBSD-*-* +ONLY_FOR_PLATFORM= NetBSD-*-* USE_LANGUAGES= # empty USE_TOOLS+= groff diff --git a/net/barnyard/options.mk b/net/barnyard/options.mk index 7f3b7d2028c..cfc83ee23e1 100644 --- a/net/barnyard/options.mk +++ b/net/barnyard/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1.1.1 2008/12/08 23:23:26 adrianp Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/03 11:45:30 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.barnyard PKG_SUPPORTED_OPTIONS= mysql pgsql @@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS= mysql ### Use PostgreSQL for storing user details ### .if !empty(PKG_OPTIONS:Mpgsql) -. include "../../mk/pgsql.buildlink3.mk" +. include "../../mk/pgsql.buildlink3.mk" CONFIGURE_ARGS+= --enable-postgres CONFIGURE_ARGS+= --with-postgres-includes=${PREFIX}/include/postgresql CONFIGURE_ARGS+= --with-postgres-libraries=${PREFIX}/lib/postgresql @@ -21,7 +21,7 @@ LIBS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/postgresql ### Use MySQL for storing user details ### .if !empty(PKG_OPTIONS:Mmysql) -. include "../../mk/mysql.buildlink3.mk" +. include "../../mk/mysql.buildlink3.mk" CONFIGURE_ARGS+= --enable-mysql CONFIGURE_ARGS+= --with-mysql-includes=${PREFIX}/include/mysql CONFIGURE_ARGS+= --with-mysql-libraries=${PREFIX}/lib/mysql diff --git a/net/batchftp/Makefile b/net/batchftp/Makefile index d9048ed86d2..7135bd296d5 100644 --- a/net/batchftp/Makefile +++ b/net/batchftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2014/10/09 14:06:44 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/03 11:45:30 rillig Exp $ DISTNAME= batchftp102 PKGNAME= batchftp-1.02 @@ -11,8 +11,8 @@ COMMENT= Automatically download files via the FTP protocol WRKSRC= ${WRKDIR} -CPPFLAGS.Interix+= -Dsetpgrp=setpgid -MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} +CPPFLAGS.Interix+= -Dsetpgrp=setpgid +MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} INSTALLATION_DIRS= bin share/doc/batchftp diff --git a/net/bind911/Makefile b/net/bind911/Makefile index 2fd591303da..5ed4178bf82 100644 --- a/net/bind911/Makefile +++ b/net/bind911/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/10/17 00:48:31 taca Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/03 11:45:30 rillig Exp $ DISTNAME= bind-${BIND_VERSION} PKGNAME= ${DISTNAME:S/-P/pl/} @@ -26,18 +26,18 @@ USE_TOOLS+= pax perl USE_LIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-libtool -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} -CONFIGURE_ARGS+= --with-python=no +CONFIGURE_ARGS+= --with-libtool +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} +CONFIGURE_ARGS+= --with-python=no .if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \ !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \ !empty(MACHINE_PLATFORM:MNetBSD-*-vax) -CONFIGURE_ARGS+= --disable-atomic +CONFIGURE_ARGS+= --disable-atomic .endif .if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} != "" -CONFIGURE_ARGS+= --disable-threads +CONFIGURE_ARGS+= --disable-threads .endif CONFIGURE_ARGS.DragonFly+= --disable-kqueue diff --git a/net/bind911/builtin.mk b/net/bind911/builtin.mk index 791f12a2b51..6b6855f7414 100644 --- a/net/bind911/builtin.mk +++ b/net/bind911/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2018/09/09 13:11:38 taca Exp $ +# $NetBSD: builtin.mk,v 1.2 2019/11/03 11:45:30 rillig Exp $ BUILTIN_PKG:= bind @@ -34,7 +34,7 @@ IS_BUILTIN.bind= no IS_BUILTIN.bind= yes . endif .endif -MAKEVARS+= IS_BUILTIN.bind +MAKEVARS+= IS_BUILTIN.bind ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -45,7 +45,7 @@ MAKEVARS+= IS_BUILTIN.bind defined(BUILTIN_VERSION.bind) BUILTIN_PKG.bind= bind-${BUILTIN_VERSION.bind} .endif -MAKEVARS+= BUILTIN_PKG.bind +MAKEVARS+= BUILTIN_PKG.bind ### ### Determine whether we should use the built-in implementation if it @@ -72,7 +72,7 @@ USE_BUILTIN.bind!= \ . endif . endif # PREFER.bind .endif -MAKEVARS+= USE_BUILTIN.bind +MAKEVARS+= USE_BUILTIN.bind ### ### The section below only applies if we are not including this file diff --git a/net/bind911/options.mk b/net/bind911/options.mk index 21baff1c570..5a09a47ee21 100644 --- a/net/bind911/options.mk +++ b/net/bind911/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2019/04/30 02:51:38 taca Exp $ +# $NetBSD: options.mk,v 1.4 2019/11/03 11:45:30 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.bind911 PKG_SUPPORTED_OPTIONS= bind-dig-sigchase bind-xml-statistics-server @@ -25,7 +25,7 @@ PKG_SUGGESTED_OPTIONS+= threads .if empty(MISSING_FEATURES:Minet6) PKG_SUGGESTED_OPTIONS+= inet6 .else -PLIST.inet6= yes +PLIST.inet6= yes .endif .include "../../mk/bsd.options.mk" diff --git a/net/bind914/Makefile b/net/bind914/Makefile index 7f889b0efd1..b5f6aec5ab0 100644 --- a/net/bind914/Makefile +++ b/net/bind914/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/10/24 12:50:36 otis Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/03 11:45:30 rillig Exp $ DISTNAME= bind-${BIND_VERSION} PKGNAME= ${DISTNAME:S/-P/pl/} @@ -26,15 +26,15 @@ USE_TOOLS+= pax perl USE_LIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-libtool -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} -CONFIGURE_ARGS+= --with-python=no +CONFIGURE_ARGS+= --with-libtool +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} +CONFIGURE_ARGS+= --with-python=no .if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \ !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \ !empty(MACHINE_PLATFORM:MNetBSD-*-vax) -CONFIGURE_ARGS+= --disable-atomic +CONFIGURE_ARGS+= --disable-atomic .endif CONFIGURE_ARGS.DragonFly+= --disable-kqueue diff --git a/net/bind914/builtin.mk b/net/bind914/builtin.mk index f18f977f706..6b6855f7414 100644 --- a/net/bind914/builtin.mk +++ b/net/bind914/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2019/04/30 03:34:34 taca Exp $ +# $NetBSD: builtin.mk,v 1.2 2019/11/03 11:45:30 rillig Exp $ BUILTIN_PKG:= bind @@ -34,7 +34,7 @@ IS_BUILTIN.bind= no IS_BUILTIN.bind= yes . endif .endif -MAKEVARS+= IS_BUILTIN.bind +MAKEVARS+= IS_BUILTIN.bind ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -45,7 +45,7 @@ MAKEVARS+= IS_BUILTIN.bind defined(BUILTIN_VERSION.bind) BUILTIN_PKG.bind= bind-${BUILTIN_VERSION.bind} .endif -MAKEVARS+= BUILTIN_PKG.bind +MAKEVARS+= BUILTIN_PKG.bind ### ### Determine whether we should use the built-in implementation if it @@ -72,7 +72,7 @@ USE_BUILTIN.bind!= \ . endif . endif # PREFER.bind .endif -MAKEVARS+= USE_BUILTIN.bind +MAKEVARS+= USE_BUILTIN.bind ### ### The section below only applies if we are not including this file diff --git a/net/bind914/options.mk b/net/bind914/options.mk index de57985bf70..aeb3926969e 100644 --- a/net/bind914/options.mk +++ b/net/bind914/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2019/06/14 16:14:05 taca Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/03 11:45:30 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.bind914 PKG_SUPPORTED_OPTIONS= bind-dig-sigchase bind-xml-statistics-server @@ -23,9 +23,9 @@ PKG_SUGGESTED_OPTIONS+= threads .endif .if ${OPSYS} == "NetBSD" -.if !empty(OS_VERSION:M[8-9].*) +. if !empty(OS_VERSION:M[8-9].*) PKG_SUGGESTED_OPTIONS+= blacklist -.endif +. endif .endif .include "../../mk/bsd.options.mk" diff --git a/net/bird/Makefile.common b/net/bird/Makefile.common index 0c77e835c55..67293bf6852 100644 --- a/net/bird/Makefile.common +++ b/net/bird/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2017/02/11 02:29:48 mef Exp $ +# $NetBSD: Makefile.common,v 1.9 2019/11/03 11:45:30 rillig Exp $ # used by net/bird/Makefile # used by net/bird6/Makefile @@ -23,8 +23,8 @@ CONFIGURE_ARGS+= --localstatedir=/var BIRD6?= # empty PLIST_SUBST+= BIRD6=${BIRD6} -FILESDIR= ${.CURDIR}/../bird/files -PATCHDIR= ${.CURDIR}/../bird/patches +FILESDIR= ${.CURDIR}/../bird/files +PATCHDIR= ${.CURDIR}/../bird/patches DISTINFO_FILE= ${.CURDIR}/../bird/distinfo PLIST_SRC= ${.CURDIR}/../bird/PLIST DESCR_SRC= ${.CURDIR}/../bird/DESCR diff --git a/net/bittornado-gui/Makefile b/net/bittornado-gui/Makefile index 0df1a9d5ae4..69d237fb1c0 100644 --- a/net/bittornado-gui/Makefile +++ b/net/bittornado-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2019/09/02 13:19:48 adam Exp $ +# $NetBSD: Makefile,v 1.39 2019/11/03 11:45:30 rillig Exp $ .include "../../net/bittornado/Makefile.common" @@ -14,9 +14,9 @@ DEPENDS+= ${PYPKGPREFIX}-wxWidgets-[0-9]*:../../x11/py-wxWidgets NO_BUILD= yes -REPLACE_PYTHON= btcompletedirgui.py btdownloadgui.py -REPLACE_PYTHON+= btmaketorrentgui.py -PYTHON_VERSIONS_ACCEPTED= 27 # py-wxWidgets +REPLACE_PYTHON= btcompletedirgui.py btdownloadgui.py +REPLACE_PYTHON+= btmaketorrentgui.py +PYTHON_VERSIONS_ACCEPTED= 27 # py-wxWidgets INSTALLATION_DIRS= bin diff --git a/net/bittorrent-gui/Makefile b/net/bittorrent-gui/Makefile index 21aac815b95..81ad93046b9 100644 --- a/net/bittorrent-gui/Makefile +++ b/net/bittorrent-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2019/09/02 13:19:52 adam Exp $ +# $NetBSD: Makefile,v 1.43 2019/11/03 11:45:31 rillig Exp $ .include "../../net/bittorrent/Makefile.common" @@ -10,8 +10,8 @@ COMMENT+= (GTK+ GUI) DEPENDS+= bittorrent>=${PKGVERSION_NOREV}:../../net/bittorrent DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.6:../../x11/py-gtk2 -REPLACE_PYTHON= bittorrent maketorrent -PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 +REPLACE_PYTHON= bittorrent maketorrent +PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 CONFLICTS+= bittornado-gui-[0-9]* diff --git a/net/bittorrent/Makefile b/net/bittorrent/Makefile index 40c94fdcfde..f572a6be684 100644 --- a/net/bittorrent/Makefile +++ b/net/bittorrent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2019/09/02 13:19:48 adam Exp $ +# $NetBSD: Makefile,v 1.56 2019/11/03 11:45:31 rillig Exp $ .include "Makefile.common" @@ -12,7 +12,7 @@ DEPENDS+= ${PYPKGPREFIX}-cursespanel-[0-9]*:../../devel/py-cursespanel USE_TOOLS+= msgfmt xgettext msgmerge -SUBST_CLASSES+= sha +SUBST_CLASSES+= sha SUBST_MESSAGE.sha= Fixing references to deprecated sha module. SUBST_STAGE.sha= pre-configure SUBST_FILES.sha= BitTorrent/ConvertedMetainfo.py diff --git a/net/bsddip/Makefile b/net/bsddip/Makefile index 675a86eed1f..8ac59610db7 100644 --- a/net/bsddip/Makefile +++ b/net/bsddip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/10/23 17:18:12 asau Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/03 11:45:31 rillig Exp $ DISTNAME= bsddip-1.02 CATEGORIES= net @@ -17,9 +17,9 @@ NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL INSTALLATION_DIRS= ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 sbin -NO_CONFIGURE= yes +NO_CONFIGURE= yes MANCOMPRESSED_IF_MANZ= yes -MAKE_ENV+= ${BSD_MAKE_ENV} +MAKE_ENV+= ${BSD_MAKE_ENV} post-extract: cp -f ${FILESDIR}/Makefile ${WRKSRC}/. diff --git a/net/cacti/Makefile b/net/cacti/Makefile index 5044f58761f..d7fe3c0d84b 100644 --- a/net/cacti/Makefile +++ b/net/cacti/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2019/08/11 13:22:07 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2019/11/03 11:45:31 rillig Exp $ DISTNAME= cacti-1.2.3 PKGREVISION= 2 @@ -31,13 +31,13 @@ DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}-[0-9]*:../../www/ap-php .include "../../lang/php/phpversion.mk" .include "../../mk/apache.mk" -PKG_USERS= ${CACTI_USER}:${CACTI_GROUP} -PKG_GROUPS= ${CACTI_GROUP} +PKG_USERS= ${CACTI_USER}:${CACTI_GROUP} +PKG_GROUPS= ${CACTI_GROUP} PKG_GECOS.${CACTI_USER}= Cacti user -PKG_HOME.${CACTI_USER}= ${CACTIDIR} +PKG_HOME.${CACTI_USER}= ${CACTIDIR} PKG_SHELL.${CACTI_USER}= ${SH} -PKG_USERS_VARS+= CACTI_USER -PKG_GROUPS_VARS+= CACTI_GROUP +PKG_USERS_VARS+= CACTI_USER +PKG_GROUPS_VARS+= CACTI_GROUP BUILD_DEFS+= PKG_SYSCONFBASE VARBASE APACHE_GROUP PKG_SYSCONFSUBDIR?= httpd @@ -107,7 +107,7 @@ INSTALLATION_DIRS= bin INSTALLATION_DIRS+= share/examples/cacti INSTALLATION_DIRS+= share/cacti -PLIST_VARS+= localmemory +PLIST_VARS+= localmemory .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || \ ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" PLIST.localmemory= yes diff --git a/net/calypso/Makefile b/net/calypso/Makefile index f1388c47be3..66d88a02ca2 100644 --- a/net/calypso/Makefile +++ b/net/calypso/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/09/02 13:19:52 adam Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/03 11:45:31 rillig Exp $ DISTNAME= calypso-1.3 PKGREVISION= 2 @@ -16,7 +16,7 @@ DEPENDS+= git-base-[0-9]*:../../devel/git-base INSTALLATION_DIRS= share/examples/calypso INSTALLATION_DIRS+= ${PKGMANDIR}/man1 -PYTHON_VERSIONS_ACCEPTED= 27 # as of 1.3 +PYTHON_VERSIONS_ACCEPTED= 27 # as of 1.3 REPLACE_PYTHON= calypso.py post-install: diff --git a/net/cdpd/Makefile b/net/cdpd/Makefile index 2c7094da19f..58aa16370c7 100644 --- a/net/cdpd/Makefile +++ b/net/cdpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2013/04/06 12:08:40 rodent Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/03 11:45:31 rillig Exp $ # DISTNAME= cdpd-1.0.2 @@ -15,10 +15,10 @@ GNU_CONFIGURE= YES INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin SUBST_CLASSES+= conf -SUBST_STAGE.conf= pre-configure -SUBST_FILES.conf= configure -SUBST_SED.conf= -e "s|libnet-config|libnet10-config|g" -SUBST_MESSAGE.conf= Fixing configuration script. +SUBST_STAGE.conf= pre-configure +SUBST_FILES.conf= configure +SUBST_SED.conf= -e "s|libnet-config|libnet10-config|g" +SUBST_MESSAGE.conf= Fixing configuration script. do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cdpd ${DESTDIR}${PREFIX}/sbin/cdpd diff --git a/net/choparp/Makefile b/net/choparp/Makefile index cf7e21de6a8..8d353af7da5 100644 --- a/net/choparp/Makefile +++ b/net/choparp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/09/12 11:15:12 jperkin Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:32 rillig Exp $ # DISTNAME= choparp-20021107 @@ -14,7 +14,7 @@ NOT_FOR_PLATFORM= Interix-*-* # does not have bpf(4) device USE_TOOLS= nroff MANCOMPRESSED_IF_MANZ= yes -MAKE_ENV+= ${BSD_MAKE_ENV} +MAKE_ENV+= ${BSD_MAKE_ENV} INSTALLATION_DIRS= ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 sbin .include "../../mk/bsd.pkg.mk" diff --git a/net/choqok/Makefile b/net/choqok/Makefile index f60778ac213..a9f546be86d 100644 --- a/net/choqok/Makefile +++ b/net/choqok/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2019/08/22 12:23:38 ryoon Exp $ +# $NetBSD: Makefile,v 1.46 2019/11/03 11:45:32 rillig Exp $ # DISTNAME= choqok-1.5 @@ -18,7 +18,7 @@ MAKE_JOBS_SAFE= no USE_LANGUAGES= c c++ USE_TOOLS+= perl msgfmt pkg-config -BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 +BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 DEPENDS= qca2-ossl-[0-9]*:../../security/qca2-ossl .include "../../meta-pkgs/kde4/kde4.mk" diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile index 59b14af5e3e..b53ed5f80c2 100644 --- a/net/citrix_ica/Makefile +++ b/net/citrix_ica/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2015/06/19 15:30:27 jperkin Exp $ +# $NetBSD: Makefile,v 1.47 2019/11/03 11:45:32 rillig Exp $ DISTNAME= citrix_ica-10.6.115659 PKGREVISION= 2 @@ -58,10 +58,10 @@ USE_TOOLS+= patch INSTALLATION_DIRS= bin lib .if ${MASTER_SITES} == "manual" -FETCH_MESSAGE= "Please fetch ${DISTFILES} manually from" -FETCH_MESSAGE+= "${HOMEPAGE}" -FETCH_MESSAGE+= "and put into" -FETCH_MESSAGE+= "${DISTDIR}/${PKGNAME_NOREV}" +FETCH_MESSAGE= "Please fetch ${DISTFILES} manually from" +FETCH_MESSAGE+= "${HOMEPAGE}" +FETCH_MESSAGE+= "and put into" +FETCH_MESSAGE+= "${DISTDIR}/${PKGNAME_NOREV}" .endif do-patch: diff --git a/net/coherence/Makefile b/net/coherence/Makefile index 9ba02c84729..78a0cc69baf 100644 --- a/net/coherence/Makefile +++ b/net/coherence/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/09/02 13:19:50 adam Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/03 11:45:32 rillig Exp $ DISTNAME= Coherence-0.6.6.2 PKGNAME= coherence-0.6.6.2 @@ -12,9 +12,9 @@ COMMENT= Media server framework USE_LANGUAGES= # none -DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted +DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted -PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.6.6.2 +PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.6.6.2 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/coilmq/Makefile b/net/coilmq/Makefile index 62828451c11..4aeef50480b 100644 --- a/net/coilmq/Makefile +++ b/net/coilmq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/09/02 13:19:49 adam Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/03 11:45:32 rillig Exp $ DISTNAME= CoilMQ-0.6.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -26,7 +26,7 @@ SUBST_STAGE.cfg= pre-configure SUBST_FILES.cfg= coilmq/config/__init__.py SUBST_SED.cfg= -e 's,/path/to/config.cfg,${PKG_SYSCONFDIR}/defaults.cfg,' -PYTHON_VERSIONS_ACCEPTED= 27 # py-stompclient, py-daemon +PYTHON_VERSIONS_ACCEPTED= 27 # py-stompclient, py-daemon EGDIR= ${PREFIX}/share/examples/coilmq diff --git a/net/connect/Makefile b/net/connect/Makefile index c0c84029c75..e8841254ffb 100644 --- a/net/connect/Makefile +++ b/net/connect/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.17 2015/03/09 09:24:35 mef Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/03 11:45:33 rillig Exp $ DISTNAME= 1.104 PKGNAME= connect-${DISTNAME} CATEGORIES= net security -MASTER_SITES= http://bitbucket.org/gotoh/connect/get/ +MASTER_SITES= http://bitbucket.org/gotoh/connect/get/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://bitbucket.org/gotoh/connect/wiki/Home diff --git a/net/dante/Makefile b/net/dante/Makefile index 184b2c428c8..d3aca161eed 100644 --- a/net/dante/Makefile +++ b/net/dante/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2019/02/09 19:51:09 rhialto Exp $ +# $NetBSD: Makefile,v 1.27 2019/11/03 11:45:33 rillig Exp $ DISTNAME= dante-1.4.2 -PKGREVISION= 1 +PKGREVISION= 1 CATEGORIES= net security MASTER_SITES= http://www.inet.no/dante/files/ diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile index abe50bfabcd..400a1e77302 100644 --- a/net/ddclient/Makefile +++ b/net/ddclient/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2019/09/21 10:40:08 abs Exp $ +# $NetBSD: Makefile,v 1.47 2019/11/03 11:45:33 rillig Exp $ DISTNAME= ddclient-3.8.3 PKGREVISION= 6 @@ -22,7 +22,7 @@ CONF_FILES_PERMS= ${EGDIR}/sample-etc_ddclient.conf \ ${PKG_SYSCONFDIR}/ddclient.conf \ ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0600 -DEPENDS+= p5-JSON-Any>=0.0:../../converters/p5-JSON-Any +DEPENDS+= p5-JSON-Any>=0.0:../../converters/p5-JSON-Any REPLACE_INTERPRETER+= sh REPLACE.sh.old= .*/bin/bash diff --git a/net/ddclient/options.mk b/net/ddclient/options.mk index 4e9dbc4bb50..225bb685c42 100644 --- a/net/ddclient/options.mk +++ b/net/ddclient/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2015/03/13 10:57:14 jmcneill Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/03 11:45:33 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.ddclient -PKG_SUPPORTED_OPTIONS= ssl -PKG_SUGGESTED_OPTIONS= ssl +PKG_OPTIONS_VAR= PKG_OPTIONS.ddclient +PKG_SUPPORTED_OPTIONS= ssl +PKG_SUGGESTED_OPTIONS= ssl .include "../../mk/bsd.options.mk" diff --git a/net/delegate/Makefile b/net/delegate/Makefile index b27dfa9809f..45f0c007d19 100644 --- a/net/delegate/Makefile +++ b/net/delegate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2017/01/19 18:52:19 agc Exp $ +# $NetBSD: Makefile,v 1.46 2019/11/03 11:45:33 rillig Exp $ DISTNAME= delegate9.9.1 PKGNAME= delegate-9.9.1 @@ -22,8 +22,8 @@ DELEGATE_MANAGER?= root@localhost RCD_SCRIPTS= delegated FILES_SUBST+= ADMIN=${DELEGATE_MANAGER:Q} -OWN_DIRS_PERMS+=${VARBASE}/spool/delegate/cache ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 1777 -OWN_DIRS_PERMS+=${VARBASE}/spool/delegate-nobody nobody nobody 755 +OWN_DIRS_PERMS+= ${VARBASE}/spool/delegate/cache ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 1777 +OWN_DIRS_PERMS+= ${VARBASE}/spool/delegate-nobody nobody nobody 755 INSTALLATION_DIRS= sbin share/doc/delegate diff --git a/net/dhisd/Makefile b/net/dhisd/Makefile index c6fab0a5c29..df3b424d0fe 100644 --- a/net/dhisd/Makefile +++ b/net/dhisd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2015/12/18 19:54:14 wiedi Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 11:45:33 rillig Exp $ # DISTNAME= dhisd-5.5 @@ -20,25 +20,25 @@ SUBST_STAGE.varbase= pre-configure SUBST_MESSAGE.varbase= Adapt VARBASE and PREFIX SUBST_VARS.varbase+= VARBASE PREFIX -SPECIAL_PERMS+= bin/dhisd-genkeys ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 \ - bin/dhisd ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 +SPECIAL_PERMS+= bin/dhisd-genkeys ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 \ + bin/dhisd ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 do-install: - ${INSTALL_DATA} \ - ${WRKSRC}/*.sample \ - ${DESTDIR}${PREFIX}/share/examples/dhisd - ${INSTALL_DATA} \ - ${WRKSRC}/CONTRIBUTORS \ - ${WRKSRC}/COPYRIGHT \ - ${WRKSRC}/INSTALL \ - ${WRKSRC}/README \ - ${DESTDIR}${PREFIX}/share/doc/dhisd - ${INSTALL_PROGRAM} \ - ${WRKSRC}/dhisd \ - ${DESTDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} \ - ${WRKSRC}/dhisgenkeys \ - ${DESTDIR}${PREFIX}/bin/dhisd-genkeys + ${INSTALL_DATA} \ + ${WRKSRC}/*.sample \ + ${DESTDIR}${PREFIX}/share/examples/dhisd + ${INSTALL_DATA} \ + ${WRKSRC}/CONTRIBUTORS \ + ${WRKSRC}/COPYRIGHT \ + ${WRKSRC}/INSTALL \ + ${WRKSRC}/README \ + ${DESTDIR}${PREFIX}/share/doc/dhisd + ${INSTALL_PROGRAM} \ + ${WRKSRC}/dhisd \ + ${DESTDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} \ + ${WRKSRC}/dhisgenkeys \ + ${DESTDIR}${PREFIX}/bin/dhisd-genkeys .include "../../devel/gmp/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/djbdns/options.mk b/net/djbdns/options.mk index 7146427f43b..706ca0eb16d 100644 --- a/net/djbdns/options.mk +++ b/net/djbdns/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.22 2019/01/05 06:18:11 schmonz Exp $ +# $NetBSD: options.mk,v 1.23 2019/11/03 11:45:33 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.djbdns PKG_SUPPORTED_OPTIONS+= djbdns-cachestats djbdns-ignoreip2 @@ -8,10 +8,10 @@ PKG_SUGGESTED_OPTIONS+= djbdns-mergequeries djbdns-tinydns64 .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdjbdns-cachestats) -CACHESTATS_PATCH= djbdns-cachestats.patch -PATCHFILES+= ${CACHESTATS_PATCH} -SITES.${CACHESTATS_PATCH}= http://romana.now.ie/software/ -PATCH_DIST_STRIP.${CACHESTATS_PATCH}= -p1 +CACHESTATS_PATCH= djbdns-cachestats.patch +PATCHFILES+= ${CACHESTATS_PATCH} +SITES.${CACHESTATS_PATCH}= http://romana.now.ie/software/ +PATCH_DIST_STRIP.${CACHESTATS_PATCH}= -p1 .endif .if !empty(PKG_OPTIONS:Mdjbdns-ignoreip2) diff --git a/net/djbdnscurve6/Makefile b/net/djbdnscurve6/Makefile index c700d2b3079..e9245cd98a5 100644 --- a/net/djbdnscurve6/Makefile +++ b/net/djbdnscurve6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2019/08/03 10:45:18 schmonz Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/03 11:45:33 rillig Exp $ DISTNAME= djbdnscurve6-35 PKGREVISION= 3 @@ -25,11 +25,11 @@ SUBST_FILES.etc= src/dns_rcrw.c man/qualification.5 SUBST_SED.etc= -e 's|/etc/dnsrewrite|${PKG_SYSCONFBASE}/dnsrewrite|g' SUBST_MESSAGE.etc= Fixing prefix. -SUBST_CLASSES+= sysconfdir -SUBST_STAGE.sysconfdir= do-configure -SUBST_FILES.sysconfdir= src/dnscache-conf.c -SUBST_VARS.sysconfdir= PKG_SYSCONFDIR -SUBST_MESSAGE.sysconfdir=Fixing sysconfdir. +SUBST_CLASSES+= sysconfdir +SUBST_STAGE.sysconfdir= do-configure +SUBST_FILES.sysconfdir= src/dnscache-conf.c +SUBST_VARS.sysconfdir= PKG_SYSCONFDIR +SUBST_MESSAGE.sysconfdir= Fixing sysconfdir. EGDIR= ${PREFIX}/share/examples/${PKGBASE} CONF_FILES+= ${EGDIR}/dnsroots.global ${PKG_SYSCONFDIR}/dnsroots.global diff --git a/net/dnsmasq/Makefile b/net/dnsmasq/Makefile index 3aca8913d38..ceb1d82fd2e 100644 --- a/net/dnsmasq/Makefile +++ b/net/dnsmasq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2019/07/20 22:46:37 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2019/11/03 11:45:34 rillig Exp $ DISTNAME= dnsmasq-2.80 PKGREVISION= 1 @@ -26,7 +26,7 @@ DNSMASQ_GROUP?= dnsmasq PKG_GROUPS= ${DNSMASQ_GROUP} PKG_USERS= ${DNSMASQ_USER}:${DNSMASQ_GROUP} -PKG_GECOS.${DNSMASQ_USER}=DNS\ forwarder\ user +PKG_GECOS.${DNSMASQ_USER}= DNS\ forwarder\ user .include "options.mk" diff --git a/net/drill/Makefile b/net/drill/Makefile index f408a9bf893..ec1d2ee9b67 100644 --- a/net/drill/Makefile +++ b/net/drill/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2017/08/01 17:40:14 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:34 rillig Exp $ VERSION= 1.6.17 DISTNAME= ldns-${VERSION} @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl} WRKSRC= ${WRKDIR}/${DISTNAME}/drill -BUILDLINK_API_DEPENDS.ldns+= ldns>=${VERSION} +BUILDLINK_API_DEPENDS.ldns+= ldns>=${VERSION} .include "../../net/ldns/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/net/ekiga/options.mk b/net/ekiga/options.mk index 8503f3c5cb1..cdb0022aa2c 100644 --- a/net/ekiga/options.mk +++ b/net/ekiga/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.5 2013/11/06 13:31:21 joerg Exp $ +# $NetBSD: options.mk,v 1.6 2019/11/03 11:45:34 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ekiga -PKG_SUPPORTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify -PKG_SUGGESTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify +PKG_SUPPORTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify +PKG_SUGGESTED_OPTIONS+= avahi dbus evolution-data-server gconf gnome notify .include "../../mk/bsd.options.mk" diff --git a/net/ettercap-NG/Makefile b/net/ettercap-NG/Makefile index 1b7722a5232..4da8b9d81ac 100644 --- a/net/ettercap-NG/Makefile +++ b/net/ettercap-NG/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2017/05/12 12:01:01 jperkin Exp $ +# $NetBSD: Makefile,v 1.28 2019/11/03 11:45:34 rillig Exp $ DISTNAME= ettercap-NG-0.7.3 PKGREVISION= 14 @@ -44,7 +44,7 @@ SUBST_MESSAGE.conf= Fixing configuration script. CONF_FILES= ${PREFIX}/share/examples/ettercap-NG/etter.conf \ ${PKG_SYSCONFDIR}/etter.conf -INSTALLATION_DIRS+= share/examples/ettercap-NG +INSTALLATION_DIRS+= share/examples/ettercap-NG post-install: ${INSTALL_DATA} ${WRKSRC}/share/etter.conf \ diff --git a/net/exabgp/Makefile b/net/exabgp/Makefile index 21e76ad4cc3..cc14393091c 100644 --- a/net/exabgp/Makefile +++ b/net/exabgp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2019/09/02 13:19:52 adam Exp $ +# $NetBSD: Makefile,v 1.31 2019/11/03 11:45:34 rillig Exp $ VERSION= 3.4.23 DISTNAME= ${VERSION} @@ -58,7 +58,7 @@ REPLACE_PYTHON+= qa/conf/watchdog.run PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 3.2.19 -USE_LANGUAGES= # none +USE_LANGUAGES= # none INSTALLATION_DIRS+= share/exabgp bin INSTALLATION_DIRS+= ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 diff --git a/net/fehqlibs/Makefile b/net/fehqlibs/Makefile index ad509d96222..f0474cf7525 100644 --- a/net/fehqlibs/Makefile +++ b/net/fehqlibs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2019/08/03 10:42:46 schmonz Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/03 11:45:34 rillig Exp $ DISTNAME= fehQlibs-12c PKGNAME= ${DISTNAME:S/Qlibs-/qlibs-0.9./:S/12/12.12/} @@ -36,10 +36,10 @@ do-configure: .include "../../mk/bsd.prefs.mk" post-build: -. if ${OPSYS} == Darwin +.if ${OPSYS} == Darwin cd ${WRKSRC} && for lib in *.so; do \ install_name_tool -id ${PREFIX}/lib/qlibs/$${lib} $${lib}; \ done -. endif +.endif .include "../../mk/bsd.pkg.mk" diff --git a/net/fehqlibs/buildlink3.mk b/net/fehqlibs/buildlink3.mk index 23aad3508eb..a7668f3fb10 100644 --- a/net/fehqlibs/buildlink3.mk +++ b/net/fehqlibs/buildlink3.mk @@ -1,15 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.5 2019/07/12 15:34:54 schmonz Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2019/11/03 11:45:34 rillig Exp $ BUILDLINK_TREE+= fehqlibs .if !defined(FEHQLIBS_BUILDLINK3_MK) FEHQLIBS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.fehqlibs+=fehqlibs>=0.9.12.10 -BUILDLINK_PKGSRCDIR.fehqlibs?= ../../net/fehqlibs -BUILDLINK_INCDIRS.fehqlibs+= include/qlibs -BUILDLINK_LIBDIRS.fehqlibs+= lib/qlibs -LDFLAGS.SunOS+= -lnsl -lsocket +BUILDLINK_API_DEPENDS.fehqlibs+= fehqlibs>=0.9.12.10 +BUILDLINK_PKGSRCDIR.fehqlibs?= ../../net/fehqlibs +BUILDLINK_INCDIRS.fehqlibs+= include/qlibs +BUILDLINK_LIBDIRS.fehqlibs+= lib/qlibs +LDFLAGS.SunOS+= -lnsl -lsocket .endif # FEHQLIBS_BUILDLINK3_MK BUILDLINK_TREE+= -fehqlibs diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index 2bdce1a4e69..e75e5a5de2e 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.101 2019/08/11 13:22:08 wiz Exp $ +# $NetBSD: Makefile,v 1.102 2019/11/03 11:45:34 rillig Exp $ PKGREVISION= 1 .include "Makefile.common" @@ -34,7 +34,7 @@ RADIUS_GROUP?= radiusd RADIUS_USER?= radiusd PKG_GROUPS= ${RADIUS_GROUP} PKG_USERS= ${RADIUS_USER}:${RADIUS_GROUP} -PKG_HOME.${RADIUS_USER}=${VARBASE}/log/radiusd +PKG_HOME.${RADIUS_USER}= ${VARBASE}/log/radiusd OWN_DIRS_PERMS+= ${VARBASE}/log/radiusd \ ${RADIUS_USER} ${RADIUS_GROUP} 0750 diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile index dd688b3a801..55479fff7e8 100644 --- a/net/freeradius2/Makefile +++ b/net/freeradius2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2019/08/11 13:22:08 wiz Exp $ +# $NetBSD: Makefile,v 1.52 2019/11/03 11:45:34 rillig Exp $ DISTNAME= freeradius-server-2.2.10 PKGNAME= ${DISTNAME:S/-server//} @@ -80,7 +80,7 @@ SUBST_MESSAGE.config= Fixing configuration files. .include "options.mk" -EGFILES=acct_users attrs attrs.access_reject attrs.accounting_response \ +EGFILES= acct_users attrs attrs.access_reject attrs.accounting_response \ attrs.pre-proxy certs/README certs/Makefile certs/bootstrap \ certs/ca.cnf certs/client.cnf certs/server.cnf \ certs/xpextensions clients.conf dictionary eap.conf experimental.conf \ @@ -117,8 +117,8 @@ EGFILES=acct_users attrs attrs.access_reject attrs.accounting_response \ sql/postgresql/schema.sql \ sql/postgresql/update_radacct_group_trigger.sql \ sql/postgresql/voip-postpaid.conf sqlippool.conf templates.conf users -EGDIRS= certs modules sql sql/mssql sql/mysql sql/oracle \ - sql/postgresql sites-available sites-enabled +EGDIRS= certs modules sql sql/mssql sql/mysql sql/oracle \ + sql/postgresql sites-available sites-enabled .for f in ${EGFILES} CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \ diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile index 8061517674a..119972210b3 100644 --- a/net/freerdp/Makefile +++ b/net/freerdp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2019/09/18 14:17:15 ryoon Exp $ +# $NetBSD: Makefile,v 1.40 2019/11/03 11:45:35 rillig Exp $ DISTNAME= freerdp-1.0.2 PKGREVISION= 36 @@ -12,9 +12,9 @@ LICENSE= apache-2.0 TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto -USE_CMAKE= yes -USE_TOOLS+= pkg-config -USE_OLD_DES_API=yes +USE_CMAKE= yes +USE_TOOLS+= pkg-config +USE_OLD_DES_API= yes PKGCONFIG_OVERRIDE+= freerdp.pc.in diff --git a/net/fwknop/Makefile b/net/fwknop/Makefile index 73ce2f72dd5..ca2cbc6154c 100644 --- a/net/fwknop/Makefile +++ b/net/fwknop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2018/05/01 21:10:42 khorben Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 11:45:35 rillig Exp $ DISTNAME= fwknop-2.6.9 CATEGORIES= net @@ -14,14 +14,14 @@ DEPENDS+= wget-[0-9]*:../../net/wget USE_TOOLS+= aclocal autoconf automake autoheader makeinfo -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--infodir=${PREFIX}/${PKGINFODIR} +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --infodir=${PREFIX}/${PKGINFODIR} -EGDIR= ${PREFIX}/share/examples/fwknop -CONF_FILES+= ${EGDIR}/access.conf \ - ${PKG_SYSCONFDIR}/fwknop/access.conf -CONF_FILES+= ${EGDIR}/fwknopd.conf \ - ${PKG_SYSCONFDIR}/fwknop/fwknopd.conf +EGDIR= ${PREFIX}/share/examples/fwknop +CONF_FILES+= ${EGDIR}/access.conf \ + ${PKG_SYSCONFDIR}/fwknop/access.conf +CONF_FILES+= ${EGDIR}/fwknopd.conf \ + ${PKG_SYSCONFDIR}/fwknop/fwknopd.conf INSTALLATION_DIRS+= ${EGDIR} INFO_FILES= yes diff --git a/net/gcloud-golang-metadata/buildlink3.mk b/net/gcloud-golang-metadata/buildlink3.mk index 4ec34e28381..120e16d3aac 100644 --- a/net/gcloud-golang-metadata/buildlink3.mk +++ b/net/gcloud-golang-metadata/buildlink3.mk @@ -1,14 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2015/12/29 21:47:48 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2019/11/03 11:45:35 rillig Exp $ BUILDLINK_TREE+= gcloud-golang-metadata .if !defined(GCLOUD_GOLANG_METADATA_BUILDLINK3_MK) GCLOUD_GOLANG_METADATA_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gcloud-golang-metadata+= gcloud-golang-metadata>=20150310 -BUILDLINK_PKGSRCDIR.gcloud-golang-metadata?= ../../net/gcloud-golang-metadata -BUILDLINK_DEPMETHOD.gcloud-golang-metadata?= build -BUILDLINK_CONTENTS_FILTER.gcloud-golang-metadata= ${EGREP} gopkg/ +BUILDLINK_API_DEPENDS.gcloud-golang-metadata+= gcloud-golang-metadata>=20150310 +BUILDLINK_PKGSRCDIR.gcloud-golang-metadata?= ../../net/gcloud-golang-metadata +BUILDLINK_DEPMETHOD.gcloud-golang-metadata?= build +BUILDLINK_CONTENTS_FILTER.gcloud-golang-metadata= ${EGREP} gopkg/ .include "../../net/go-net/buildlink3.mk" .endif # GCLOUD_GOLANG_METADATA_BUILDLINK3_MK diff --git a/net/gethost/Makefile b/net/gethost/Makefile index 9a55597a6b1..99ed1c91796 100644 --- a/net/gethost/Makefile +++ b/net/gethost/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2014/10/09 14:06:44 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:35 rillig Exp $ DISTNAME= gethost-0.03 PKGREVISION= 1 @@ -14,7 +14,7 @@ CONFLICTS= dnssec-tools-[0-9]* USE_FEATURES= inet6 INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 -BUILD_TARGET= gethost +BUILD_TARGET= gethost LIBS.SunOS= -lnsl -lresolv -lsocket diff --git a/net/gitso/Makefile b/net/gitso/Makefile index edcee0b5887..ffac9fbea4d 100644 --- a/net/gitso/Makefile +++ b/net/gitso/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2019/09/02 13:19:52 adam Exp $ +# $NetBSD: Makefile,v 1.36 2019/11/03 11:45:35 rillig Exp $ DISTNAME= gitso-0.6 PKGREVISION= 22 @@ -17,7 +17,7 @@ DEPENDS+= x11vnc-[0-9]*:../../x11/x11vnc WRKSRC= ${WRKDIR}/Gitso PY_PATCHPLIST= yes -PYTHON_VERSIONS_ACCEPTED= 27 # py-wxWidgets +PYTHON_VERSIONS_ACCEPTED= 27 # py-wxWidgets USE_TOOLS+= bash:run diff --git a/net/go-framestream/buildlink3.mk b/net/go-framestream/buildlink3.mk index 81202a15ef4..d1960570e7d 100644 --- a/net/go-framestream/buildlink3.mk +++ b/net/go-framestream/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/01/16 15:15:49 he Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 11:45:35 rillig Exp $ BUILDLINK_TREE+= go-framestream .if !defined(GO_FRAMESTREAM_BUILDLINK3_MK) GO_FRAMESTREAM_BUILDLINK3_MK:= -BUILDLINK_CONTENTS_FILTER.go-framestream=${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-framestream?= build +BUILDLINK_CONTENTS_FILTER.go-framestream= ${EGREP} gopkg/ +BUILDLINK_DEPMETHOD.go-framestream?= build BUILDLINK_API_DEPENDS.go-framestream+= go-framestream>=0.1.0 BUILDLINK_PKGSRCDIR.go-framestream?= ../../net/go-framestream diff --git a/net/go-net/buildlink3.mk b/net/go-net/buildlink3.mk index ac31de12302..00e90bc747f 100644 --- a/net/go-net/buildlink3.mk +++ b/net/go-net/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.5 2017/03/16 19:14:19 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2019/11/03 11:45:35 rillig Exp $ BUILDLINK_TREE+= go-net .if !defined(GO_NET_BUILDLINK3_MK) GO_NET_BUILDLINK3_MK:= -BUILDLINK_CONTENTS_FILTER.go-net= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-net?= build +BUILDLINK_CONTENTS_FILTER.go-net= ${EGREP} gopkg/ +BUILDLINK_DEPMETHOD.go-net?= build BUILDLINK_API_DEPENDS.go-net+= go-net>=20170308 BUILDLINK_PKGSRCDIR.go-net?= ../../net/go-net diff --git a/net/go-websocket/Makefile b/net/go-websocket/Makefile index de9fa2594fb..8844b07a3a9 100644 --- a/net/go-websocket/Makefile +++ b/net/go-websocket/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/10/18 14:58:55 bsiegert Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:35 rillig Exp $ DISTNAME= websocket-1.0.0 PKGNAME= go-${DISTNAME} @@ -6,7 +6,7 @@ PKGREVISION= 13 MASTER_SITES= ${MASTER_SITE_GITHUB:=gorilla/} CATEGORIES= net GITHUB_TAG= v${PKGVERSION_NOREV} -GITHUB_PROJECT= ${PKGBASE:S/^go-//} +GITHUB_PROJECT= ${PKGBASE:S/^go-//} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/gorilla/websocket diff --git a/net/grive/Makefile b/net/grive/Makefile index 8cd76685ad1..3243911b192 100644 --- a/net/grive/Makefile +++ b/net/grive/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/08/22 12:23:39 ryoon Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/03 11:45:35 rillig Exp $ DISTNAME= ${GHNAME}-${GHDATE}-${GHCOMMIT} PKGNAME= ${GHNAME}-0.3.0.${GHDATE} @@ -20,11 +20,11 @@ WRKSRC= ${WRKDIR}/grive-${GHCOMMIT} USE_CMAKE= yes USE_LANGUAGES= c c++11 -SUBST_CLASSES+= disableqt -SUBST_MESSAGE.disableqt=Disable QT frontend -SUBST_STAGE.disableqt= pre-configure -SUBST_FILES.disableqt= CMakeLists.txt -SUBST_SED.disableqt= -e '/ bgrive/d' +SUBST_CLASSES+= disableqt +SUBST_MESSAGE.disableqt= Disable QT frontend +SUBST_STAGE.disableqt= pre-configure +SUBST_FILES.disableqt= CMakeLists.txt +SUBST_SED.disableqt= -e '/ bgrive/d' SUBST_CLASSES+= manpath SUBST_MESSAGE.manpath= Fix manpath diff --git a/net/grive2/Makefile b/net/grive2/Makefile index 8aaed0fb2a5..4fcb8735a3d 100644 --- a/net/grive2/Makefile +++ b/net/grive2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/08/22 12:23:39 ryoon Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:36 rillig Exp $ DISTNAME= grive2-0.4.1 PKGREVISION= 13 @@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/vitalif/Grive2 COMMENT= Independent open source implementation of Google Drive client LICENSE= gnu-gpl-v2 -GITHUB_TAG=v${PKGVERSION_NOREV} +GITHUB_TAG= v${PKGVERSION_NOREV} USE_CMAKE= yes USE_TOOLS+= pkg-config diff --git a/net/gssdp/Makefile b/net/gssdp/Makefile index 878be14cfea..e2fe5fe8597 100644 --- a/net/gssdp/Makefile +++ b/net/gssdp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.81 2019/10/11 16:40:03 kamil Exp $ +# $NetBSD: Makefile,v 1.82 2019/11/03 11:45:36 rillig Exp $ DISTNAME= gssdp-1.0.3 PKGREVISION= 4 @@ -11,10 +11,10 @@ HOMEPAGE= http://www.gupnp.org/ COMMENT= Simple Service Discovery Protocol library and device sniffer (1.0 branch) LICENSE= gnu-lgpl-v2 -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --without-gtk -USE_LIBTOOL= yes -USE_TOOLS+= pkg-config gmake +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --without-gtk +USE_LIBTOOL= yes +USE_TOOLS+= pkg-config gmake PKGCONFIG_OVERRIDE+= gssdp-1.0.pc.in diff --git a/net/gssdp12/Makefile b/net/gssdp12/Makefile index dbe253e5d1b..e788b1818cf 100644 --- a/net/gssdp12/Makefile +++ b/net/gssdp12/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/10/07 09:28:12 prlw1 Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/03 11:45:36 rillig Exp $ DISTNAME= gssdp-1.2.1 PKGNAME= ${DISTNAME:S/gssdp/gssdp12/} @@ -18,9 +18,9 @@ MESON_ARGS+= -Dsniffer=false # needs gtk-doc MESON_ARGS+= -Dgtk-doc=false -PKGCONFIG_OVERRIDE+= output/meson-private/gssdp-1.2.pc -PKGCONFIG_OVERRIDE_STAGE=pre-install -MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/libgssdp +PKGCONFIG_OVERRIDE+= output/meson-private/gssdp-1.2.pc +PKGCONFIG_OVERRIDE_STAGE= pre-install +MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/libgssdp .include "../../devel/glib2/buildlink3.mk" BUILDLINK_DEPMETHOD.gobject-introspection= build diff --git a/net/gst-plugins1-libnice/Makefile b/net/gst-plugins1-libnice/Makefile index 07c9396c8f3..57d3920ef2b 100644 --- a/net/gst-plugins1-libnice/Makefile +++ b/net/gst-plugins1-libnice/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.36 2019/07/20 22:46:38 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2019/11/03 11:45:36 rillig Exp $ PKGNAME= gst-plugins1-${DISTNAME} PKGREVISION= 1 COMMENT+= (gstreamer plugin) -CONFIGURE_ARGS+= --with-gstreamer +CONFIGURE_ARGS+= --with-gstreamer .include "../../net/libnice/Makefile.common" diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile index 6b4d9eb19a4..c65105e33cf 100644 --- a/net/gtk-vnc/Makefile +++ b/net/gtk-vnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2019/09/18 14:17:15 ryoon Exp $ +# $NetBSD: Makefile,v 1.70 2019/11/03 11:45:36 rillig Exp $ # DISTNAME= gtk-vnc-0.5.2 @@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE+= gtk-vnc-1.0.pc.in PKGCONFIG_OVERRIDE+= gtk-vnc-2.0.pc.in PKGCONFIG_OVERRIDE+= gvnc-1.0.pc.in PKGCONFIG_OVERRIDE+= gvncpulse-1.0.pc.in -PY_PATCHPLIST= yes +PY_PATCHPLIST= yes CONFIGURE_ARGS+= --with-coroutine=gthread @@ -50,7 +50,7 @@ SUBST_STAGE.mapfile= pre-build SUBST_FILES.mapfile= gtk3-build/src/Makefile SUBST_SED.mapfile= -e '/VERSION_SCRIPT_FLAGS.*GTK_VNC_VERSION_FILE/d' -#VIEW_REQUIRED=0.6.0 +#VIEW_REQUIRED= 0.6.0 #libview .include "../../devel/glib2/buildlink3.mk" diff --git a/net/gupnp/Makefile b/net/gupnp/Makefile index cdf8b5d127a..0aef5069b58 100644 --- a/net/gupnp/Makefile +++ b/net/gupnp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2019/08/20 13:17:48 wiz Exp $ +# $NetBSD: Makefile,v 1.61 2019/11/03 11:45:36 rillig Exp $ DISTNAME= gupnp-1.0.3 PKGREVISION= 4 @@ -16,10 +16,10 @@ USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE+= gupnp-1.0.pc.in -REPLACE_PYTHON= tools/gupnp-binding-tool +REPLACE_PYTHON= tools/gupnp-binding-tool -TEST_TARGET= check -#CFLAGS=-O0 -g +TEST_TARGET= check +#CFLAGS= -O0 -g #CONFIGURE_ARGS+= CFLAGS=${CFLAGS:Q} #CONFIGURE_ARGS+= --disable-shared #CONFIGURE_ARGS+= --enable-static diff --git a/net/gupnp12/Makefile b/net/gupnp12/Makefile index e422956949d..5be83bd51e7 100644 --- a/net/gupnp12/Makefile +++ b/net/gupnp12/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2019/10/07 09:28:12 prlw1 Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/03 11:45:36 rillig Exp $ DISTNAME= gupnp-1.2.1 PKGNAME= ${DISTNAME:S/gupnp/gupnp12/} @@ -17,9 +17,9 @@ USE_TOOLS+= gmake pkg-config REPLACE_PYTHON= tools/gupnp-binding-tool-1.2 -PKGCONFIG_OVERRIDE+= output/meson-private/gupnp-1.2.pc -PKGCONFIG_OVERRIDE_STAGE=pre-install -MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/libgupnp +PKGCONFIG_OVERRIDE+= output/meson-private/gupnp-1.2.pc +PKGCONFIG_OVERRIDE_STAGE= pre-install +MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/libgupnp TEST_TARGET= check diff --git a/net/hesiod/builtin.mk b/net/hesiod/builtin.mk index 2b0f377eb57..67b4284cfc6 100644 --- a/net/hesiod/builtin.mk +++ b/net/hesiod/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2011/10/06 08:48:00 dholland Exp $ +# $NetBSD: builtin.mk,v 1.2 2019/11/03 11:45:37 rillig Exp $ BUILTIN_PKG:= hesiod @@ -19,7 +19,7 @@ IS_BUILTIN.hesiod= no IS_BUILTIN.hesiod= yes . endif .endif -MAKEVARS+= IS_BUILTIN.hesiod +MAKEVARS+= IS_BUILTIN.hesiod ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -36,15 +36,15 @@ _BLTN_HESIOD_300!= \ ${GREP} -c hesiod_init ${H_HESIOD} || ${TRUE} . if ${_BLTN_HESIOD_302} == "1" -BUILTIN_VERSION.hesiod= 3.0.2 +BUILTIN_VERSION.hesiod= 3.0.2 . elif ${_BLTN_HESIOD_300} == "1" -BUILTIN_VERSION.hesiod= 3.0.0 +BUILTIN_VERSION.hesiod= 3.0.0 . else -BUILTIN_VERSION.hesiod= 2.0.0 +BUILTIN_VERSION.hesiod= 2.0.0 . endif BUILTIN_PKG.hesiod= hesiod-${BUILTIN_VERSION.hesiod} .endif -MAKEVARS+= BUILTIN_PKG.hesiod +MAKEVARS+= BUILTIN_PKG.hesiod ### ### Determine whether we should use the built-in implementation if it @@ -71,4 +71,4 @@ USE_BUILTIN.hesiod!= \ . endif . endif # PREFER.hesiod .endif -MAKEVARS+= USE_BUILTIN.hesiod +MAKEVARS+= USE_BUILTIN.hesiod diff --git a/net/hping/Makefile b/net/hping/Makefile index 64347da7260..e619783c5b2 100644 --- a/net/hping/Makefile +++ b/net/hping/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2017/08/24 11:04:00 jperkin Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/03 11:45:37 rillig Exp $ # DISTNAME= hping2.0.0-rc3 @@ -22,7 +22,7 @@ INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin CONFIGURE_ENV+= PCAPINCDIR=${BUILDLINK_PREFIX.libpcap}/include CONFIGURE_ENV+= PCAPLIBDIR=${BUILDLINK_PREFIX.libpcap}/lib -CFLAGS.SunOS+= -Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t +CFLAGS.SunOS+= -Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t .include "options.mk" diff --git a/net/hping3/Makefile b/net/hping3/Makefile index 1a613121123..30f3d541c32 100644 --- a/net/hping3/Makefile +++ b/net/hping3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2019/05/23 19:23:09 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/03 11:45:37 rillig Exp $ # DISTNAME= hping3-alpha-2 @@ -13,7 +13,7 @@ COMMENT= Command-line oriented TCP/IP packet assembler/analyzer LICENSE= gnu-gpl-v2 AND original-bsd SUBST_CLASSES+= paths -SUBST_STAGE.paths= pre-configure +SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= Makefile.in configure SUBST_VARS.paths= PREFIX diff --git a/net/httptunnel/Makefile b/net/httptunnel/Makefile index b4fecbbf55c..66acf2deb65 100644 --- a/net/httptunnel/Makefile +++ b/net/httptunnel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2017/08/16 20:45:42 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/03 11:45:37 rillig Exp $ # DISTNAME= httptunnel-3.3 @@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Encapsulate TCP/IP connections in HTTP requests LICENSE= gnu-gpl-v2 -HAS_CONFIGURE= YES +HAS_CONFIGURE= YES CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} diff --git a/net/icinga-base/Makefile b/net/icinga-base/Makefile index 07ec57c6a04..134adbf3161 100644 --- a/net/icinga-base/Makefile +++ b/net/icinga-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2019/08/11 13:22:09 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/03 11:45:37 rillig Exp $ # DISTNAME= icinga-1.9.4 @@ -68,10 +68,10 @@ CONF_FILES+= ${EGDIR}/${files} ${PKG_SYSCONFDIR}/${files} .endfor CONF_FILES+= ${EGDIR}/icinga.conf ${PKG_SYSCONFDIR}/icinga.conf -OWN_DIRS_PERMS+=${ICINGADIR} ${ICINGA_USER} ${ICINGA_GROUP} 0775 -OWN_DIRS_PERMS+=${ICINGADIR}/archives ${ICINGA_USER} ${ICINGA_GROUP} 0775 -OWN_DIRS_PERMS+=${ICINGADIR}/rw ${ICINGA_USER} ${ICINGACMD_GROUP} 0775 -OWN_DIRS_PERMS+=${ICINGADIR}/checkresults ${ICINGA_USER} ${ICINGACMD_GROUP} 0775 +OWN_DIRS_PERMS+= ${ICINGADIR} ${ICINGA_USER} ${ICINGA_GROUP} 0775 +OWN_DIRS_PERMS+= ${ICINGADIR}/archives ${ICINGA_USER} ${ICINGA_GROUP} 0775 +OWN_DIRS_PERMS+= ${ICINGADIR}/rw ${ICINGA_USER} ${ICINGACMD_GROUP} 0775 +OWN_DIRS_PERMS+= ${ICINGADIR}/checkresults ${ICINGA_USER} ${ICINGACMD_GROUP} 0775 SUBST_CLASSES+= files SUBST_STAGE.files= post-build diff --git a/net/icsi-finger/Makefile b/net/icsi-finger/Makefile index 8aadf56d6d0..5f8389133bb 100644 --- a/net/icsi-finger/Makefile +++ b/net/icsi-finger/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2016/04/24 10:34:44 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2019/11/03 11:45:37 rillig Exp $ DISTNAME= icsi-finger-1.0.29 CATEGORIES= net @@ -29,54 +29,54 @@ CPPFLAGS+= -Wno-error=return-type MAKE_ENV.SunOS+= CPP_ARGS=-DSVR4 pre-configure: - chmod +w ${WRKSRC}/config.h - ${ECHO} \#define ManDir ${PREFIX}/${PKGMANDIR} >> \ - ${WRKSRC}/config.h - ${ECHO} \#define TARGETDIR \"${PKG_SYSCONFDIR}/fingerdir/targets\"\ - >> ${WRKSRC}/config.h - ${ECHO} \#define TargetDir ${PKG_SYSCONFDIR}/fingerdir/targets \ - >> ${WRKSRC}/config.h - ${ECHO} \#define TTYLOCFILE \"${PKG_SYSCONFDIR}/fingerdir/ttylocs\" \ - >> ${WRKSRC}/config.h - ${ECHO} \#define HOSTCONFIGFILE \"${PKG_SYSCONFDIR}/fingerdir/hostconfig\" \ - >> ${WRKSRC}/config.h - ${MV} -f ${WRKSRC}/support/inetd.conf-add \ - ${WRKSRC}/support/inetd.conf-add.bak - ${SED} -e s@/usr/local/etc@${PREFIX}/libexec@ \ - -e s@/usr/local/etc@${PREFIX}/libexec@ \ - ${WRKSRC}/support/inetd.conf-add.bak > \ - ${WRKSRC}/support/inetd.conf-add - ${MV} -f ${WRKSRC}/support/rc.local-add \ - ${WRKSRC}/support/rc.local-add.bak - ${SED} -e s@/usr/local/bin/@${PREFIX}/sbin/g@ \ - ${WRKSRC}/support/rc.local-add.bak > \ - ${WRKSRC}/support/rc.local-add - for i in ${WRKSRC}/src/targets/x-.busy \ - ${WRKSRC}/src/targets/x-.down; do \ - ${MV} $$i $$i.bak; ${SED} -e s@nawk@awk@ \ - -e s@/usr/local/etc@${PREFIX}/libexec@ \ - $$i.bak > $$i ; \ - ${RM} -f $$i.bak ; \ - done + chmod +w ${WRKSRC}/config.h + ${ECHO} \#define ManDir ${PREFIX}/${PKGMANDIR} >> \ + ${WRKSRC}/config.h + ${ECHO} \#define TARGETDIR \"${PKG_SYSCONFDIR}/fingerdir/targets\"\ + >> ${WRKSRC}/config.h + ${ECHO} \#define TargetDir ${PKG_SYSCONFDIR}/fingerdir/targets \ + >> ${WRKSRC}/config.h + ${ECHO} \#define TTYLOCFILE \"${PKG_SYSCONFDIR}/fingerdir/ttylocs\" \ + >> ${WRKSRC}/config.h + ${ECHO} \#define HOSTCONFIGFILE \"${PKG_SYSCONFDIR}/fingerdir/hostconfig\" \ + >> ${WRKSRC}/config.h + ${MV} -f ${WRKSRC}/support/inetd.conf-add \ + ${WRKSRC}/support/inetd.conf-add.bak + ${SED} -e s@/usr/local/etc@${PREFIX}/libexec@ \ + -e s@/usr/local/etc@${PREFIX}/libexec@ \ + ${WRKSRC}/support/inetd.conf-add.bak > \ + ${WRKSRC}/support/inetd.conf-add + ${MV} -f ${WRKSRC}/support/rc.local-add \ + ${WRKSRC}/support/rc.local-add.bak + ${SED} -e s@/usr/local/bin/@${PREFIX}/sbin/g@ \ + ${WRKSRC}/support/rc.local-add.bak > \ + ${WRKSRC}/support/rc.local-add + for i in ${WRKSRC}/src/targets/x-.busy \ + ${WRKSRC}/src/targets/x-.down; do \ + ${MV} $$i $$i.bak; ${SED} -e s@nawk@awk@ \ + -e s@/usr/local/etc@${PREFIX}/libexec@ \ + $$i.bak > $$i ; \ + ${RM} -f $$i.bak ; \ + done do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/finger ${DESTDIR}${PREFIX}/bin/gfinger - ${INSTALL_PROGRAM} ${WRKSRC}/src/fingerd ${DESTDIR}${PREFIX}/sbin/gfingerd - ${INSTALL_SCRIPT} ${WRKSRC}/src/vifinger ${DESTDIR}${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/src/packet2ascii ${DESTDIR}${PREFIX}/sbin - ${LN} -sf packet2ascii ${DESTDIR}${PREFIX}/sbin/ascii2packet - ${INSTALL_PROGRAM} ${WRKSRC}/src/in.fingerd ${DESTDIR}${PREFIX}/libexec - ${INSTALL_PROGRAM} ${WRKSRC}/src/in.cfingerd ${DESTDIR}${PREFIX}/libexec - ${INSTALL_PROGRAM} ${WRKSRC}/src/in.cfingerd ${DESTDIR}${PREFIX}/libexec - ${INSTALL_SCRIPT_DIR} ${DESTDIR}${PREFIX}/etc/fingerdir/targets - ${INSTALL_DATA} ${WRKSRC}/support/ttylocs ${XMPLD} - ${INSTALL_DATA} ${WRKSRC}/support/hostconfig ${XMPLD} - ${INSTALL_DATA} ${WRKSRC}/support/rc.local-add ${XMPLD} - ${INSTALL_DATA} ${WRKSRC}/support/services-add ${XMPLD} - ${INSTALL_DATA} ${WRKSRC}/support/inetd.conf-add ${XMPLD} - (cd ${WRKSRC}/src; ${MAKE} install.man DESTDIR=${DESTDIR} \ - INSTALLMAN=${INSTALL_MAN:Q}) - (cd ${WRKSRC}/src; ${MAKE} TARGETD=${XMPLDT} install.targets \ - INSTALLSCRIPT=${INSTALL_SCRIPT:Q}) + ${INSTALL_PROGRAM} ${WRKSRC}/src/finger ${DESTDIR}${PREFIX}/bin/gfinger + ${INSTALL_PROGRAM} ${WRKSRC}/src/fingerd ${DESTDIR}${PREFIX}/sbin/gfingerd + ${INSTALL_SCRIPT} ${WRKSRC}/src/vifinger ${DESTDIR}${PREFIX}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/src/packet2ascii ${DESTDIR}${PREFIX}/sbin + ${LN} -sf packet2ascii ${DESTDIR}${PREFIX}/sbin/ascii2packet + ${INSTALL_PROGRAM} ${WRKSRC}/src/in.fingerd ${DESTDIR}${PREFIX}/libexec + ${INSTALL_PROGRAM} ${WRKSRC}/src/in.cfingerd ${DESTDIR}${PREFIX}/libexec + ${INSTALL_PROGRAM} ${WRKSRC}/src/in.cfingerd ${DESTDIR}${PREFIX}/libexec + ${INSTALL_SCRIPT_DIR} ${DESTDIR}${PREFIX}/etc/fingerdir/targets + ${INSTALL_DATA} ${WRKSRC}/support/ttylocs ${XMPLD} + ${INSTALL_DATA} ${WRKSRC}/support/hostconfig ${XMPLD} + ${INSTALL_DATA} ${WRKSRC}/support/rc.local-add ${XMPLD} + ${INSTALL_DATA} ${WRKSRC}/support/services-add ${XMPLD} + ${INSTALL_DATA} ${WRKSRC}/support/inetd.conf-add ${XMPLD} + (cd ${WRKSRC}/src; ${MAKE} install.man DESTDIR=${DESTDIR} \ + INSTALLMAN=${INSTALL_MAN:Q}) + (cd ${WRKSRC}/src; ${MAKE} TARGETD=${XMPLDT} install.targets \ + INSTALLSCRIPT=${INSTALL_SCRIPT:Q}) .include "../../mk/bsd.pkg.mk" diff --git a/net/inadyn/Makefile b/net/inadyn/Makefile index b72895a055d..9e68a1d8fa6 100644 --- a/net/inadyn/Makefile +++ b/net/inadyn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2017/02/08 23:48:45 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/03 11:45:37 rillig Exp $ DISTNAME= inadyn-1.99.15 CATEGORIES= net @@ -16,8 +16,8 @@ GITHUB_TYPE= release USE_TOOLS+= autoconf automake gmake RCD_SCRIPTS= inadyn -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--enable-openssl --disable-gitcheck +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --enable-openssl --disable-gitcheck LIBS.SunOS= -lsocket -lnsl @@ -43,7 +43,7 @@ SUBST_STAGE.var= pre-configure .include "../../mk/bsd.prefs.mk" PKG_OPTIONS_VAR= PKG_OPTIONS.inadyn -PKG_SUPPORTED_OPTIONS= static +PKG_SUPPORTED_OPTIONS= static .include "../../mk/bsd.options.mk" diff --git a/net/ipcheck/Makefile b/net/ipcheck/Makefile index 5b7d0f9cb3d..1eff4867a7f 100644 --- a/net/ipcheck/Makefile +++ b/net/ipcheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/04/25 07:33:11 maya Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/03 11:45:37 rillig Exp $ # DISTNAME= ipcheck.233 @@ -17,7 +17,7 @@ EXTRACT_SUFX= #none EXTRACT_CMD= ${CP} "$${extract_file}" ipcheck.py NO_BUILD= yes -REPLACE_PYTHON= ipcheck.py +REPLACE_PYTHON= ipcheck.py INSTALLATION_DIRS= bin do-install: diff --git a/net/iperf/Makefile b/net/iperf/Makefile index f8c045d9996..5647cfc6b3c 100644 --- a/net/iperf/Makefile +++ b/net/iperf/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.22 2018/10/01 09:47:06 jperkin Exp $ +# $NetBSD: Makefile,v 1.23 2019/11/03 11:45:38 rillig Exp $ DISTNAME= iperf-2.0.5 PKGREVISION= 1 CATEGORIES= net benchmarks MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=iperf/} -PATCH_SITES= http://sourceforge.net/p/iperf/patches/28/attachment/ -PATCHFILES= nomaxcpu.patch -PATCH_DIST_STRIP=-p1 +PATCH_SITES= http://sourceforge.net/p/iperf/patches/28/attachment/ +PATCHFILES= nomaxcpu.patch +PATCH_DIST_STRIP= -p1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://iperf.sourceforge.net/ diff --git a/net/irrd/options.mk b/net/irrd/options.mk index 073a87e7b75..4e1cad9ee1c 100644 --- a/net/irrd/options.mk +++ b/net/irrd/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.3 2013/04/08 11:17:18 rodent Exp $ +# $NetBSD: options.mk,v 1.4 2019/11/03 11:45:38 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.irrd -PKG_SUPPORTED_OPTIONS= pthreads +PKG_OPTIONS_VAR= PKG_OPTIONS.irrd +PKG_SUPPORTED_OPTIONS= pthreads PKG_SUGGESTED_OPTIONS= pthreads .include "../../mk/bsd.options.mk" diff --git a/net/istgt/Makefile b/net/istgt/Makefile index 4133ccc6f4f..d70ece5284d 100644 --- a/net/istgt/Makefile +++ b/net/istgt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2018/10/08 12:04:33 sborrill Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/03 11:45:38 rillig Exp $ # DISTNAME= istgt-20150713 @@ -27,7 +27,7 @@ CONF_FILES= ${EG_DIR}/auth.conf ${PKG_SYSCONFDIR}/auth.conf \ ${EG_DIR}/istgt.conf ${PKG_SYSCONFDIR}/istgt.conf \ ${EG_DIR}/istgtcontrol.conf ${PKG_SYSCONFDIR}/istgtcontrol.conf -RCD_SCRIPTS= istgt +RCD_SCRIPTS= istgt INSTALLATION_DIRS+= bin ${EG_DIR} ${PKGMANDIR}/man1 CPPFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS diff --git a/net/jftpgw/Makefile b/net/jftpgw/Makefile index 767a78ed55d..0be50b5de9b 100644 --- a/net/jftpgw/Makefile +++ b/net/jftpgw/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.15 2018/12/09 21:05:33 adam Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/03 11:45:38 rillig Exp $ -DISTNAME= jftpgw-0.13.5 -CATEGORIES= net -MASTER_SITES= http://www.mcknight.de/jftpgw/ +DISTNAME= jftpgw-0.13.5 +CATEGORIES= net +MASTER_SITES= http://www.mcknight.de/jftpgw/ -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.mcknight.de/jftpgw/ -COMMENT= FTP gateway/proxy +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://www.mcknight.de/jftpgw/ +COMMENT= FTP gateway/proxy GNU_CONFIGURE= yes diff --git a/net/jigdo/Makefile b/net/jigdo/Makefile index 51daaccf1eb..c27e5b126a9 100644 --- a/net/jigdo/Makefile +++ b/net/jigdo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2019/08/22 12:23:39 ryoon Exp $ +# $NetBSD: Makefile,v 1.71 2019/11/03 11:45:38 rillig Exp $ DISTNAME= jigdo-0.7.3 PKGREVISION= 47 @@ -13,10 +13,10 @@ LICENSE= gnu-gpl-v2 MAKE_JOBS_SAFE= no -USE_TOOLS+= pkg-config wget:run -USE_LANGUAGES= c c++ -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --without-libdb +USE_TOOLS+= pkg-config wget:run +USE_LANGUAGES= c c++ +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --without-libdb BROKEN_GETTEXT_DETECTION= yes #.include "../../databases/db3/buildlink3.mk" diff --git a/net/jwhois/options.mk b/net/jwhois/options.mk index a506208415c..a158751f9a6 100644 --- a/net/jwhois/options.mk +++ b/net/jwhois/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.2 2012/10/23 20:49:38 shattered Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/03 11:45:38 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.jwhois -PKG_SUPPORTED_OPTIONS= jwhois-enable-cache +PKG_OPTIONS_VAR= PKG_OPTIONS.jwhois +PKG_SUPPORTED_OPTIONS= jwhois-enable-cache PKG_OPTIONS_LEGACY_VARS+= JWHOIS_ENABLE_CACHE:jwhois-enable-cache .include "../../mk/bsd.options.mk" diff --git a/net/kismet/Makefile b/net/kismet/Makefile index 7cfcd418df2..d2b837831ee 100644 --- a/net/kismet/Makefile +++ b/net/kismet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2019/08/11 13:22:09 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2019/11/03 11:45:38 rillig Exp $ DISTNAME= kismet-2008-05-R1 PKGNAME= kismet-2008.05.01 @@ -24,15 +24,15 @@ PLIST_SRC= PLIST .include "../../mk/bsd.prefs.mk" -KISMET_USER?= kismet -KISMET_GROUP?= kismet -PKG_GROUPS= ${KISMET_GROUP} -PKG_USERS= ${KISMET_USER}:${KISMET_GROUP} +KISMET_USER?= kismet +KISMET_GROUP?= kismet +PKG_GROUPS= ${KISMET_GROUP} +PKG_USERS= ${KISMET_USER}:${KISMET_GROUP} PKG_GECOS.${KISMET_USER}= Kismet user PKG_HOME.${KISMET_USER}= ${VARBASE}/log/kismet -PKG_GROUPS_VARS+= KISMET_GROUP -PKG_USERS_VARS+= KISMET_USER -BUILD_DEFS+= VARBASE +PKG_GROUPS_VARS+= KISMET_GROUP +PKG_USERS_VARS+= KISMET_USER +BUILD_DEFS+= VARBASE PKG_SYSCONFSUBDIR= ${PKGBASE} EGDIR= ${PREFIX}/share/examples/${PKGBASE} diff --git a/net/knot/Makefile b/net/knot/Makefile index 445a9c65e26..f7d5baf0cfc 100644 --- a/net/knot/Makefile +++ b/net/knot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2019/08/21 14:19:00 ryoon Exp $ +# $NetBSD: Makefile,v 1.48 2019/11/03 11:45:38 rillig Exp $ DISTNAME= knot-2.8.3 CATEGORIES= net @@ -26,7 +26,7 @@ CONFIGURE_ARGS.NetBSD+= --enable-recvmmsg=no .include "../../mk/bsd.prefs.mk" .if ${MACHINE_ARCH} == "i386" -CFLAGS += -march=i586 +CFLAGS += -march=i586 .endif USE_LIBTOOL= yes diff --git a/net/ktorrent/Makefile b/net/ktorrent/Makefile index b995d1c9ebf..16a8f32bd3f 100644 --- a/net/ktorrent/Makefile +++ b/net/ktorrent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.93 2019/08/22 12:23:40 ryoon Exp $ +# $NetBSD: Makefile,v 1.94 2019/11/03 11:45:38 rillig Exp $ DISTNAME= ktorrent-${KTORRENT_VER} PKGREVISION= 19 @@ -6,7 +6,7 @@ CATEGORIES= net kde #MASTER_SITES= http://ktorrent.pwsp.net/downloads/${KTORRENT_VER}/ EXTRACT_SUFX= .tar.bz2 -BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 +BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 .include "../../net/libktorrent/Makefile.version" @@ -24,7 +24,7 @@ DEPENDS+= oxygen-icons-[0-9]*:../../graphics/oxygen-icons CFLAGS+= -DENABLE_KIO_MAGNET=1 SCRDIR= share/kde/apps/ktorrent/scripts -CHECK_INTERPRETER_SKIP= ${SCRDIR}/auto_remove/auto_remove.py \ +CHECK_INTERPRETER_SKIP= ${SCRDIR}/auto_remove/auto_remove.py \ ${SCRDIR}/auto_resume/auto_resume.py \ ${SCRDIR}/email_notifications/email_notifications.py \ ${SCRDIR}/tracker_groups/tracker_groups.py diff --git a/net/lftp/options.mk b/net/lftp/options.mk index ca7f3b362e9..043840d0950 100644 --- a/net/lftp/options.mk +++ b/net/lftp/options.mk @@ -1,10 +1,10 @@ -# $NetBSD: options.mk,v 1.14 2017/07/08 21:45:42 adam Exp $ +# $NetBSD: options.mk,v 1.15 2019/11/03 11:45:39 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.lftp +PKG_OPTIONS_VAR= PKG_OPTIONS.lftp PKG_OPTIONS_OPTIONAL_GROUPS= ssl -PKG_OPTIONS_GROUP.ssl= gnutls ssl -PKG_SUPPORTED_OPTIONS= perl dnssec -PKG_SUGGESTED_OPTIONS= ssl +PKG_OPTIONS_GROUP.ssl= gnutls ssl +PKG_SUPPORTED_OPTIONS= perl dnssec +PKG_SUGGESTED_OPTIONS= ssl .include "../../mk/bsd.options.mk" diff --git a/net/libasr/Makefile b/net/libasr/Makefile index 9e29a2b5598..d26b45305f7 100644 --- a/net/libasr/Makefile +++ b/net/libasr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2018/07/31 07:04:29 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/03 11:45:39 rillig Exp $ DISTNAME= libasr-1.0.2 CATEGORIES= net @@ -9,8 +9,8 @@ HOMEPAGE= https://github.com/OpenSMTPD/libasr COMMENT= Asynchronous DNS resolver library LICENSE= isc AND modified-bsd AND 2-clause-bsd -GNU_CONFIGURE= yes -USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_ARGS+= --with-mantype=man .include "../../security/openssl/buildlink3.mk" diff --git a/net/libcmis/Makefile b/net/libcmis/Makefile index df53ff38bf9..8f1f257a06e 100644 --- a/net/libcmis/Makefile +++ b/net/libcmis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2019/08/22 12:23:40 ryoon Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/03 11:45:39 rillig Exp $ DISTNAME= libcmis-0.5.2 PKGREVISION= 3 @@ -12,11 +12,11 @@ HOMEPAGE= https://github.com/tdf/libcmis COMMENT= Client library for the CMIS interface LICENSE= gnu-gpl-v2 OR gnu-lgpl-v2 OR mpl-1.1 -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-man=no --disable-werror -USE_LANGUAGES+= c c++ -USE_TOOLS+= gmake pkg-config -USE_LIBTOOL= yes +USE_LANGUAGES+= c c++ +USE_TOOLS+= gmake pkg-config +USE_LIBTOOL= yes BUILDLINK_DEPMETHOD.boost-headers?= build .include "../../devel/boost-headers/buildlink3.mk" diff --git a/net/libdmapsharing/Makefile b/net/libdmapsharing/Makefile index a7acf609774..28d665574a8 100644 --- a/net/libdmapsharing/Makefile +++ b/net/libdmapsharing/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2019/07/21 22:25:31 wiz Exp $ +# $NetBSD: Makefile,v 1.60 2019/11/03 11:45:39 rillig Exp $ DISTNAME= libdmapsharing-2.1.9 PKGREVISION= 54 @@ -17,7 +17,7 @@ USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE= libdmapsharing.pc.in BUILDLINK_ABI_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.23.2 -BUILDLINK_ABI_DEPENDS.libsoup+= libsoup>=2.32 +BUILDLINK_ABI_DEPENDS.libsoup+= libsoup>=2.32 .include "../../devel/glib2/buildlink3.mk" .include "../../graphics/gdk-pixbuf2/buildlink3.mk" diff --git a/net/libdmapsharing3/Makefile b/net/libdmapsharing3/Makefile index b0ff4ca587c..4bda26cbdef 100644 --- a/net/libdmapsharing3/Makefile +++ b/net/libdmapsharing3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2019/07/21 22:25:32 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2019/11/03 11:45:39 rillig Exp $ DISTNAME= libdmapsharing-2.9.15 PKGNAME= ${DISTNAME:S/sharing/sharing3/} @@ -18,7 +18,7 @@ USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE= libdmapsharing-3.0.pc.in BUILDLINK_ABI_DEPENDS.gst-plugins0.10-base+= gst-plugins0.10-base>=0.10.23.2 -BUILDLINK_ABI_DEPENDS.libsoup+= libsoup>=2.32 +BUILDLINK_ABI_DEPENDS.libsoup+= libsoup>=2.32 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgee0.6/buildlink3.mk" diff --git a/net/libgdata/Makefile b/net/libgdata/Makefile index 63e14ee0ee6..1a06533f07c 100644 --- a/net/libgdata/Makefile +++ b/net/libgdata/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2019/08/22 12:23:40 ryoon Exp $ +# $NetBSD: Makefile,v 1.51 2019/11/03 11:45:39 rillig Exp $ DISTNAME= libgdata-0.16.1 PKGREVISION= 24 @@ -11,11 +11,11 @@ HOMEPAGE= http://live.gnome.org/libgdata COMMENT= Google Data API based Glib client library LICENSE= gnu-lgpl-v2.1 -GNU_CONFIGURE= yes -USE_PKGLOCALEDIR= yes -USE_LIBTOOL= yes -USE_TOOLS+= pkg-config gmake intltool msgfmt -USE_LANGUAGES= c c++ +GNU_CONFIGURE= yes +USE_PKGLOCALEDIR= yes +USE_LIBTOOL= yes +USE_TOOLS+= pkg-config gmake intltool msgfmt +USE_LANGUAGES= c c++ PKGCONFIG_OVERRIDE+= libgdata.pc.in diff --git a/net/libgdata0.6/Makefile b/net/libgdata0.6/Makefile index 286e73e15a3..4045d765788 100644 --- a/net/libgdata0.6/Makefile +++ b/net/libgdata0.6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/04/03 00:32:59 ryoon Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:39 rillig Exp $ DISTNAME= libgdata-0.6.6 PKGREVISION= 28 @@ -11,11 +11,11 @@ HOMEPAGE= http://live.gnome.org/libgdata COMMENT= Google Data API based Glib client library LICENSE= gnu-lgpl-v2.1 -GNU_CONFIGURE= yes -USE_PKGLOCALEDIR= yes -USE_LIBTOOL= yes -USE_TOOLS+= pkg-config gmake intltool msgfmt -USE_LANGUAGES= c c++ +GNU_CONFIGURE= yes +USE_PKGLOCALEDIR= yes +USE_LIBTOOL= yes +USE_TOOLS+= pkg-config gmake intltool msgfmt +USE_LANGUAGES= c c++ PKGCONFIG_OVERRIDE+= libgdata.pc.in diff --git a/net/libktorrent/Makefile b/net/libktorrent/Makefile index ad6983c3980..568f137e803 100644 --- a/net/libktorrent/Makefile +++ b/net/libktorrent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2019/08/22 12:23:40 ryoon Exp $ +# $NetBSD: Makefile,v 1.48 2019/11/03 11:45:39 rillig Exp $ DISTNAME= libktorrent-${LIBKTORRENT_VER} PKGREVISION= 18 @@ -24,7 +24,7 @@ USE_CMAKE= yes APIDOCS= /share/docs/libktorrent-api WRKSRC= ${WRKDIR}/libktorrent-${LIBKTORRENT_FILEVER} -BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 +BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 .include "../../mk/bsd.options.mk" diff --git a/net/liblive/Makefile b/net/liblive/Makefile index 75a750f19fa..264668a5b18 100644 --- a/net/liblive/Makefile +++ b/net/liblive/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2014/12/13 09:20:02 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2019/11/03 11:45:40 rillig Exp $ DISTNAME= live.2014.12.11 PKGNAME= lib${DISTNAME:S/./-/:S/.//g} @@ -22,11 +22,11 @@ INSTALLATION_DIRS+= share/examples/liblive .include "../../mk/bsd.fast.prefs.mk" .if ${OPSYS} == "SunOS" -. if ${MACHINE_ARCH} == "x86_64" +. if ${MACHINE_ARCH} == "x86_64" LIVE_BITNESS= -64bit -. else +. else LIVE_BITNESS= -32bit -. endif +. endif .else LIVE_BITNESS= # empty .endif diff --git a/net/libnice/Makefile b/net/libnice/Makefile index a8bf9f63d08..698baf1fd0b 100644 --- a/net/libnice/Makefile +++ b/net/libnice/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.57 2019/07/20 22:46:02 wiz Exp $ +# $NetBSD: Makefile,v 1.58 2019/11/03 11:45:40 rillig Exp $ PKGREVISION= 1 .include "Makefile.common" # introspection Makefile uses GNUisms -USE_TOOLS+= gmake -CONFIGURE_ARGS+= --without-gstreamer +USE_TOOLS+= gmake +CONFIGURE_ARGS+= --without-gstreamer PKGCONFIG_OVERRIDE+= nice/nice.pc.in diff --git a/net/libnids/options.mk b/net/libnids/options.mk index 526667a3afb..b7d7d5cb6ae 100644 --- a/net/libnids/options.mk +++ b/net/libnids/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.8 2009/12/09 12:27:28 obache Exp $ +# $NetBSD: options.mk,v 1.9 2019/11/03 11:45:40 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libnids @@ -15,7 +15,7 @@ PKG_SUGGESTED_OPTIONS= libnet10 glib ### libnet 1.0.x branch support ### .if !empty(PKG_OPTIONS:Mlibnet10) -. include "../../devel/libnet10/buildlink3.mk" +. include "../../devel/libnet10/buildlink3.mk" BUILDLINK_DEPMETHOD.libnet10+= build .endif @@ -23,7 +23,7 @@ BUILDLINK_DEPMETHOD.libnet10+= build ### libnet 1.1.x branch support ### .if !empty(PKG_OPTIONS:Mlibnet11) -. include "../../devel/libnet11/buildlink3.mk" +. include "../../devel/libnet11/buildlink3.mk" BUILDLINK_DEPMETHOD.libnet11+= build .endif diff --git a/net/libpcap/builtin.mk b/net/libpcap/builtin.mk index f90eec93d04..37bcb7c6083 100644 --- a/net/libpcap/builtin.mk +++ b/net/libpcap/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.18 2017/07/24 07:23:28 dbj Exp $ +# $NetBSD: builtin.mk,v 1.19 2019/11/03 11:45:40 rillig Exp $ BUILTIN_PKG:= libpcap @@ -20,7 +20,7 @@ IS_BUILTIN.libpcap= no IS_BUILTIN.libpcap= yes . endif .endif -MAKEVARS+= IS_BUILTIN.libpcap +MAKEVARS+= IS_BUILTIN.libpcap ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -77,9 +77,9 @@ BUILTIN_VERSION.libpcap= 0.5.0 . else BUILTIN_VERSION.libpcap= 0.4.0 . endif -BUILTIN_PKG.libpcap= libpcap-${BUILTIN_VERSION.libpcap} +BUILTIN_PKG.libpcap= libpcap-${BUILTIN_VERSION.libpcap} .endif -MAKEVARS+= BUILTIN_PKG.libpcap +MAKEVARS+= BUILTIN_PKG.libpcap ### ### Determine whether we should use the built-in implementation if it @@ -106,4 +106,4 @@ USE_BUILTIN.libpcap!= \ . endif . endif # PREFER.libpcap .endif -MAKEVARS+= USE_BUILTIN.libpcap +MAKEVARS+= USE_BUILTIN.libpcap diff --git a/net/libsoup/Makefile b/net/libsoup/Makefile index f6a7ef124c8..d6f29e0fc96 100644 --- a/net/libsoup/Makefile +++ b/net/libsoup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2019/10/10 14:23:53 wiz Exp $ +# $NetBSD: Makefile,v 1.58 2019/11/03 11:45:40 rillig Exp $ DISTNAME= libsoup-2.68.2 CATEGORIES= net gnome @@ -14,10 +14,10 @@ DEPENDS+= glib-networking-[0-9]*:../../net/glib-networking USE_TOOLS+= pkg-config gmake intltool msgfmt -PKGCONFIG_OVERRIDE+= output/meson-private/libsoup-2.4.pc -PKGCONFIG_OVERRIDE+= output/meson-private/libsoup-gnome-2.4.pc -PKGCONFIG_OVERRIDE_STAGE=pre-install -MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE} +PKGCONFIG_OVERRIDE+= output/meson-private/libsoup-2.4.pc +PKGCONFIG_OVERRIDE+= output/meson-private/libsoup-gnome-2.4.pc +PKGCONFIG_OVERRIDE_STAGE= pre-install +MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE} # disable vala detection MESON_ARGS+= -Dvapi=disabled diff --git a/net/libvncserver/options.mk b/net/libvncserver/options.mk index f599e798698..c47fc6b6b1a 100644 --- a/net/libvncserver/options.mk +++ b/net/libvncserver/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.3 2019/02/20 12:21:34 ryoon Exp $ +# $NetBSD: options.mk,v 1.4 2019/11/03 11:45:40 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.libVNCServer -PKG_SUPPORTED_OPTIONS= gnutls inet6 libgcrypt openssl sasl -PKG_SUGGESTED_OPTIONS= gnutls inet6 libgcrypt +PKG_OPTIONS_VAR= PKG_OPTIONS.libVNCServer +PKG_SUPPORTED_OPTIONS= gnutls inet6 libgcrypt openssl sasl +PKG_SUGGESTED_OPTIONS= gnutls inet6 libgcrypt PKG_OPTIONS_OPTIONAL_GROUPS+= ssl PKG_OPTIONS_GROUP.ssl= gnutls openssl diff --git a/net/lldpd/Makefile b/net/lldpd/Makefile index c1567aa4bb2..18f7a437fd3 100644 --- a/net/lldpd/Makefile +++ b/net/lldpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2019/08/11 13:22:10 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2019/11/03 11:45:40 rillig Exp $ DISTNAME= lldpd-1.0.1 PKGREVISION= 2 @@ -24,7 +24,7 @@ CONFIGURE_ARGS+= --with-privsep-chroot=${PKG_HOME._lldpd} CONFIGURE_ARGS+= --disable-hardening # run/lldpd.socket is created under this directory # (the default is ${PRERIX}/var, changed since 0.7.9) -CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --localstatedir=${VARBASE} BUILD_DEFS+= VARBASE EGDIR= ${PREFIX}/share/examples/${PKGBASE} diff --git a/net/lldpd/options.mk b/net/lldpd/options.mk index 3600c1fe0a0..29dd4c59d9c 100644 --- a/net/lldpd/options.mk +++ b/net/lldpd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2017/02/07 12:13:12 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/03 11:45:40 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.lldpd PKG_SUPPORTED_OPTIONS= json snmp xml @@ -6,18 +6,18 @@ PKG_SUGGESTED_OPTIONS= json snmp xml .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mjson) -. include "../../textproc/jansson/buildlink3.mk" +. include "../../textproc/jansson/buildlink3.mk" CONFIGURE_ARGS+= --with-json .endif .if !empty(PKG_OPTIONS:Msnmp) -. include "../../net/net-snmp/buildlink3.mk" +. include "../../net/net-snmp/buildlink3.mk" USE_TOOLS+= perl -. include "../../lang/perl5/buildlink3.mk" +. include "../../lang/perl5/buildlink3.mk" CONFIGURE_ARGS+= --with-snmp .endif .if !empty(PKG_OPTIONS:Mxml) -. include "../../textproc/libxml2/buildlink3.mk" +. include "../../textproc/libxml2/buildlink3.mk" CONFIGURE_ARGS+= --with-xml .endif diff --git a/net/llnlxdir/Makefile b/net/llnlxdir/Makefile index 40f9fed0c87..15ff55ebae0 100644 --- a/net/llnlxdir/Makefile +++ b/net/llnlxdir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2012/10/23 17:18:35 asau Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/03 11:45:40 rillig Exp $ # DISTNAME= llnlxdir2_1_2 @@ -12,8 +12,8 @@ MAINTAINER= tor@stormwall.org HOMEPAGE= http://www.llnl.gov/icc/sdd/img/xdir.html COMMENT= Advanced graphical FTP client -USE_IMAKE= yes -WRKSRC= ${WRKDIR}/llnlxdir2_1_2/sources +USE_IMAKE= yes +WRKSRC= ${WRKDIR}/llnlxdir2_1_2/sources INSTALLATION_DIRS= bin lib/X11/app-defaults do-install: diff --git a/net/llnlxftp/Makefile b/net/llnlxftp/Makefile index 5d9aee83644..0c7ff0b7541 100644 --- a/net/llnlxftp/Makefile +++ b/net/llnlxftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2012/10/23 17:18:35 asau Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:40 rillig Exp $ # DISTNAME= llnlxftp2.1 @@ -12,8 +12,8 @@ MAINTAINER= tor@stormwall.org HOMEPAGE= http://www.llnl.gov/icc/sdd/img/xftp.html COMMENT= Motif FTP client -USE_IMAKE= yes -WRKSRC= ${WRKDIR}/llnlxftp2.1/sources +USE_IMAKE= yes +WRKSRC= ${WRKDIR}/llnlxftp2.1/sources INSTALLATION_DIRS= bin lib/X11/app-defaults do-install: diff --git a/net/mDNSResponder/builtin.mk b/net/mDNSResponder/builtin.mk index 900575ca9eb..2fec19f560c 100644 --- a/net/mDNSResponder/builtin.mk +++ b/net/mDNSResponder/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.9 2018/02/26 18:13:16 ryoon Exp $ +# $NetBSD: builtin.mk,v 1.10 2019/11/03 11:45:41 rillig Exp $ BUILTIN_PKG:= mDNSResponder @@ -17,7 +17,7 @@ IS_BUILTIN.mDNSResponder= no IS_BUILTIN.mDNSResponder= yes . endif .endif # IS_BUILTIN.mDNSResponder -MAKEVARS+= IS_BUILTIN.mDNSResponder +MAKEVARS+= IS_BUILTIN.mDNSResponder ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -26,19 +26,19 @@ MAKEVARS+= IS_BUILTIN.mDNSResponder .if !defined(BUILTIN_PKG.mDNSResponder) && \ !empty(IS_BUILTIN.mDNSResponder:M[yY][eE][sS]) && \ empty(H_DNSSD:M__nonexistent__) -_BLTN_DNSSD_212_1!= \ +_BLTN_DNSSD_212_1!= \ ${GREP} -c 2120100 ${H_DNSSD} || ${TRUE} -_BLTN_DNSSD_214_3_2!= \ +_BLTN_DNSSD_214_3_2!= \ ${GREP} -c 2140302 ${H_DNSSD} || ${TRUE} -_BLTN_DNSSD_258_14!= \ +_BLTN_DNSSD_258_14!= \ ${GREP} -c 2581400 ${H_DNSSD} || ${TRUE} -_BLTN_DNSSD_320_5!= \ +_BLTN_DNSSD_320_5!= \ ${GREP} -c 3200500 ${H_DNSSD} || ${TRUE} -_BLTN_DNSSD_320_16!= \ +_BLTN_DNSSD_320_16!= \ ${GREP} -c 3201600 ${H_DNSSD} || ${TRUE} -_BLTN_DNSSD_878_1_1!= \ +_BLTN_DNSSD_878_1_1!= \ ${GREP} -c 8780101 ${H_DNSSD} || ${TRUE} -_BLTN_DNSSD_878_30_4!= \ +_BLTN_DNSSD_878_30_4!= \ ${GREP} -c 8783004 ${H_DNSSD} || ${TRUE} . if ${_BLTN_DNSSD_320_16} == "1" BUILTIN_VERSION.mDNSResponder= 320.16 @@ -85,4 +85,4 @@ USE_BUILTIN.mDNSResponder!= \ . endif . endif # PREFER.mDNSResponder .endif -MAKEVARS+= USE_BUILTIN.mDNSResponder +MAKEVARS+= USE_BUILTIN.mDNSResponder diff --git a/net/maradns/options.mk b/net/maradns/options.mk index f645a1206b8..108d3e49ab6 100644 --- a/net/maradns/options.mk +++ b/net/maradns/options.mk @@ -1,11 +1,11 @@ -# $NetBSD: options.mk,v 1.1 2012/02/28 21:55:27 cheusov Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/03 11:45:41 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.maradns -PKG_SUPPORTED_OPTIONS+= inet6 -PKG_SUGGESTED_OPTIONS+= inet6 +PKG_OPTIONS_VAR= PKG_OPTIONS.maradns +PKG_SUPPORTED_OPTIONS+= inet6 +PKG_SUGGESTED_OPTIONS+= inet6 .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Minet6) -CONFIGURE_ARGS+= --ipv6 +CONFIGURE_ARGS+= --ipv6 .endif diff --git a/net/mcast-tools/Makefile b/net/mcast-tools/Makefile index 692f11ea171..2bbfdc8a1b1 100644 --- a/net/mcast-tools/Makefile +++ b/net/mcast-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/23 17:18:36 asau Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/03 11:45:41 rillig Exp $ DISTNAME= mcast-tools-20061214 PKGREVISION= 1 @@ -16,7 +16,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= yacc lex -INSTALLATION_DIRS= share/examples/mcast-tools +INSTALLATION_DIRS= share/examples/mcast-tools post-install: ${INSTALL_DATA} ${WRKSRC}/pim6sd/pim6sd.conf.sample ${DESTDIR}${PREFIX}/share/examples/mcast-tools diff --git a/net/microdc2/Makefile b/net/microdc2/Makefile index 6a2579734c7..33fe29ccb0f 100644 --- a/net/microdc2/Makefile +++ b/net/microdc2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/07/15 02:02:27 ryoon Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/03 11:45:41 rillig Exp $ # DISTNAME= microdc2-0.15.6 @@ -10,8 +10,8 @@ MAINTAINER= d.den.brok@uni-bonn.de HOMEPAGE= http://corsair626.no-ip.org/microdc/ COMMENT= Console-based DirectConnect client -BUILDLINK_API_DEPENDS.readline+=readline>=4 -BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.16 +BUILDLINK_API_DEPENDS.readline+= readline>=4 +BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.16 GNU_CONFIGURE= yes diff --git a/net/mikutter/Makefile b/net/mikutter/Makefile index 897509defbf..5ad471ff7a6 100644 --- a/net/mikutter/Makefile +++ b/net/mikutter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.185 2019/10/06 11:19:15 tsutsui Exp $ +# $NetBSD: Makefile,v 1.186 2019/11/03 11:45:41 rillig Exp $ # DISTNAME= mikutter.3.9.6 @@ -32,7 +32,7 @@ WRKSRC= ${WRKDIR}/mikutter USE_LANGUAGES= # none USE_TOOLS+= pax -REPLACE_RUBY= mikutter.rb +REPLACE_RUBY= mikutter.rb REPLACE_RUBY_DIRS= core INSTALLATION_DIRS+= bin share/doc/mikutter share/applications share/mikutter diff --git a/net/mimms/Makefile b/net/mimms/Makefile index 53aacc93f8e..236aaf46154 100644 --- a/net/mimms/Makefile +++ b/net/mimms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/09/02 13:19:49 adam Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/03 11:45:41 rillig Exp $ DISTNAME= mimms-3.2.1 PKGREVISION= 1 @@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v3 # default is at lang/python/distutils.mk, but # drop the third digit from DISTNAME. Is it too tricky ? -EGG_NAME?= ${DISTNAME:C/-([^0-9])/_\1/gC/([0-9])\.([0-9])\.([0-9])/\1.\2/} +EGG_NAME?= ${DISTNAME:C/-([^0-9])/_\1/gC/([0-9])\.([0-9])\.([0-9])/\1.\2/} USE_LANGUAGES= # none PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 3.2 diff --git a/net/mosh/Makefile b/net/mosh/Makefile index fd0ab5c8079..bbfdeb7ce42 100644 --- a/net/mosh/Makefile +++ b/net/mosh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/08/11 13:22:11 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/03 11:45:41 rillig Exp $ DISTNAME= mosh-1.3.2 PKGREVISION= 1 @@ -10,10 +10,10 @@ HOMEPAGE= http://mosh.mit.edu/ COMMENT= Remote terminal application which allows roaming LICENSE= gnu-gpl-v3 -GNU_CONFIGURE= yes -USE_TOOLS+= perl:run pkg-config -USE_LANGUAGES+= c c++11 -USE_GCC_RUNTIME=yes +GNU_CONFIGURE= yes +USE_TOOLS+= perl:run pkg-config +USE_LANGUAGES+= c c++11 +USE_GCC_RUNTIME= yes REPLACE_PERL+= scripts/mosh.pl REPLACE_PERL+= src/tests/genbase64.pl diff --git a/net/mrt/Makefile b/net/mrt/Makefile index 1ecde73fb66..b5248bf05f7 100644 --- a/net/mrt/Makefile +++ b/net/mrt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/23 17:18:38 asau Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:41 rillig Exp $ # DISTNAME= mrt-2.2.2a-Aug11 @@ -13,8 +13,8 @@ COMMENT= Multi-threaded Routing Toolkit MAKE_JOBS_SAFE= no -WRKSRC= ${WRKDIR}/mrt/src -GNU_CONFIGURE= yes +WRKSRC= ${WRKDIR}/mrt/src +GNU_CONFIGURE= yes DESTDIR_VARNAME= # empty INSTALL_MAKE_FLAGS+= DESTDIR=${DESTDIR}${PREFIX}/sbin INSTALL_MAKE_FLAGS+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} diff --git a/net/mtr/options.mk b/net/mtr/options.mk index 4b8f4490130..417768d6f62 100644 --- a/net/mtr/options.mk +++ b/net/mtr/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2014/12/14 15:57:44 wiz Exp $ +# $NetBSD: options.mk,v 1.7 2019/11/03 11:45:42 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mtr PKG_SUPPORTED_OPTIONS= gtk inet6 @@ -13,7 +13,7 @@ CONFIGURE_ARGS+= --without-gtk .endif .if !empty(PKG_OPTIONS:Minet6) -CONFIGURE_ARGS+= --enable-ipv6 +CONFIGURE_ARGS+= --enable-ipv6 .else -CONFIGURE_ARGS+= --disable-ipv6 +CONFIGURE_ARGS+= --disable-ipv6 .endif diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile index fe164f5b1bc..4546d6bc449 100644 --- a/net/nagios-base/Makefile +++ b/net/nagios-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2019/08/11 13:22:11 wiz Exp $ +# $NetBSD: Makefile,v 1.79 2019/11/03 11:45:42 rillig Exp $ # DISTNAME= nagios-4.3.2 @@ -72,10 +72,10 @@ CONF_FILES+= ${EGDIR}/${files}-sample ${PKG_SYSCONFDIR}/${files} .endfor CONF_FILES+= ${EGDIR}/nagios.conf ${PKG_SYSCONFDIR}/nagios.conf -OWN_DIRS_PERMS+=${NAGIOSDIR} ${NAGIOS_USER} ${NAGIOS_GROUP} 0775 -OWN_DIRS_PERMS+=${NAGIOSDIR}/archives ${NAGIOS_USER} ${NAGIOS_GROUP} 0775 -OWN_DIRS_PERMS+=${NAGIOSDIR}/rw ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775 -OWN_DIRS_PERMS+=${NAGIOSDIR}/checkresults ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775 +OWN_DIRS_PERMS+= ${NAGIOSDIR} ${NAGIOS_USER} ${NAGIOS_GROUP} 0775 +OWN_DIRS_PERMS+= ${NAGIOSDIR}/archives ${NAGIOS_USER} ${NAGIOS_GROUP} 0775 +OWN_DIRS_PERMS+= ${NAGIOSDIR}/rw ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775 +OWN_DIRS_PERMS+= ${NAGIOSDIR}/checkresults ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775 SPECIAL_PERMS+= share/nagios/jsonquery.html ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0644 diff --git a/net/nagios-nrpe/options.mk b/net/nagios-nrpe/options.mk index a108c16e521..f270f58a02b 100644 --- a/net/nagios-nrpe/options.mk +++ b/net/nagios-nrpe/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2014/10/11 23:57:04 gdt Exp $ +# $NetBSD: options.mk,v 1.7 2019/11/03 11:45:42 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.nagios-nrpe PKG_SUPPORTED_OPTIONS= ssl tcpwrappers nagios-nrpe-args @@ -17,12 +17,12 @@ CONFIGURE_ARGS+= --disable-ssl .endif .if !empty(PKG_OPTIONS:Mnagios-nrpe-args) -CONFIGURE_ARGS+= --enable-command-args +CONFIGURE_ARGS+= --enable-command-args .else # Upstream's configure enables command args when given # "--disable-command-args", so (departing from pkgsrc norms) don't # give the --disable option. -#CONFIGURE_ARGS+= --disable-command-args +#CONFIGURE_ARGS+= --disable-command-args .endif .if !empty(PKG_OPTIONS:Mtcpwrappers) diff --git a/net/nagios-plugin-dnsmaster/Makefile b/net/nagios-plugin-dnsmaster/Makefile index 3fb98908d30..80c4696a655 100644 --- a/net/nagios-plugin-dnsmaster/Makefile +++ b/net/nagios-plugin-dnsmaster/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2018/12/03 02:29:20 manu Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 11:45:42 rillig Exp $ # DISTNAME= check_dnsmaster-0.1 @@ -12,7 +12,7 @@ HOMEPAGE= http://ftp.espci.fr/pub/nagios-local/ COMMENT= Domain NS record monitoring plugin for Nagios LICENSE= modified-bsd -INSTALLATION_DIRS+= libexec/nagios +INSTALLATION_DIRS+= libexec/nagios do-install: ${INSTALL_PROGRAM} ${WRKSRC}/check_dnsmaster \ diff --git a/net/nagios-plugin-dnsrbl/Makefile b/net/nagios-plugin-dnsrbl/Makefile index 13fc6571e24..955ec553407 100644 --- a/net/nagios-plugin-dnsrbl/Makefile +++ b/net/nagios-plugin-dnsrbl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2017/09/08 02:26:20 manu Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/03 11:45:42 rillig Exp $ # PKGNAME= nagios-plugin-dnsrbl-${DISTNAME:C/.*-//} @@ -12,7 +12,7 @@ HOMEPAGE= http://ftp.espci.fr/pub/nagios-local/ COMMENT= DNSRBL monitoring plugin for Nagios LICENSE= modified-bsd -INSTALLATION_DIRS+= libexec/nagios +INSTALLATION_DIRS+= libexec/nagios do-install: ${INSTALL_PROGRAM} ${WRKSRC}/check_dnsrbl \ diff --git a/net/nagios-plugin-dotpid/Makefile b/net/nagios-plugin-dotpid/Makefile index 3731cac590b..6dfa6c3ce17 100644 --- a/net/nagios-plugin-dotpid/Makefile +++ b/net/nagios-plugin-dotpid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2017/08/07 09:19:19 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/03 11:45:42 rillig Exp $ # PKGNAME= nagios-plugin-dotpid-${DISTNAME:C/.*-//} @@ -13,13 +13,13 @@ HOMEPAGE= http://ftp.espci.fr/pub/nagios-local/ COMMENT= /var/run/*.pid monitoring plugin for Nagios LICENSE= modified-bsd -INSTALLATION_DIRS+= libexec/nagios +INSTALLATION_DIRS+= libexec/nagios BUILD_DEFS+= NAGIOS_GROUP PKG_GROUPS_VARS= NAGIOS_GROUP PKG_GROUPS= ${NAGIOS_GROUP} -SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_dotpid \ +SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_dotpid \ ${REAL_ROOT_USER} ${NAGIOS_GROUP} 4551 do-install: diff --git a/net/nagios-plugin-dumpdates/Makefile b/net/nagios-plugin-dumpdates/Makefile index 24af3382dc6..ee688c87c48 100644 --- a/net/nagios-plugin-dumpdates/Makefile +++ b/net/nagios-plugin-dumpdates/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2017/03/09 23:47:47 manu Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/03 11:45:42 rillig Exp $ # PKGNAME= nagios-plugin-dumpdates-${DISTNAME:C/.*-//} @@ -12,7 +12,7 @@ HOMEPAGE= http://ftp.espci.fr/pub/nagios-local/ COMMENT= /etc/dumpdates monitoring plugin for Nagios LICENSE= modified-bsd -INSTALLATION_DIRS+= libexec/nagios +INSTALLATION_DIRS+= libexec/nagios do-install: ${INSTALL_PROGRAM} ${WRKSRC}/check_dumpdates \ diff --git a/net/nagios-plugin-fstab/Makefile b/net/nagios-plugin-fstab/Makefile index db73ba076c3..493dbb651c3 100644 --- a/net/nagios-plugin-fstab/Makefile +++ b/net/nagios-plugin-fstab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2015/09/14 13:53:03 manu Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/03 11:45:42 rillig Exp $ # PKGNAME= nagios-plugin-fstab-${DISTNAME:C/.*-//} @@ -16,7 +16,7 @@ ONLY_FOR_PLATFORM= FreeBSD-*-* NetBSD-*-* OpenBSD-*-* DragonFly-*-* PKG_DESTDIR_SUPPORT= user-destdir -INSTALLATION_DIRS+= libexec/nagios +INSTALLATION_DIRS+= libexec/nagios do-install: ${INSTALL_PROGRAM} ${WRKSRC}/check_fstab \ diff --git a/net/nagios-plugin-gfbricks/Makefile b/net/nagios-plugin-gfbricks/Makefile index 7da72b6f960..0911242a763 100644 --- a/net/nagios-plugin-gfbricks/Makefile +++ b/net/nagios-plugin-gfbricks/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2017/08/07 09:30:45 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/03 11:45:42 rillig Exp $ # PKGNAME= nagios-plugin-gfbricks-${DISTNAME:C/.*-//} @@ -13,13 +13,13 @@ HOMEPAGE= http://ftp.espci.fr/pub/nagios-local/ COMMENT= GlusterFS bricks monitoring plugin for Nagios LICENSE= modified-bsd -INSTALLATION_DIRS+= libexec/nagios +INSTALLATION_DIRS+= libexec/nagios BUILD_DEFS+= NAGIOS_GROUP PKG_GROUPS_VARS= NAGIOS_GROUP PKG_GROUPS= ${NAGIOS_GROUP} -SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_gfbricks \ +SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_gfbricks \ ${REAL_ROOT_USER} ${NAGIOS_GROUP} 4554 do-install: diff --git a/net/nagios-plugin-milter/Makefile b/net/nagios-plugin-milter/Makefile index f60d98a1cf5..d5d3ece9f7a 100644 --- a/net/nagios-plugin-milter/Makefile +++ b/net/nagios-plugin-milter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2017/08/14 15:24:42 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/03 11:45:43 rillig Exp $ # PKGNAME= nagios-plugin-milter-${DISTNAME:C/.*-//} @@ -13,7 +13,7 @@ HOMEPAGE= http://ftp.espci.fr/pub/nagios-local/ COMMENT= Milter monitoring plugin for Nagios LICENSE= modified-bsd -INSTALLATION_DIRS+= libexec/nagios +INSTALLATION_DIRS+= libexec/nagios BUILD_DEFS+= NAGIOS_GROUP PKG_GROUPS_VARS= NAGIOS_GROUP @@ -22,15 +22,15 @@ PKG_GROUPS= ${NAGIOS_GROUP} # The default `smmsp' username and group match the ones hardcoded # into mail/sendmail/Makefile. # -SMMSP_USER?= smmsp -BUILD_DEFS+= SMMSP_USER -PKG_GROUPS_VARS= SMMSP_USER -PKG_USERS_VARS= SMMSP_USER -PKG_GROUPS= ${SMMSP_USER} -PKG_USERS= ${SMMSP_USER}:${SMMSP_USER} -PKG_GECOS.${SMMSP_USER}=Sendmail Message Submission Program - -SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_milter \ +SMMSP_USER?= smmsp +BUILD_DEFS+= SMMSP_USER +PKG_GROUPS_VARS= SMMSP_USER +PKG_USERS_VARS= SMMSP_USER +PKG_GROUPS= ${SMMSP_USER} +PKG_USERS= ${SMMSP_USER}:${SMMSP_USER} +PKG_GECOS.${SMMSP_USER}= Sendmail Message Submission Program + +SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_milter \ ${SMMSP_USER} ${NAGIOS_GROUP} 4554 do-install: diff --git a/net/nagios-plugin-mysqlslave/Makefile b/net/nagios-plugin-mysqlslave/Makefile index 22e0715d1c7..f799cd877da 100644 --- a/net/nagios-plugin-mysqlslave/Makefile +++ b/net/nagios-plugin-mysqlslave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2017/08/07 09:30:45 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/03 11:45:43 rillig Exp $ # PKGNAME= nagios-plugin-mysqlslave-${DISTNAME:C/.*-//} @@ -15,13 +15,13 @@ LICENSE= modified-bsd MAKE_ENV+= PREFIX=${PREFIX} -INSTALLATION_DIRS+= libexec/nagios +INSTALLATION_DIRS+= libexec/nagios BUILD_DEFS+= NAGIOS_GROUP PKG_GROUPS_VARS+= NAGIOS_GROUP PKG_GROUPS= ${NAGIOS_GROUP} -SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_mysql_slave \ +SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_mysql_slave \ ${REAL_ROOT_USER} ${NAGIOS_GROUP} 4554 do-install: diff --git a/net/nagios-plugin-radius/Makefile b/net/nagios-plugin-radius/Makefile index 5dba7f273dd..b5962780fe1 100644 --- a/net/nagios-plugin-radius/Makefile +++ b/net/nagios-plugin-radius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:29 jperkin Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/03 11:45:43 rillig Exp $ # PKGNAME= nagios-plugin-radius-${PLUGINSVERSION} @@ -12,7 +12,7 @@ DEPENDS+= nagios-plugins-${PLUGINSVERSION}{,nb[0-9]*}:../../net/nagios-plugins DEPENDS+= p5-Net-SNMP-[0-9]*:../../net/p5-Net-SNMP # linked with libradiusclient-ng.so. -BUILDLINK_DEPMETHOD.radiusclient-ng= full +BUILDLINK_DEPMETHOD.radiusclient-ng= full BUILD_DEFS+= PKG_SYSCONFBASE diff --git a/net/nagios-plugin-raidctl/Makefile b/net/nagios-plugin-raidctl/Makefile index 8e9ddcb2710..b69b36172cc 100644 --- a/net/nagios-plugin-raidctl/Makefile +++ b/net/nagios-plugin-raidctl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2017/08/07 09:30:46 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/03 11:45:43 rillig Exp $ # PKGNAME= nagios-plugin-raidctl-${DISTNAME:C/.*-//} @@ -13,13 +13,13 @@ HOMEPAGE= http://ftp.espci.fr/pub/nagios-local/ COMMENT= RAIDframe monitoring plugin for Nagios LICENSE= modified-bsd -INSTALLATION_DIRS+= libexec/nagios +INSTALLATION_DIRS+= libexec/nagios BUILD_DEFS+= NAGIOS_GROUP PKG_GROUPS_VARS+= NAGIOS_GROUP PKG_GROUPS= ${NAGIOS_GROUP} -SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_raidctl \ +SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_raidctl \ ${REAL_ROOT_USER} ${NAGIOS_GROUP} 4554 do-install: diff --git a/net/nagios-plugin-spamd/Makefile b/net/nagios-plugin-spamd/Makefile index 97b4b4b3280..e475b32662f 100644 --- a/net/nagios-plugin-spamd/Makefile +++ b/net/nagios-plugin-spamd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/08/11 13:22:12 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/03 11:45:43 rillig Exp $ # DISTNAME= check_spamd-1.6.0 @@ -6,7 +6,7 @@ PKGNAME= nagios-plugin-${DISTNAME:S/check_//1} PKGREVISION= 4 CATEGORIES= net mail MASTER_SITES= ${MASTER_SITE_BACKUP} - # http://exchange.nagios.org/components/com_mtree/ + # http://exchange.nagios.org/components/com_mtree/ EXTRACT_SUFX= .pl MAINTAINER= pkgsrc-users@NetBSD.org @@ -28,11 +28,11 @@ REPLACE_PERL+= ${DISTFILES} PLUGIN_DIR= ${PREFIX}/libexec/nagios -SUBST_CLASSES+= check_spamd -SUBST_STAGE.check_spamd=post-configure -SUBST_FILES.check_spamd=${DISTFILES} -SUBST_MESSAGE.check_spamd=Fixing path to spamc. -SUBST_SED.check_spamd= -e 's|/usr/local/perl/bin/|${PREFIX}/${PERL5_SUB_INSTALLVENDORBIN}|1' +SUBST_CLASSES+= check_spamd +SUBST_STAGE.check_spamd= post-configure +SUBST_FILES.check_spamd= ${DISTFILES} +SUBST_MESSAGE.check_spamd= Fixing path to spamc. +SUBST_SED.check_spamd= -e 's|/usr/local/perl/bin/|${PREFIX}/${PERL5_SUB_INSTALLVENDORBIN}|1' INSTALLATION_DIRS+= ${PLUGIN_DIR} @@ -40,4 +40,4 @@ do-install: ${INSTALL_SCRIPT} "${WRKDIR}/${DISTFILES}" \ "${DESTDIR}${PLUGIN_DIR}/check_spamd" -.include "../../mk/bsd.pkg.mk" +#.include "../../mk/bsd.pkg.mk" diff --git a/net/nagios-plugin-syncrepl/Makefile b/net/nagios-plugin-syncrepl/Makefile index ef35873ca1f..af761537ee8 100644 --- a/net/nagios-plugin-syncrepl/Makefile +++ b/net/nagios-plugin-syncrepl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2018/10/30 02:48:24 manu Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/03 11:45:43 rillig Exp $ # PKGNAME= nagios-plugin-syncrepl-${DISTNAME:C/.*-//} @@ -12,7 +12,7 @@ HOMEPAGE= http://ftp.espci.fr/pub/nagios-local/ COMMENT= LDAP replication monitoring plugin for Nagios LICENSE= modified-bsd -INSTALLATION_DIRS+= libexec/nagios +INSTALLATION_DIRS+= libexec/nagios do-install: ${INSTALL_PROGRAM} ${WRKSRC}/check_syncrepl \ diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile index 483d1f1b5e0..7b159ff491d 100644 --- a/net/nagios-plugins/Makefile +++ b/net/nagios-plugins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2019/08/11 13:22:12 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2019/11/03 11:45:43 rillig Exp $ # PKGREVISION= 3 @@ -17,10 +17,10 @@ USE_TOOLS+= msgfmt msgmerge intltool perl:run xgettext PKG_GROUPS+= ${NAGIOS_GROUP} -CONFIGURE_ARGS+= --without-pgsql --without-mysql \ - --without-smbclient-command --without-snmpget-command \ - --without-snmpgetnext-command --without-fping-command \ - --without-apt-get-command +CONFIGURE_ARGS+= --without-pgsql --without-mysql \ + --without-smbclient-command --without-snmpget-command \ + --without-snmpgetnext-command --without-fping-command \ + --without-apt-get-command SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_icmp ${SETUID_ROOT_PERMS} SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_dhcp ${SETUID_ROOT_PERMS} @@ -42,8 +42,8 @@ SPECIAL_PERMS+= ${PREFIX}/libexec/nagios/check_ide_smart \ # required to enable large file support on Solaris .if ${OPSYS} == "SunOS" -CPPFLAGS_LFS!= getconf LFS_CFLAGS -MAKE_ENV+= CPPFLAGS_LFS=${CPPFLAGS_LFS:Q} +CPPFLAGS_LFS!= getconf LFS_CFLAGS +MAKE_ENV+= CPPFLAGS_LFS=${CPPFLAGS_LFS:Q} .endif LIBS.SunOS+= -lm diff --git a/net/nagios-plugins/Makefile.plugin b/net/nagios-plugins/Makefile.plugin index b00eca8164b..5081b8a0a51 100644 --- a/net/nagios-plugins/Makefile.plugin +++ b/net/nagios-plugins/Makefile.plugin @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.plugin,v 1.4 2011/04/08 22:56:12 morr Exp $ +# $NetBSD: Makefile.plugin,v 1.5 2019/11/03 11:45:43 rillig Exp $ # -INSTALLATION_DIRS+= libexec/nagios +INSTALLATION_DIRS+= libexec/nagios do-build: cd ${WRKSRC}/lib && ${SETENV} ${MAKE_ENV} \ diff --git a/net/nbtscan/Makefile b/net/nbtscan/Makefile index 84bcde0c222..ed8ba384967 100644 --- a/net/nbtscan/Makefile +++ b/net/nbtscan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2017/09/03 08:36:57 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:43 rillig Exp $ # DISTNAME= nbtscan-1.5.1 @@ -6,9 +6,9 @@ PKGREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.inetcat.net/software/ -PATCHFILES= nbtscan-jumbo-patch-20141122.gz -PATCH_SITES= http://www.NetBSD.org/~dholland/patchkits/nbtscan/ -PATCH_DIST_STRIP= -p1 +PATCHFILES= nbtscan-jumbo-patch-20141122.gz +PATCH_SITES= http://www.NetBSD.org/~dholland/patchkits/nbtscan/ +PATCH_DIST_STRIP= -p1 MAINTAINER= pkgsrc-users@NetBSD.org #HOMEPAGE= http://www.inetcat.net/software/nbtscan.html diff --git a/net/nemesis/Makefile b/net/nemesis/Makefile index 47c4703cc06..9d26029cedc 100644 --- a/net/nemesis/Makefile +++ b/net/nemesis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2017/09/03 08:36:57 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/03 11:45:43 rillig Exp $ DISTNAME= nemesis-1.4 PKGREVISION= 2 @@ -9,7 +9,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org #HOMEPAGE= http://jeff.wwti.com/nemesis/ COMMENT= Nemesis is a command-line UNIX network packet injection suite -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-libnet-includes=${BUILDLINK_PREFIX.libnet10}/include/libnet10 CONFIGURE_ARGS+= --with-libnet-libs=${BUILDLINK_PREFIX.libnet10}/lib/libnet10 diff --git a/net/net-snmp/builtin.mk b/net/net-snmp/builtin.mk index 7b43583e7e8..ffdd90fe822 100644 --- a/net/net-snmp/builtin.mk +++ b/net/net-snmp/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2006/07/29 16:48:27 adam Exp $ +# $NetBSD: builtin.mk,v 1.2 2019/11/03 11:45:44 rillig Exp $ BUILTIN_PKG:= net-snmp @@ -17,7 +17,7 @@ IS_BUILTIN.net-snmp= no IS_BUILTIN.net-snmp= yes . endif .endif -MAKEVARS+= IS_BUILTIN.net-snmp +MAKEVARS+= IS_BUILTIN.net-snmp ### ### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to @@ -35,7 +35,7 @@ BUILTIN_VERSION.net-snmp!= \ ' ${H_NETSNMP:Q} BUILTIN_PKG.net-snmp= net-snmp-${BUILTIN_VERSION.net-snmp} .endif -MAKEVARS+= BUILTIN_PKG.net-snmp +MAKEVARS+= BUILTIN_PKG.net-snmp ### ### Determine whether we should use the built-in implementation if it @@ -62,4 +62,4 @@ USE_BUILTIN.net-snmp!= \ . endif . endif .endif -MAKEVARS+= USE_BUILTIN.net-snmp +MAKEVARS+= USE_BUILTIN.net-snmp diff --git a/net/netatalk22/Makefile b/net/netatalk22/Makefile index 15c32d77236..08dccf803b5 100644 --- a/net/netatalk22/Makefile +++ b/net/netatalk22/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2019/08/11 13:22:12 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/03 11:45:44 rillig Exp $ DISTNAME= netatalk-2.2.6 -PKGNAME= ${DISTNAME:C/-/22-/} +PKGNAME= ${DISTNAME:C/-/22-/} PKGREVISION= 13 CATEGORIES= net print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/} @@ -24,13 +24,13 @@ GNU_CONFIGURE= yes BUILDLINK_TRANSFORM+= l:db48:${BDB_TYPE} PKG_SYSCONFSUBDIR= netatalk -EGDIR= ${PREFIX}/share/examples/netatalk -CONF_FILES= ${EGDIR}/AppleVolumes.default ${PKG_SYSCONFDIR}/AppleVolumes.default -CONF_FILES+= ${EGDIR}/AppleVolumes.system ${PKG_SYSCONFDIR}/AppleVolumes.system -CONF_FILES+= ${EGDIR}/afpd.conf ${PKG_SYSCONFDIR}/afpd.conf -CONF_FILES+= ${EGDIR}/atalkd.conf ${PKG_SYSCONFDIR}/atalkd.conf -CONF_FILES+= ${EGDIR}/netatalk.conf ${PKG_SYSCONFDIR}/netatalk.conf -CONF_FILES+= ${EGDIR}/papd.conf ${PKG_SYSCONFDIR}/papd.conf +EGDIR= ${PREFIX}/share/examples/netatalk +CONF_FILES= ${EGDIR}/AppleVolumes.default ${PKG_SYSCONFDIR}/AppleVolumes.default +CONF_FILES+= ${EGDIR}/AppleVolumes.system ${PKG_SYSCONFDIR}/AppleVolumes.system +CONF_FILES+= ${EGDIR}/afpd.conf ${PKG_SYSCONFDIR}/afpd.conf +CONF_FILES+= ${EGDIR}/atalkd.conf ${PKG_SYSCONFDIR}/atalkd.conf +CONF_FILES+= ${EGDIR}/netatalk.conf ${PKG_SYSCONFDIR}/netatalk.conf +CONF_FILES+= ${EGDIR}/papd.conf ${PKG_SYSCONFDIR}/papd.conf .include "../../mk/bsd.prefs.mk" diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index 41ea214a02c..fd2f76490c4 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2019/08/11 13:22:13 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/03 11:45:44 rillig Exp $ DISTNAME= netatalk-3.1.12 -PKGNAME= ${DISTNAME:C/-/3-/} +PKGNAME= ${DISTNAME:C/-/3-/} PKGREVISION= 5 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/} diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile index 2883234fc18..804078c933f 100644 --- a/net/netdisco/Makefile +++ b/net/netdisco/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2019/08/11 13:22:13 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2019/11/03 11:45:44 rillig Exp $ DISTNAME= netdisco-1.3.3_with_mibs PKGNAME= ${DISTNAME:S/_with_mibs//} @@ -126,7 +126,7 @@ SUBST_FILES.apachevers= html/admin_user.html html/change_pw.html html/login.htm SUBST_FILES.apachevers+= html/logout.html html/portcontrol.html SUBST_FILES.apachevers+= html/public_debugging.html SUBST_SED.apachevers= -e "s|connection->remote_ip|connection->client_ip|g" -SUBST_MESSAGE.apachevers= Fixing perl files for apache > 2.2. +SUBST_MESSAGE.apachevers= Fixing perl files for apache > 2.2. do-build: ${RM} -f ${WRKSRC:Q}/html/doc/ChangeLog.txt diff --git a/net/netgroup/Makefile b/net/netgroup/Makefile index 9ed833c818e..b627450abed 100644 --- a/net/netgroup/Makefile +++ b/net/netgroup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/10/23 17:18:41 asau Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/03 11:45:44 rillig Exp $ # DISTNAME= netgroup-0.0 @@ -13,7 +13,7 @@ USE_FEATURES+= cdefs NOT_FOR_PLATFORM= Interix-*-* # no netgroups INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 -INSTALL_TARGET= inst-all +INSTALL_TARGET= inst-all INSTALL_MAKE_FLAGS+= BINDIR=${DESTDIR}${PREFIX}/bin \ MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 diff --git a/net/nicotine/Makefile b/net/nicotine/Makefile index f772f106d40..638d20220c8 100644 --- a/net/nicotine/Makefile +++ b/net/nicotine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2019/09/02 13:19:52 adam Exp $ +# $NetBSD: Makefile,v 1.54 2019/11/03 11:45:44 rillig Exp $ DISTNAME= nicotine-1.0.8 PKGREVISION= 17 @@ -13,9 +13,9 @@ LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-gtk2>=1.99.16:../../x11/py-gtk2 -USE_PKGLOCALEDIR= yes -USE_LANGUAGES= # empty -PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 +USE_PKGLOCALEDIR= yes +USE_LANGUAGES= # empty +PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} diff --git a/net/nidentd/Makefile b/net/nidentd/Makefile index b965942e9cc..24cd2c49766 100644 --- a/net/nidentd/Makefile +++ b/net/nidentd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2013/04/06 03:45:21 rodent Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/03 11:45:44 rillig Exp $ # DISTNAME= nidentd-1.0 @@ -15,10 +15,10 @@ DEPENDS+= lsof>=4.61:../../sysutils/lsof INSTALLATION_DIRS+= etc libexec do-build: - ${SED} \ - -e 's,@LOCALBASE@,${LOCALBASE},' \ - <${WRKSRC}/nidentd >${WRKSRC}/nidentd.tmp - ${MV} ${WRKSRC}/nidentd.tmp ${WRKSRC}/nidentd + ${SED} \ + -e 's,@LOCALBASE@,${LOCALBASE},' \ + <${WRKSRC}/nidentd >${WRKSRC}/nidentd.tmp + ${MV} ${WRKSRC}/nidentd.tmp ${WRKSRC}/nidentd do-install: ${INSTALL_DATA} ${WRKSRC}/nidentd.nat ${DESTDIR}${PREFIX}/etc/nidentd.nat.example ; \ diff --git a/net/ns/Makefile b/net/ns/Makefile index 271ca04371a..b5088832213 100644 --- a/net/ns/Makefile +++ b/net/ns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2018/03/12 11:17:22 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2019/11/03 11:45:44 rillig Exp $ DISTNAME= ns-src-2.35 PKGNAME= ns-2.35 @@ -16,7 +16,7 @@ USE_TOOLS+= gmake GNU_CONFIGURE= yes PTHREAD_OPTS+= require # Perl is only needed if you want to run the validation tests. -#USE_TOOLS+= perl +#USE_TOOLS+= perl CONFIGURE_ARGS+= LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; ${ECHO} $$TCL_LIBS'`" CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl} diff --git a/net/nsd/Makefile b/net/nsd/Makefile index ca922644e7f..fe10b4298f0 100644 --- a/net/nsd/Makefile +++ b/net/nsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.105 2019/08/21 14:16:40 ryoon Exp $ +# $NetBSD: Makefile,v 1.106 2019/11/03 11:45:45 rillig Exp $ DISTNAME= nsd-4.2.2 CATEGORIES= net @@ -10,7 +10,7 @@ COMMENT= Authoritative-only DNS server LICENSE= modified-bsd BUILD_DEFS+= VARBASE NSD_USER NSD_GROUP -FILES_SUBST+= NSD_USER=${NSD_USER} NSD_GROUP=${NSD_GROUP} +FILES_SUBST+= NSD_USER=${NSD_USER} NSD_GROUP=${NSD_GROUP} BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7 @@ -32,28 +32,28 @@ GNU_CONFIGURE= yes PKG_SYSCONFSUBDIR= nsd -CONFIGURE_ARGS+=--prefix=${PREFIX:Q} -CONFIGURE_ARGS+=--localstatedir=${VARBASE} -CONFIGURE_ARGS+=--with-configdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} +CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --with-configdir=${PKG_SYSCONFDIR:Q} .if !empty(PKG_OPTIONS:Minet6) -CONFIGURE_ARGS+=--enable-ipv6 +CONFIGURE_ARGS+= --enable-ipv6 .else -CONFIGURE_ARGS+=--disable-ipv6 +CONFIGURE_ARGS+= --disable-ipv6 .endif .if !empty(PKG_OPTIONS:Mrrl) -CONFIGURE_ARGS+=--enable-ratelimit +CONFIGURE_ARGS+= --enable-ratelimit .else -CONFIGURE_ARGS+=--disable-ratelimit +CONFIGURE_ARGS+= --disable-ratelimit .endif -CONFIGURE_ARGS+=--disable-dnstap +CONFIGURE_ARGS+= --disable-dnstap -CONFIGURE_ARGS+=--with-pidfile=${VARBASE}/run/nsd/nsd.pid -CONFIGURE_ARGS+=--with-user=${NSD_USER} -CONFIGURE_ARGS+=--with-dbfile=${VARBASE}/nsd/nsd.db -CONFIGURE_ARGS+=--with-xfrdfile=${VARBASE}/nsd/nsd-xfrd.state -CONFIGURE_ARGS+=--with-libevent=${BUILDLINK_PREFIX.libevent} -CONFIGURE_ARGS+=--with-ssl=${BUILDLINK_PREFIX.openssl} +CONFIGURE_ARGS+= --with-pidfile=${VARBASE}/run/nsd/nsd.pid +CONFIGURE_ARGS+= --with-user=${NSD_USER} +CONFIGURE_ARGS+= --with-dbfile=${VARBASE}/nsd/nsd.db +CONFIGURE_ARGS+= --with-xfrdfile=${VARBASE}/nsd/nsd-xfrd.state +CONFIGURE_ARGS+= --with-libevent=${BUILDLINK_PREFIX.libevent} +CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl} RCD_SCRIPTS= nlnsd @@ -65,7 +65,7 @@ PKG_USERS= ${NSD_USER}:${NSD_GROUP} CONF_FILES+= share/examples/nsd/nsd.conf ${PKG_SYSCONFDIR}/nsd.conf -OWN_DIRS_PERMS+= ${VARBASE}/nsd ${NSD_USER} ${NSD_GROUP} 755 +OWN_DIRS_PERMS+= ${VARBASE}/nsd ${NSD_USER} ${NSD_GROUP} 755 INSTALLATION_DIRS= share/examples/nsd diff --git a/net/nslint/Makefile b/net/nslint/Makefile index 53aff522381..ea8d3aba205 100644 --- a/net/nslint/Makefile +++ b/net/nslint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2017/01/19 18:52:20 agc Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:45 rillig Exp $ DISTNAME= nslint-3.1 CATEGORIES= net @@ -10,8 +10,8 @@ HOMEPAGE= http://ee.lbl.gov/ftp.html COMMENT= Perform consistency checks on DNS zone files LICENSE= original-bsd -GNU_CONFIGURE= YES -BUILD_TARGET= nslint +GNU_CONFIGURE= YES +BUILD_TARGET= nslint INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 .include "../../mk/bsd.pkg.mk" diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile index bbb7a1b7882..99d96b39000 100644 --- a/net/ntp4/Makefile +++ b/net/ntp4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.101 2019/08/11 13:22:13 wiz Exp $ +# $NetBSD: Makefile,v 1.102 2019/11/03 11:45:45 rillig Exp $ # DISTNAME= ntp-4.2.8p13 @@ -17,9 +17,9 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_TOOLS+= pax perl:run -CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+=--with-locfile=loc/pkgsrc -CONFIGURE_ENV+= PATH_PERL=${PERL5} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-locfile=loc/pkgsrc +CONFIGURE_ENV+= PATH_PERL=${PERL5} OVERRIDE_DIRDEPTH= 4 diff --git a/net/ocaml-conduit/Makefile b/net/ocaml-conduit/Makefile index a3e0a85096d..13a908f01df 100644 --- a/net/ocaml-conduit/Makefile +++ b/net/ocaml-conduit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2019/07/01 16:01:36 jaapb Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 11:45:45 rillig Exp $ GITHUB_PROJECT= ocaml-conduit GITHUB_TAG= v${PKGVERSION_NOREV} @@ -13,7 +13,7 @@ LICENSE= isc USE_LANGUAGES= # none -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes DUNE_BUILD_PACKAGES= conduit OPAM_INSTALL_FILES= conduit diff --git a/net/ocaml-ipaddr/Makefile b/net/ocaml-ipaddr/Makefile index 9bce48125a4..ac5180990c8 100644 --- a/net/ocaml-ipaddr/Makefile +++ b/net/ocaml-ipaddr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/03/05 18:53:15 jaapb Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/03 11:45:45 rillig Exp $ GITHUB_PROJECT= ocaml-ipaddr GITHUB_TAG= v${PKGVERSION_NOREV} @@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/mirage/ocaml-ipaddr/ COMMENT= Library for manipulation of IP and MAC addresses LICENSE= isc -OCAML_USE_DUNE= yes +OCAML_USE_DUNE= yes DUNE_BUILD_PACKAGES= macaddr ipaddr OPAM_INSTALL_FILES= macaddr ipaddr diff --git a/net/ocamlnet/Makefile b/net/ocamlnet/Makefile index fb0f2c484cd..f9d443a8815 100644 --- a/net/ocamlnet/Makefile +++ b/net/ocamlnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2019/07/21 22:25:33 wiz Exp $ +# $NetBSD: Makefile,v 1.66 2019/11/03 11:45:45 rillig Exp $ # DISTNAME= ocamlnet-4.1.6 @@ -19,7 +19,7 @@ CONFIGURE_ARGS+= -without-nethttpd -disable-tcl -disable-apache \ USE_TOOLS+= gmake BUILD_TARGET= all OCAML_USE_FINDLIB= yes -OCAML_FINDLIB_DIRS= \ +OCAML_FINDLIB_DIRS= \ equeue netcamlbox netcgi2-plex netcgi2 netclient netmulticore \ netplex netshm netstring-pcre netstring netsys netunidata \ netzip rpc-auth-local rpc-generator rpc diff --git a/net/ocamlnet/buildlink3.mk b/net/ocamlnet/buildlink3.mk index ed8c03eb587..c94e4aeeb3c 100644 --- a/net/ocamlnet/buildlink3.mk +++ b/net/ocamlnet/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2018/07/19 15:15:28 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2019/11/03 11:45:45 rillig Exp $ BUILDLINK_TREE+= ocamlnet @@ -7,7 +7,7 @@ OCAMLNET_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocamlnet+= ocamlnet>=4.1.2 BUILDLINK_ABI_DEPENDS.ocamlnet+= ocamlnet>=4.1.6nb1 -BUILDLINK_PKGSRCDIR.ocamlnet?= ../../net/ocamlnet +BUILDLINK_PKGSRCDIR.ocamlnet?= ../../net/ocamlnet .endif # OCAMLNET_BUILDLINK3_MK diff --git a/net/ocsinventory-agent/Makefile b/net/ocsinventory-agent/Makefile index 88d4069065e..537a2ebfdea 100644 --- a/net/ocsinventory-agent/Makefile +++ b/net/ocsinventory-agent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/08/11 13:22:13 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 11:45:45 rillig Exp $ # VERS= 1.1.2.1 PKGREVISION= 11 @@ -24,8 +24,8 @@ DEPENDS+= dmidecode-[0-9]*:../../sysutils/dmidecode WRKSRC= ${WRKDIR}/Ocsinventory-Agent-${VERS} -BUILD_DEFS+= VARBASE -AUTO_MKDIRS=yes +BUILD_DEFS+= VARBASE +AUTO_MKDIRS= yes .include "../../mk/bsd.prefs.mk" diff --git a/net/oinkmaster/Makefile b/net/oinkmaster/Makefile index 1e07640ab38..95f47965d95 100644 --- a/net/oinkmaster/Makefile +++ b/net/oinkmaster/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2019/08/11 13:22:13 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2019/11/03 11:45:45 rillig Exp $ DISTNAME= oinkmaster-2.0 PKGREVISION= 7 @@ -39,9 +39,9 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 \ share/snort/rules do-install: -. for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f} -. endfor +.for f in ${DOCS} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f} +.endfor ${INSTALL_DATA} ${WRKSRC}/oinkmaster.conf ${DESTDIR}${EGDIR} ${INSTALL_DATA} ${WRKSRC}/template-examples.conf ${DESTDIR}${EGDIR} diff --git a/net/oinkmaster/options.mk b/net/oinkmaster/options.mk index 3971287daac..9c0f3435cac 100644 --- a/net/oinkmaster/options.mk +++ b/net/oinkmaster/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.2 2011/09/17 11:12:26 shattered Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/03 11:45:45 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.oinkmaster -PKG_SUPPORTED_OPTIONS= perl +PKG_SUPPORTED_OPTIONS= perl PKG_OPTIONS_LEGACY_OPTS+= oinkmaster-perl-tools:perl .include "../../mk/bsd.options.mk" diff --git a/net/omniNotify/Makefile b/net/omniNotify/Makefile index 5be5ba85696..43e656d0244 100644 --- a/net/omniNotify/Makefile +++ b/net/omniNotify/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2015/12/25 04:41:14 dholland Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/03 11:45:45 rillig Exp $ # DISTNAME= omniNotify-2.1 @@ -6,9 +6,9 @@ PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=omninotify/} -PATCH_SITES= http://www.NetBSD.org/~dholland/patchkits/omniNotify/ -PATCHFILES= omniNotify-jumbo-patch-20151224.gz -PATCH_DIST_STRIP= -p1 +PATCH_SITES= http://www.NetBSD.org/~dholland/patchkits/omniNotify/ +PATCHFILES= omniNotify-jumbo-patch-20151224.gz +PATCH_DIST_STRIP= -p1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://omninotify.sourceforge.net/ diff --git a/net/omniORB/Makefile b/net/omniORB/Makefile index c20ab70f8fc..3168c1b5e1f 100644 --- a/net/omniORB/Makefile +++ b/net/omniORB/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/09/02 13:19:50 adam Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 11:45:46 rillig Exp $ DISTNAME= omniORB-4.1.7 PKGREVISION= 2 @@ -16,19 +16,19 @@ GNU_CONFIGURE= YES USE_LANGUAGES= c c++03 USE_TOOLS+= gmake -PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniCOS4.pc.in -PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniCOSDynamic4.pc.in -PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniConnectionMgmt4.pc.in -PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniDynamic4.pc.in -PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniORB4.pc.in -PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omnithread3.pc.in +PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniCOS4.pc.in +PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniCOSDynamic4.pc.in +PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniConnectionMgmt4.pc.in +PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniDynamic4.pc.in +PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omniORB4.pc.in +PKGCONFIG_OVERRIDE+= contrib/pkgconfig/omnithread3.pc.in # omniORB requires native threads support PTHREAD_OPTS= require native -RCD_SCRIPTS= omninames +RCD_SCRIPTS= omninames -OMNIORB_ETCDIR?= ${PKG_SYSCONFDIR} -OMNIORB_CONFIG= ${OMNIORB_ETCDIR}/omniORB.cfg +OMNIORB_ETCDIR?= ${PKG_SYSCONFDIR} +OMNIORB_CONFIG= ${OMNIORB_ETCDIR}/omniORB.cfg CONFIGURE_ARGS+= --with-omniORB-config=${OMNIORB_CONFIG:Q} #CONFIGURE_ARGS+= --with-omniNames-logdir= @@ -43,8 +43,8 @@ PKG_SUGGESTED_OPTIONS= inet6 CONFIGURE_ARGS+=--disable-ipv6 .endif -PY_PATCHPLIST= yes -REPLACE_PYTHON+= src/tool/omniidl/python/scripts/omniidlrun.py +PY_PATCHPLIST= yes +REPLACE_PYTHON+= src/tool/omniidl/python/scripts/omniidlrun.py PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 4.1.7 post-install: diff --git a/net/openag/Makefile b/net/openag/Makefile index 68ff9412a98..3e1b39c3c1c 100644 --- a/net/openag/Makefile +++ b/net/openag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2017/09/03 08:53:13 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/03 11:45:46 rillig Exp $ # DISTNAME= OpenAG-1.1.1 @@ -24,7 +24,7 @@ INSTALLATION_DIRS+= share/doc/OpenAG post-install: .for i in AUTHORS ChangeLog INSTALL NEWS README - ${INSTALL_MAN} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/OpenAG/${i} + ${INSTALL_MAN} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/OpenAG/${i} .endfor .include "../../mk/bsd.pkg.mk" diff --git a/net/openconnect/Makefile b/net/openconnect/Makefile index fdfeb4f8b86..0b8ebbf7f3c 100644 --- a/net/openconnect/Makefile +++ b/net/openconnect/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/09/12 19:23:13 schmonz Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/03 11:45:46 rillig Exp $ DISTNAME= openconnect-8.05 CATEGORIES= net security @@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --disable-nls REPLACE_PYTHON= trojans/tncc-wrapper.py REPLACE_BASH= trojans/*.sh -PYTHON_VERSIONS_ACCEPTED=27 +PYTHON_VERSIONS_ACCEPTED= 27 INSTALLATION_DIRS= sbin include lib ${PKGMANDIR}/man8 diff --git a/net/openslp/hacks.mk b/net/openslp/hacks.mk index 99cb47af9ab..16066d441d5 100644 --- a/net/openslp/hacks.mk +++ b/net/openslp/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.2 2007/10/16 23:48:59 tnn Exp $ +# $NetBSD: hacks.mk,v 1.3 2019/11/03 11:45:46 rillig Exp $ .if !defined(LIBEXIF_HACKS_MK) LIBEXIF_HACKS_MK= # defined @@ -10,7 +10,7 @@ LIBEXIF_HACKS_MK= # defined .if !empty(MACHINE_PLATFORM:MIRIX-5.3-*) PKG_HACKS+= sys_types_h-inttypes_h-conflict post-wrapper: - ${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h + ${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h # should match int8_t, int16_t, and int32_t (only) .endif diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index c7cd5a6f574..6a6b13fb188 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2019/07/20 22:46:40 wiz Exp $ +# $NetBSD: Makefile,v 1.70 2019/11/03 11:45:46 rillig Exp $ DISTNAME= ${OPENVPN_DISTNAME} PKGREVISION= 2 @@ -37,7 +37,7 @@ SMF_METHODS= openvpn PKG_GROUPS= ${OPENVPN_GROUP} PKG_USERS= ${OPENVPN_USER}:${OPENVPN_GROUP} -PKG_GECOS.${OPENVPN_USER}=OpenVPN\ server\ user +PKG_GECOS.${OPENVPN_USER}= OpenVPN\ server\ user MESSAGE_SUBST+= OPENVPN_PLUGINSDIR=${PREFIX}/${OPENVPN_PLUGINSDIR} diff --git a/net/openvpn/Makefile.common b/net/openvpn/Makefile.common index bc944ea7339..a573ee19537 100644 --- a/net/openvpn/Makefile.common +++ b/net/openvpn/Makefile.common @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.15 2019/02/21 16:22:54 adam Exp $ +# $NetBSD: Makefile.common,v 1.16 2019/11/03 11:45:46 rillig Exp $ # used by net/openvpn/Makefile # used by net/openvpn-acct-wtmpx/Makefile # used by net/openvpn-nagios/Makefile -OPENVPN_DISTNAME= openvpn-2.4.7 -OPENVPN_DISTFILE= ${OPENVPN_DISTNAME}.tar.xz -OPENVPN_MASTER_SITES= http://swupdate.openvpn.org/community/releases/ +OPENVPN_DISTNAME= openvpn-2.4.7 +OPENVPN_DISTFILE= ${OPENVPN_DISTNAME}.tar.xz +OPENVPN_MASTER_SITES= http://swupdate.openvpn.org/community/releases/ SITES.${OPENVPN_DISTFILE}= ${OPENVPN_MASTER_SITES} OPENVPN_USER?= openvpn diff --git a/net/openwbem/Makefile b/net/openwbem/Makefile index d1895c0057c..239e001a499 100644 --- a/net/openwbem/Makefile +++ b/net/openwbem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/08/11 13:22:13 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:46 rillig Exp $ DISTNAME= openwbem-3.2.2 PKGREVISION= 7 @@ -9,11 +9,11 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.openwbem.org/ COMMENT= Web-based Enterprise Management software -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= ac_cv_path_TRUE_PATHNAME=true ac_cv_path_FALSE_PATHNAME=false -USE_TOOLS+= gmake -USE_LIBTOOL= yes -USE_LANGUAGES+= c c++ +USE_TOOLS+= gmake +USE_LIBTOOL= yes +USE_LANGUAGES+= c c++ INSTALLATION_DIRS+= etc/openwbem include/openwbem var/openwbem INSTALLATION_DIRS+= share/openwbem lib/openwbem share/examples/openwbem @@ -24,11 +24,11 @@ INSTALLATION_DIRS+= lib/authentication PKG_SYSCONFSUBDIR= openwbem EGDIR= ${PREFIX}/share/examples/openwbem CONF_FILES+= ${EGDIR}/openwbem.conf \ - ${PKG_SYSCONFDIR}/openwbem.conf + ${PKG_SYSCONFDIR}/openwbem.conf CONF_FILES+= ${EGDIR}/owgencert \ - ${PKG_SYSCONFDIR}/owgencert + ${PKG_SYSCONFDIR}/owgencert CONF_FILES+= ${EGDIR}/ssleay.cnf \ - ${PKG_SYSCONFDIR}/ssleay.cnf + ${PKG_SYSCONFDIR}/ssleay.cnf SUBST_CLASSES+= mkdir @@ -80,8 +80,8 @@ SUBST_FILES.mkdir+= ${WRKSRC}/src/providers/cpp/instance/OW_NameSpace/Makefile.i SUBST_FILES.mkdir+= ${WRKSRC}/src/providers/cpp/instance/CIM_IndicationFilter/Makefile.in SUBST_FILES.mkdir+= ${WRKSRC}/src/providers/cpp/instance/CIM_NamespaceInManager/Makefile.in SUBST_FILES.mkdir+= ${WRKSRC}/src/providers/cpp/instance/OpenWBEM_ConfigSettingData/Makefile.in -SUBST_SED.mkdir= -e "s|\$$(INSTALL_PROGRAM) -d|\$${mkdir_p}|g" -SUBST_MESSAGE.mkdir= Fixing ${INSTALL_PROGRAM} -d lines (the -s does not interoperate with -d) +SUBST_SED.mkdir= -e "s|\$$(INSTALL_PROGRAM) -d|\$${mkdir_p}|g" +SUBST_MESSAGE.mkdir= Fixing ${INSTALL_PROGRAM} -d lines (the -s does not interoperate with -d) CONFIGURE_ARGS.NetBSD+= ac_cv_func_gethostbyname_r=no diff --git a/net/ortp/Makefile b/net/ortp/Makefile index 13916a8c7c9..535c8f82c39 100644 --- a/net/ortp/Makefile +++ b/net/ortp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2018/09/13 12:10:03 jperkin Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 11:45:46 rillig Exp $ # DISTNAME= ortp-0.16.1 @@ -15,7 +15,7 @@ GNU_CONFIGURE= yes USE_LANGUAGES= c99 USE_LIBTOOL= yes -CONFIGURE_ENV+= ac_cv_path_DOXYGEN=false +CONFIGURE_ENV+= ac_cv_path_DOXYGEN=false PKGCONFIG_OVERRIDE+= ortp.pc.in CFLAGS.SunOS+= -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ -DBSD_COMP diff --git a/net/p5-File-Rsync/Makefile b/net/p5-File-Rsync/Makefile index be7e2eccef1..5151a6a84cc 100644 --- a/net/p5-File-Rsync/Makefile +++ b/net/p5-File-Rsync/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2019/08/11 13:22:14 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/03 11:45:46 rillig Exp $ DISTNAME= File-Rsync-0.49 PKGNAME= p5-${DISTNAME} @@ -24,10 +24,10 @@ SUBST_MESSAGE.fix-paths= Fixing absolute paths SUBST_FILES.fix-paths= Rsync.pm SUBST_VARS.fix-paths+= PREFIX -PERL5_MODULE_TYPE= MakeMaker -PERL5_PACKLIST= auto/File/Rsync/.packlist +PERL5_MODULE_TYPE= MakeMaker +PERL5_PACKLIST= auto/File/Rsync/.packlist -USE_LANGUAGES= # none +USE_LANGUAGES= # none .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/p5-FusionInventory-Agent/Makefile b/net/p5-FusionInventory-Agent/Makefile index 8870af96b5f..57e5de48c4b 100644 --- a/net/p5-FusionInventory-Agent/Makefile +++ b/net/p5-FusionInventory-Agent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/08/11 13:22:14 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/03 11:45:47 rillig Exp $ DISTNAME= FusionInventory-Agent-2.3.21 PKGNAME= p5-${DISTNAME} @@ -12,8 +12,8 @@ COMMENT= Fusion Inventory agent LICENSE= gnu-gpl-v2 PKG_SYSCONFSUBDIR?= fusioninventory -EGDIR= ${PREFIX}/share/examples/fusioninventory -CONF_FILES+= ${EGDIR}/agent.cfg ${PKG_SYSCONFDIR}/agent.cfg +EGDIR= ${PREFIX}/share/examples/fusioninventory +CONF_FILES+= ${EGDIR}/agent.cfg ${PKG_SYSCONFDIR}/agent.cfg BUILD_DEFS+= VARBASE @@ -40,7 +40,7 @@ BUILD_DEPENDS+= p5-Test-MockModule-[0-9]*:../../devel/p5-Test-MockModule BUILD_DEPENDS+= p5-Test-MockObject-[0-9]*:../../devel/p5-Test-MockObject BUILD_DEPENDS+= p5-Test-NoWarnings-[0-9]*:../../devel/p5-Test-NoWarnings -PERL5_PACKLIST= auto/FusionInventory/Agent/.packlist +PERL5_PACKLIST= auto/FusionInventory/Agent/.packlist PERL5_MODULE_TYPE= Module::Install::Bundled diff --git a/net/p5-Net-Amazon-S3/Makefile b/net/p5-Net-Amazon-S3/Makefile index cf55b341545..4053dbf5d34 100644 --- a/net/p5-Net-Amazon-S3/Makefile +++ b/net/p5-Net-Amazon-S3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2019/08/11 13:22:16 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2019/11/03 11:45:47 rillig Exp $ DISTNAME= Net-Amazon-S3-0.85 PKGNAME= p5-${DISTNAME} @@ -40,9 +40,9 @@ TEST_DEPENDS+= p5-Test-LoadAllModules-[0-9]*:../../devel/p5-Test-LoadAllModules REPLACE_PERL= bin/s3cl -PERL5_PACKLIST= auto/Net/Amazon/S3/.packlist +PERL5_PACKLIST= auto/Net/Amazon/S3/.packlist post-install: - (cd ${DESTDIR}; ${FIND} . -name \*.pm \( -perm 0555 -or -perm 0755 \) -exec ${CHMOD} -x '{}' \; ) + (cd ${DESTDIR}; ${FIND} . -name \*.pm \( -perm 0555 -or -perm 0755 \) -exec ${CHMOD} -x '{}' \; ) .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/p5-Net-Amazon/Makefile b/net/p5-Net-Amazon/Makefile index 7d0f1796bc1..d36ca42c6d7 100644 --- a/net/p5-Net-Amazon/Makefile +++ b/net/p5-Net-Amazon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2019/08/11 13:22:16 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2019/11/03 11:45:47 rillig Exp $ DISTNAME= Net-Amazon-0.62 PKGNAME= p5-${DISTNAME} @@ -17,7 +17,7 @@ DEPENDS+= p5-XML-Simple>=2.08:../../textproc/p5-XML-Simple DEPENDS+= p5-Log-Log4perl>=0.30:../../devel/p5-Log-Log4perl #DEPENDS+= {perl>=5.007.003,p5-Time-HiRes>=1}:../../time/p5-Time-HiRes -PERL5_PACKLIST= auto/Net/Amazon/.packlist +PERL5_PACKLIST= auto/Net/Amazon/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/p5-Net-DHCP/Makefile b/net/p5-Net-DHCP/Makefile index 8b70fb82084..43c3a74f6e6 100644 --- a/net/p5-Net-DHCP/Makefile +++ b/net/p5-Net-DHCP/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/08/11 13:22:17 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/03 11:45:47 rillig Exp $ # DISTNAME= Net-DHCP-0.696 @@ -12,8 +12,8 @@ HOMEPAGE= https://metacpan.org/release/Net-DHCP COMMENT= Object methods to create a DHCP packet LICENSE= ${PERL5_LICENSE} -EGSUBDIR= share/examples/p5-Net-DHCP -INSTALLATION_DIRS+= ${EGSUBDIR} +EGSUBDIR= share/examples/p5-Net-DHCP +INSTALLATION_DIRS+= ${EGSUBDIR} EGFILES= examples/dhcp_sniffer.pl EGFILES+= examples/dhcpd.pl @@ -27,7 +27,7 @@ EGFILES+= examples/send_packet.pl PERL5_REQD+= 5.8.0 PERL5_MODULE_TYPE= Module::Build -REPLACE_PERL+= ${EGFILES} +REPLACE_PERL+= ${EGFILES} # has /bin/false as shebang argument CHECK_INTERPRETER_SKIP+= ${PERL5_SUB_INSTALLVENDORLIB}/Net/DHCP/Constants.pm CHECK_INTERPRETER_SKIP+= ${PERL5_SUB_INSTALLVENDORLIB}/Net/DHCP/Packet.pm diff --git a/net/p5-Net-GitHub/Makefile b/net/p5-Net-GitHub/Makefile index 2d7eba2e448..b4154f2df5f 100644 --- a/net/p5-Net-GitHub/Makefile +++ b/net/p5-Net-GitHub/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2019/08/11 13:22:19 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2019/11/03 11:45:47 rillig Exp $ DISTNAME= Net-GitHub-0.95 PKGNAME= p5-${DISTNAME} @@ -19,8 +19,8 @@ DEPENDS+= p5-Moo-[0-9]*:../../devel/p5-Moo DEPENDS+= p5-Type-Tiny-[0-9]*:../../devel/p5-Type-Tiny DEPENDS+= p5-JSON-MaybeXS-[0-9]*:../../converters/p5-JSON-MaybeXS DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI -DEPENDS+= p5-Cache-LRU-[0-9]*:../../devel/p5-Cache-LRU -DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww +DEPENDS+= p5-Cache-LRU-[0-9]*:../../devel/p5-Cache-LRU +DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/p5-Net-Jifty/Makefile b/net/p5-Net-Jifty/Makefile index ac1ac0ed228..940f4d511e6 100644 --- a/net/p5-Net-Jifty/Makefile +++ b/net/p5-Net-Jifty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2019/08/11 13:22:20 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2019/11/03 11:45:47 rillig Exp $ DISTNAME= Net-Jifty-0.14 PKGNAME= p5-${DISTNAME} @@ -24,8 +24,8 @@ DEPENDS+= p5-YAML-[0-9]*:../../textproc/p5-YAML DEPENDS+= p5-Test-MockObject-[0-9]*:../../devel/p5-Test-MockObject DEPENDS+= p5-DateTime-[0-9]*:../../time/p5-DateTime -MAKE_ENV+= PERL_USE_UNSAFE_INC=1 -PERL5_PACKLIST= auto/Net/Jifty/.packlist +MAKE_ENV+= PERL_USE_UNSAFE_INC=1 +PERL5_PACKLIST= auto/Net/Jifty/.packlist PERL5_MODULE_TYPE= Module::Install::Bundled .include "../../lang/perl5/module.mk" diff --git a/net/p5-Net-Libdnet/Makefile b/net/p5-Net-Libdnet/Makefile index 12d74020be0..cc3b78c8e0d 100644 --- a/net/p5-Net-Libdnet/Makefile +++ b/net/p5-Net-Libdnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/08/11 13:22:21 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 11:45:47 rillig Exp $ # DISTNAME= Net-Libdnet-0.99 @@ -16,7 +16,7 @@ LICENSE= 2-clause-bsd PERL5_PACKLIST= auto/Net/Libdnet/.packlist USE_LANGUAGES+= c -DEPENDS+= p5-Class-Gomor-[0-9]*:../../devel/p5-Class-Gomor +DEPENDS+= p5-Class-Gomor-[0-9]*:../../devel/p5-Class-Gomor .include "../../net/libdnet/buildlink3.mk" .include "../../lang/perl5/module.mk" diff --git a/net/p5-Net-OpenID-Common/Makefile b/net/p5-Net-OpenID-Common/Makefile index 23b0d055795..c909c275f8f 100644 --- a/net/p5-Net-OpenID-Common/Makefile +++ b/net/p5-Net-OpenID-Common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2019/08/11 13:22:21 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/03 11:45:47 rillig Exp $ DISTNAME= Net-OpenID-Common-1.20 PKGNAME= p5-${DISTNAME} @@ -15,8 +15,8 @@ DEPENDS+= p5-Crypt-DH-GMP>=0.00011:../../security/p5-Crypt-DH-GMP REPLACE_PERL= lib/Net/OpenID/URIFetch.pm -PERL5_PACKLIST= auto/Net/OpenID/Common/.packlist -USE_LANGUAGES= # none +PERL5_PACKLIST= auto/Net/OpenID/Common/.packlist +USE_LANGUAGES= # none .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/p5-Net-XMPP/Makefile b/net/p5-Net-XMPP/Makefile index 59cee016104..7a43220a426 100644 --- a/net/p5-Net-XMPP/Makefile +++ b/net/p5-Net-XMPP/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/08/11 13:22:24 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/03 11:45:47 rillig Exp $ # DISTNAME= Net-XMPP-1.05 @@ -15,8 +15,8 @@ LICENSE= gnu-lgpl-v2.1 DEPENDS+= p5-XML-Stream>=1.24:../../textproc/p5-XML-Stream DEPENDS+= p5-Digest-SHA1>=1.02:../../security/p5-Digest-SHA1 -PERL5_MODULE_TYPE= Module::Build -PERL5_PACKLIST= auto/Net/XMPP/.packlist +PERL5_MODULE_TYPE= Module::Build +PERL5_PACKLIST= auto/Net/XMPP/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/p5-Net-Z3950-ZOOM/Makefile b/net/p5-Net-Z3950-ZOOM/Makefile index f0f44c94359..a99574880ac 100644 --- a/net/p5-Net-Z3950-ZOOM/Makefile +++ b/net/p5-Net-Z3950-ZOOM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2019/08/11 13:22:24 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2019/11/03 11:45:48 rillig Exp $ DISTNAME= Net-Z3950-ZOOM-1.30 PKGNAME= p5-${DISTNAME} @@ -11,8 +11,8 @@ HOMEPAGE= https://metacpan.org/release/Net-Z3950-ZOOM COMMENT= Perl extension for talking to Z39.50 servers LICENSE= ${PERL5_LICENSE} -DEPENDS+= p5-Event>=1.06:../../devel/p5-Event -DEPENDS+= p5-MARC-Record>=2.0.0:../../databases/p5-MARC-Record +DEPENDS+= p5-Event>=1.06:../../devel/p5-Event +DEPENDS+= p5-MARC-Record>=2.0.0:../../databases/p5-MARC-Record BUILDLINK_API_DEPENDS.yaz+= yaz>=4 PERL5_PACKLIST= auto/Net/Z3950/ZOOM/.packlist diff --git a/net/p5-NetAddr-IP/Makefile b/net/p5-NetAddr-IP/Makefile index 9c22bba5328..0d3e849c430 100644 --- a/net/p5-NetAddr-IP/Makefile +++ b/net/p5-NetAddr-IP/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2019/08/11 13:22:24 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2019/11/03 11:45:48 rillig Exp $ DISTNAME= NetAddr-IP-4.079 PKGNAME= p5-${DISTNAME} @@ -20,7 +20,7 @@ REPLACE_PERL+= Lite/Util/Util.pm REPLACE_PERL+= Lite/Util/lib/NetAddr/IP/UtilPP.pm REPLACE_PERL+= Lite/Util/tlib/NetAddr/IP/Util_IS.pm -SUBST_CLASSES+= fixperl +SUBST_CLASSES+= fixperl SUBST_STAGE.fixperl= pre-configure SUBST_MESSAGE.fixperl= Fixing perl interpreter SUBST_FILES.fixperl+= Lite/Util/Makefile.PL diff --git a/net/p5-WebService-Google-Reader/Makefile b/net/p5-WebService-Google-Reader/Makefile index 68aa3d61250..b19b46df16b 100644 --- a/net/p5-WebService-Google-Reader/Makefile +++ b/net/p5-WebService-Google-Reader/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2019/08/11 13:22:27 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/03 11:45:48 rillig Exp $ # DISTNAME= WebService-Google-Reader-0.23 @@ -15,13 +15,13 @@ LICENSE= ${PERL5_LICENSE} PERL5_PACKLIST= auto/WebService/Google/Reader/.packlist #BUILD_DEPENDS+= {perl>=5.10.1,p5-Test-Simple>=0.82}:../../devel/p5-Test-Simple -DEPENDS+= p5-JSON-XS>=2:../../converters/p5-JSON-XS -DEPENDS+= p5-Class-Accessor-[0-9]*:../../devel/p5-Class-Accessor -DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww -DEPENDS+= p5-JSON-[0-9]*:../../converters/p5-JSON -DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI -DEPENDS+= p5-XML-Atom-[0-9]*:../../textproc/p5-XML-Atom -DEPENDS+= p5-XML-LibXML-[0-9]*:../../textproc/p5-XML-LibXML +DEPENDS+= p5-JSON-XS>=2:../../converters/p5-JSON-XS +DEPENDS+= p5-Class-Accessor-[0-9]*:../../devel/p5-Class-Accessor +DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww +DEPENDS+= p5-JSON-[0-9]*:../../converters/p5-JSON +DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI +DEPENDS+= p5-XML-Atom-[0-9]*:../../textproc/p5-XML-Atom +DEPENDS+= p5-XML-LibXML-[0-9]*:../../textproc/p5-XML-LibXML .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/p5-XML-RPC/Makefile b/net/p5-XML-RPC/Makefile index d360108d5d9..1994683bb0e 100644 --- a/net/p5-XML-RPC/Makefile +++ b/net/p5-XML-RPC/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/08/11 13:22:27 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/03 11:45:48 rillig Exp $ DISTNAME= XML-RPC-1.1 PKGNAME= p5-${DISTNAME} @@ -13,8 +13,8 @@ LICENSE= ${PERL5_LICENSE} DEPENDS+= p5-XML-TreePP-[0-9]*:../../textproc/p5-XML-TreePP -PERL5_PACKLIST= auto/XML/RPC/.packlist -USE_LANGUAGES= # none +PERL5_PACKLIST= auto/XML/RPC/.packlist +USE_LANGUAGES= # none .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/p5-XMLRPC-Lite/Makefile b/net/p5-XMLRPC-Lite/Makefile index 8af67ade024..6f02281f05c 100644 --- a/net/p5-XMLRPC-Lite/Makefile +++ b/net/p5-XMLRPC-Lite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/08/11 13:22:28 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/03 11:45:48 rillig Exp $ DISTNAME= XMLRPC-Lite-0.717 PKGNAME= p5-${DISTNAME} @@ -9,13 +9,13 @@ MASTER_SITES= https://cpan.metacpan.org/authors/id/P/PH/PHRED/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://cpan.metacpan.org/authors/id/P/PH/PHRED/ COMMENT= Client and server implementation of XML-RPC protocol -LICENSE= ${PERL5_LICENSE} +LICENSE= ${PERL5_LICENSE} # for make test BUILD_DEPENDS+= p5-SOAP-Lite-[0-9]*:../../net/p5-SOAP-Lite -PERL5_PACKLIST= auto/XMLRPC-Lite/.packlist -USE_LANGUAGES= # none +PERL5_PACKLIST= auto/XMLRPC-Lite/.packlist +USE_LANGUAGES= # none .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/pear-Net_LDAP2/Makefile b/net/pear-Net_LDAP2/Makefile index 1da98b5dcf8..a1096fc1405 100644 --- a/net/pear-Net_LDAP2/Makefile +++ b/net/pear-Net_LDAP2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2016/07/19 14:19:34 taca Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/03 11:45:48 rillig Exp $ DISTNAME= Net_LDAP2-2.2.0 CATEGORIES+= net @@ -7,7 +7,7 @@ MAINTAINER= wenheping@gmail.com COMMENT= Object oriented interface for searching and manipulating LDAP-entries LICENSE= gnu-lgpl-v3 -DEPENDS+= ${PHP_PKG_PREFIX}-ldap>=5.2.12:../../databases/php-ldap +DEPENDS+= ${PHP_PKG_PREFIX}-ldap>=5.2.12:../../databases/php-ldap .include "../../lang/php/pear.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/pear-Net_LDAP3/Makefile b/net/pear-Net_LDAP3/Makefile index cedc1aec93e..83ab6ba38da 100644 --- a/net/pear-Net_LDAP3/Makefile +++ b/net/pear-Net_LDAP3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/09/12 16:09:52 taca Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/03 11:45:48 rillig Exp $ DISTNAME= Net_LDAP3-1.0.5 MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -9,7 +9,7 @@ COMMENT= Object oriented interface for searching and manipulating LDAP-entries HOMEPAGE= https://git.kolab.org/project/profile/27/ LICENSE= gnu-lgpl-v3 -DEPENDS+= ${PHP_PKG_PREFIX}-ldap>=5.2.12:../../databases/php-ldap +DEPENDS+= ${PHP_PKG_PREFIX}-ldap>=5.2.12:../../databases/php-ldap PEAR_PACKAGE_XML= no diff --git a/net/perlbal/Makefile b/net/perlbal/Makefile index 091ae6645ab..8eb383c8980 100644 --- a/net/perlbal/Makefile +++ b/net/perlbal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/08/11 13:22:28 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:48 rillig Exp $ # DISTNAME= Perlbal-1.80 @@ -6,16 +6,16 @@ PKGNAME= p5-${DISTNAME} PKGREVISION= 7 CATEGORIES= net MASTER_SITES= http://search.cpan.org/CPAN/authors/id/D/DO/DORMANDO/ -USE_TOOLS+= perl +USE_TOOLS+= perl MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://danga.com/perlbal/ COMMENT= Very configurable load balancer in perl LICENSE= ${PERL5_LICENSE} -REPLACE_PERL+= lib/Perlbal.pm -REPLACE_PERL+= lib/Perlbal/*.pm -REPLACE_PERL+= lib/Perlbal/Plugin/*.pm -REPLACE_PERL+= lib/Perlbal/Test/*.pm +REPLACE_PERL+= lib/Perlbal.pm +REPLACE_PERL+= lib/Perlbal/*.pm +REPLACE_PERL+= lib/Perlbal/Plugin/*.pm +REPLACE_PERL+= lib/Perlbal/Test/*.pm DEPENDS+= p5-IO-Socket-SSL>=0:../../security/p5-IO-Socket-SSL DEPENDS+= p5-IO-AIO>=0:../../devel/p5-IO-AIO diff --git a/net/php-sockets/Makefile b/net/php-sockets/Makefile index 40dd98180bd..7c902f3c810 100644 --- a/net/php-sockets/Makefile +++ b/net/php-sockets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2018/02/01 13:37:09 jperkin Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/03 11:45:49 rillig Exp $ MODNAME= sockets CATEGORIES+= net @@ -14,7 +14,7 @@ CONFIGURE_ARGS.SunOS+= ac_cv_func_if_indextoname=yes .include "../../mk/compiler.mk" -. if !empty(PKGSRC_COMPILER:Mclang) || !empty(CC_VERSION:Mgcc-[6-9]*) +.if !empty(PKGSRC_COMPILER:Mclang) || !empty(CC_VERSION:Mgcc-[6-9]*) CFLAGS.SunOS+= -D_XOPEN_SOURCE=600 .else CFLAGS.SunOS+= -D_XOPEN_SOURCE=500 # msghdr extensions diff --git a/net/pim6sd/Makefile b/net/pim6sd/Makefile index 0037b7175f4..ecb3f8ffa77 100644 --- a/net/pim6sd/Makefile +++ b/net/pim6sd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2013/09/10 14:37:32 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/03 11:45:49 rillig Exp $ DISTNAME= pim6sd-20031021a PKGREVISION= 1 @@ -11,8 +11,8 @@ COMMENT= IPv6 PIM sparse mode daemon USE_BSD_MAKEFILE= yes USE_FEATURES+= inet6 -CWARNFLAGS.clang=-Wno-error=knr-promoted-parameter -Wno-error=pointer-sign -MAKE_ENV+= CWARNFLAGS.clang=${CWARNFLAGS.clang:Q} +CWARNFLAGS.clang= -Wno-error=knr-promoted-parameter -Wno-error=pointer-sign +MAKE_ENV+= CWARNFLAGS.clang=${CWARNFLAGS.clang:Q} WRKSRC= ${WRKDIR}/${DISTNAME}/pim6sd/ USE_TOOLS+= lex yacc diff --git a/net/portmap/Makefile b/net/portmap/Makefile index c7bedcb4c8f..03b6618008b 100644 --- a/net/portmap/Makefile +++ b/net/portmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/23 17:18:59 asau Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/03 11:45:49 rillig Exp $ DISTNAME= portmap_4 PKGNAME= portmap-4 @@ -16,9 +16,9 @@ COMMENT= RPC portmapper with access control # XXX provides pmap_dump and pmap_set INSTALLATION_DIRS+= sbin share/doc/portmap -MAKE_FLAGS+= WRAP_DIR=${BUILDLINK_PREFIX.tcp_wrappers}/lib -NO_CONFIGURE= yes -RCD_SCRIPTS= portmap +MAKE_FLAGS+= WRAP_DIR=${BUILDLINK_PREFIX.tcp_wrappers}/lib +NO_CONFIGURE= yes +RCD_SCRIPTS= portmap do-install: ${INSTALL_PROGRAM} ${WRKSRC}/portmap ${DESTDIR}${PREFIX}/sbin/ diff --git a/net/pptp/Makefile b/net/pptp/Makefile index de53f7b6787..059d2878081 100644 --- a/net/pptp/Makefile +++ b/net/pptp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:29 jperkin Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/03 11:45:49 rillig Exp $ DISTNAME= pptp-1.7.1 PKGREVISION= 1 @@ -20,7 +20,7 @@ MAKE_FLAGS+= PPPDIR=${PREFIX}/share/examples/pptp INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 share/examples/pptp INSTALLATION_DIRS+= share/doc/pptp/Documentation share/doc/pptp/Reference -DOCDIR= ${PREFIX}/share/doc/pptp +DOCDIR= ${PREFIX}/share/doc/pptp post-install: cd ${WRKSRC}/Documentation && ${INSTALL_DATA} * ${DESTDIR}${DOCDIR}/Documentation diff --git a/net/proxytunnel/Makefile b/net/proxytunnel/Makefile index 5186e5d0275..1e6b8e0b8c2 100644 --- a/net/proxytunnel/Makefile +++ b/net/proxytunnel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:30 jperkin Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/03 11:45:49 rillig Exp $ # DISTNAME= proxytunnel-1.9.0 @@ -13,8 +13,8 @@ COMMENT= Connect stdin/stdout to a remote host through a standard HTTPS proxy .include "../../mk/bsd.prefs.mk" -USE_TOOLS+= gmake -BUILD_TARGET= proxytunnel +USE_TOOLS+= gmake +BUILD_TARGET= proxytunnel INSTALLATION_DIRS+= ${PKGMANDIR}/man1 bin SUBST_CLASSES+= fix-paths diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile index 8c1d8ed447f..f6f95dc9e82 100644 --- a/net/py-ORBit/Makefile +++ b/net/py-ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2019/09/02 13:19:51 adam Exp $ +# $NetBSD: Makefile,v 1.57 2019/11/03 11:45:49 rillig Exp $ DISTNAME= pyorbit-2.24.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pyorbit/ORBit/} @@ -12,18 +12,18 @@ HOMEPAGE= https://www.gnome.org/ COMMENT= Python bindings for ORBit2 LICENSE= gnu-lgpl-v2.1 -PY_PATCHPLIST= YES -USE_TOOLS+= gmake pkg-config -USE_LIBTOOL= YES +PY_PATCHPLIST= YES +USE_TOOLS+= gmake pkg-config +USE_LIBTOOL= YES PKGCONFIG_OVERRIDE+= pyorbit-2.pc.in -GNU_CONFIGURE= YES -CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} +GNU_CONFIGURE= YES +CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} PYTHON_SELF_CONFLICT= YES -BUILDLINK_API_DEPENDS.python26+= python26>=2.6.2nb4 +BUILDLINK_API_DEPENDS.python26+= python26>=2.6.2nb4 -PYTHON_VERSIONS_ACCEPTED= 27 # dead upstream, no plans to port +PYTHON_VERSIONS_ACCEPTED= 27 # dead upstream, no plans to port BUILDLINK_TRANSFORM.SunOS+= rm:-std=c9x diff --git a/net/py-beanstalkc/Makefile b/net/py-beanstalkc/Makefile index 88fe94206ab..63b13641d02 100644 --- a/net/py-beanstalkc/Makefile +++ b/net/py-beanstalkc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/09/02 13:19:51 adam Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 11:45:49 rillig Exp $ DISTNAME= beanstalkc-0.4.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +13,7 @@ LICENSE= apache-2.0 USE_LANGUAGES= # none REPLACE_PYTHON+= beanstalkc.py -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/net/py-bonjour/Makefile b/net/py-bonjour/Makefile index c58bd174a72..fe8284228c3 100644 --- a/net/py-bonjour/Makefile +++ b/net/py-bonjour/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/02/20 13:29:43 hauke Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/03 11:45:50 rillig Exp $ PKGNAME= ${PYPKGPREFIX}-bonjour-${PKGVER} DISTNAME= bonjour-py-${PKGVER} @@ -24,11 +24,11 @@ PYTHON_VERSIONS_ACCEPTED= 27 # Uses old exception syntax in 0.3 REPLACE_PYTHON+= examples/${ee} .endfor -SUBST_CLASSES+= fix-paths -SUBST_STAGE.fix-paths= pre-configure -SUBST_MESSAGE.fix-paths= Fixing absolute paths. -SUBST_FILES.fix-paths= setup.py -SUBST_SED.fix-paths= -e 's,%PREFIX%,${PREFIX},g' +SUBST_CLASSES+= fix-paths +SUBST_STAGE.fix-paths= pre-configure +SUBST_MESSAGE.fix-paths= Fixing absolute paths. +SUBST_FILES.fix-paths= setup.py +SUBST_SED.fix-paths= -e 's,%PREFIX%,${PREFIX},g' PLIST_SUBST+= EGDIR=${EGDIR} PLIST_SUBST+= DOCDIR=${DOCDIR} diff --git a/net/py-caldav/Makefile b/net/py-caldav/Makefile index 5f17f4041cb..ccb8363ddbd 100644 --- a/net/py-caldav/Makefile +++ b/net/py-caldav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/09/02 13:19:50 adam Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:50 rillig Exp $ DISTNAME= caldav-0.2.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,7 +17,7 @@ DEPENDS+= ${PYPKGPREFIX}-vobject-[0-9]*:../../textproc/py-vobject USE_LANGUAGES= # none -PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.2.1 +PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.2.1 REPLACE_PYTHON+= caldav/__init__.py caldav/davclient.py REPLACE_PYTHON+= caldav/elements/__init__.py caldav/elements/base.py diff --git a/net/py-dropbox/Makefile b/net/py-dropbox/Makefile index 2d706eae080..b0e458b0c57 100644 --- a/net/py-dropbox/Makefile +++ b/net/py-dropbox/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2018/12/27 15:04:42 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/03 11:45:50 rillig Exp $ DISTNAME= dropbox-python-sdk-2.2.0 PKGNAME= ${PYPKGPREFIX}-dropbox-2.2.0 PKGREVISION= 1 CATEGORIES= net -MASTER_SITES= https://www.dropbox.com/developers/downloads/sdks/core/python/ +MASTER_SITES= https://www.dropbox.com/developers/downloads/sdks/core/python/ EXTRACT_SUFX= .zip MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/net/py-foolscap/Makefile b/net/py-foolscap/Makefile index 0ffa3827a22..bad47e64a40 100644 --- a/net/py-foolscap/Makefile +++ b/net/py-foolscap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2019/09/02 13:19:51 adam Exp $ +# $NetBSD: Makefile,v 1.34 2019/11/03 11:45:50 rillig Exp $ DISTNAME= foolscap-0.13.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,7 +14,7 @@ DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-ZopeInterface>=3.6.1:../../devel/py-ZopeInterface DEPENDS+= ${PYPKGPREFIX}-twisted>=16.0:../../net/py-twisted -PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.12.7 +PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.12.7 TEST_TARGET= test diff --git a/net/py-google/Makefile b/net/py-google/Makefile index bc793aabadc..2442b182de0 100644 --- a/net/py-google/Makefile +++ b/net/py-google/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2019/09/02 13:19:52 adam Exp $ +# $NetBSD: Makefile,v 1.41 2019/11/03 11:45:50 rillig Exp $ DISTNAME= pygoogle-0.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -14,7 +14,7 @@ DEPENDS+= ${PYPKGPREFIX}-SOAPpy-[0-9]*:../../net/py-soappy EGG_NAME= pygoogle-0.5 -PYTHON_VERSIONS_ACCEPTED= 27 # py-xml via py-soappy +PYTHON_VERSIONS_ACCEPTED= 27 # py-xml via py-soappy .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-irclib/Makefile b/net/py-irclib/Makefile index 4ed5b5ac256..420faff2339 100644 --- a/net/py-irclib/Makefile +++ b/net/py-irclib/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.13 2016/06/08 17:43:36 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:50 rillig Exp $ # -PYIRCVERS= 11.1.1 -DISTNAME= irc-${PYIRCVERS} -PKGNAME= ${PYPKGPREFIX}-irclib-${PYIRCVERS} -CATEGORIES= net python -MASTER_SITES= ${MASTER_SITE_PYPI:=i/irc/} -EXTRACT_SUFX= .zip -EXTRACT_OPTS_ZIP=-aa -q -o +PYIRCVERS= 11.1.1 +DISTNAME= irc-${PYIRCVERS} +PKGNAME= ${PYPKGPREFIX}-irclib-${PYIRCVERS} +CATEGORIES= net python +MASTER_SITES= ${MASTER_SITE_PYPI:=i/irc/} +EXTRACT_SUFX= .zip +EXTRACT_OPTS_ZIP= -aa -q -o MAINTAINER= imil@NetBSD.org HOMEPAGE= http://python-irclib.sourceforge.net/ diff --git a/net/py-medusa/Makefile b/net/py-medusa/Makefile index e14735d6ff4..9562effaf20 100644 --- a/net/py-medusa/Makefile +++ b/net/py-medusa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/09/02 13:19:51 adam Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:50 rillig Exp $ DISTNAME= medusa-0.5.4 PKGREVISION= 1 @@ -12,7 +12,7 @@ COMMENT= Framework for writing asynchronous socket-based servers USE_LANGUAGES= # none -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-netsnmp/Makefile b/net/py-netsnmp/Makefile index 927b9a3ef05..2f499f7b807 100644 --- a/net/py-netsnmp/Makefile +++ b/net/py-netsnmp/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.8 2019/09/02 13:19:48 adam Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/03 11:45:50 rillig Exp $ .include "../../net/net-snmp/Makefile.common" PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/net-snmp/netsnmp/} -CATEGORIES= net python +CATEGORIES= net python -MAINTAINER= pkgsrc-users@NetBSD.org -COMMENT= Python bindings to extensible SNMP implementation +MAINTAINER= pkgsrc-users@NetBSD.org +COMMENT= Python bindings to extensible SNMP implementation -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 -USE_LANGUAGES= c +USE_LANGUAGES= c EGG_NAME= netsnmp_python-1.0a1 PYSETUPSUBDIR= python diff --git a/net/py-nyx/Makefile b/net/py-nyx/Makefile index 42c024981df..5788444707c 100644 --- a/net/py-nyx/Makefile +++ b/net/py-nyx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2018/10/23 01:42:34 riastradh Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 11:45:51 rillig Exp $ .include "../../net/py-nyx/Makefile.common" @@ -16,9 +16,9 @@ USE_LANGUAGES= # none DEPENDS+= ${PYPKGPREFIX}-stem>=1.7.0:../../devel/py-stem -REPLACE_PYTHON+=run_nyx -REPLACE_PYTHON+=run_tests.py -REPLACE_PYTHON+=setup.py +REPLACE_PYTHON+= run_nyx +REPLACE_PYTHON+= run_tests.py +REPLACE_PYTHON+= setup.py do-test: cd ${WRKSRC} && ./run_tests.py diff --git a/net/py-omniORBpy/Makefile b/net/py-omniORBpy/Makefile index 5d56ac5f42c..1f7c0ec6dd5 100644 --- a/net/py-omniORBpy/Makefile +++ b/net/py-omniORBpy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/09/02 13:19:51 adam Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:51 rillig Exp $ DISTNAME= omniORBpy-3.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,8 +17,8 @@ USE_TOOLS+= gmake USE_LANGUAGES+= c c++ MAKE_FILE= GNUmakefile -PYTHON_SELF_CONFLICT= yes -PYTHON_VERSIONS_ACCEPTED= 27 # omniORB +PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_ACCEPTED= 27 # omniORB .include "../../lang/python/application.mk" .include "../../net/omniORB/buildlink3.mk" diff --git a/net/py-omniORBpy/hacks.mk b/net/py-omniORBpy/hacks.mk index 9151c56a9c7..ce557b36ac2 100644 --- a/net/py-omniORBpy/hacks.mk +++ b/net/py-omniORBpy/hacks.mk @@ -1,6 +1,6 @@ -# $NetBSD: hacks.mk,v 1.2 2013/04/08 11:17:18 rodent Exp $ +# $NetBSD: hacks.mk,v 1.3 2019/11/03 11:45:51 rillig Exp $ .if !defined(HACKS_MK) -HACKS_MK= defined +HACKS_MK= defined ### [ Tue Feb 28 17:44:28 NZDT 2012 : sbd ] ### The omniORB package install files into ${PYSITELIB}/omniidl_be, @@ -9,13 +9,13 @@ HACKS_MK= defined ### So if this package is being built with the same PYTHON_VERSION_DEFAULT as ### omniORB was simply don't install the __int__.py{,c} files. ### -PKG_HACKS+= omniidl_be_init -PLIST_VARS+= omniidl_be_init +PKG_HACKS+= omniidl_be_init +PLIST_VARS+= omniidl_be_init .if defined(_PKGSRC_BARRIER) omniORB_PYTHON_VERSION!= ${PKG_INFO} -Q PYTHON_VERSION_DEFAULT omniORB . if "${omniORB_PYTHON_VERSION}" != "${PYTHON_VERSION_DEFAULT}" -PLIST.omniidl_be_init= yes -INSTALL_ENV+= INSTALL_OMNIIDL_BE_INIT=yes +PLIST.omniidl_be_init= yes +INSTALL_ENV+= INSTALL_OMNIIDL_BE_INIT=yes . endif .endif diff --git a/net/py-pcap/Makefile b/net/py-pcap/Makefile index e9b772c63fd..a6fe56848dc 100644 --- a/net/py-pcap/Makefile +++ b/net/py-pcap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/09/02 13:19:51 adam Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/03 11:45:51 rillig Exp $ DISTNAME= pypcap-1.1 PKGNAME= ${PYPKGPREFIX}-pcap-1.1 @@ -24,7 +24,7 @@ SUBST_VARS.prefix= PREFIX SUBST_STAGE.prefix= pre-configure PYDISTUTILSPKG= yes -PYTHON_VERSIONS_ACCEPTED= 27 # py-pyrex +PYTHON_VERSIONS_ACCEPTED= 27 # py-pyrex FILES_SUBST+= PYTHONBIN=${PYTHONBIN:Q} diff --git a/net/py-s3cmd/Makefile b/net/py-s3cmd/Makefile index 4b6067db406..35f447996b4 100644 --- a/net/py-s3cmd/Makefile +++ b/net/py-s3cmd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/09/02 13:19:49 adam Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 11:45:51 rillig Exp $ DISTNAME= s3cmd-1.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v2 PYDISTUTILSPKG= yes MAKE_ENV+= S3CMD_INSTPATH_MAN=${PKGMANDIR} -PYTHON_SELF_CONFLICT= yes +PYTHON_SELF_CONFLICT= yes PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.0.1 .include "../../lang/python/pyversion.mk" diff --git a/net/py-sbws/Makefile b/net/py-sbws/Makefile index c1821059420..4f12b0a9683 100644 --- a/net/py-sbws/Makefile +++ b/net/py-sbws/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2018/10/23 01:42:35 riastradh Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 11:45:51 rillig Exp $ DISTNAME= sbws-0.8.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -34,11 +34,11 @@ REPLACE_BASH+= tests/testnets/simple.common/01-gen-configs.sh REPLACE_BASH+= tests/testnets/simple.common/02-start-network.sh REPLACE_BASH+= tests/testnets/simple.common/04-stop-network.sh -REPLACE_PYTHON+=scripts/tools/get-per-relay-budget.py -REPLACE_PYTHON+=scripts/tools/sbws-http-server.py -REPLACE_PYTHON+=scripts/tools/scale-v3bw-with-budget.py -REPLACE_PYTHON+=setup.py -REPLACE_PYTHON+=tests/testnets/simple.common/03-network-in-ready-state.py +REPLACE_PYTHON+= scripts/tools/get-per-relay-budget.py +REPLACE_PYTHON+= scripts/tools/sbws-http-server.py +REPLACE_PYTHON+= scripts/tools/scale-v3bw-with-budget.py +REPLACE_PYTHON+= setup.py +REPLACE_PYTHON+= tests/testnets/simple.common/03-network-in-ready-state.py # XXX Should run the integration tests too, but it's a bit more # involved. diff --git a/net/py-txamqp/Makefile b/net/py-txamqp/Makefile index 14230e9c809..2aa366aaf35 100644 --- a/net/py-txamqp/Makefile +++ b/net/py-txamqp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2019/09/02 13:19:50 adam Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/03 11:45:51 rillig Exp $ DISTNAME= python-txamqp_0.3.orig PKGNAME= ${PYPKGPREFIX}-txamqp-0.3 @@ -12,7 +12,7 @@ LICENSE= apache-2.0 DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted -PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.3 +PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.3 USE_LANGUAGES= # none diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile index edd7e64bd46..1c06096c27b 100644 --- a/net/pygopherd/Makefile +++ b/net/pygopherd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2019/09/02 13:19:51 adam Exp $ +# $NetBSD: Makefile,v 1.37 2019/11/03 11:45:51 rillig Exp $ DISTNAME= pygopherd_2.0.16 PKGREVISION= 5 @@ -12,8 +12,8 @@ COMMENT= Gopher server LICENSE= gnu-gpl-v2 PKG_SYSCONFSUBDIR= pygopherd -EXAMPLEDIR= ${PREFIX}/share/examples/pygopherd -RUNTIMEDIR= ${VARBASE}/gopher +EXAMPLEDIR= ${PREFIX}/share/examples/pygopherd +RUNTIMEDIR= ${VARBASE}/gopher BUILD_DEFS+= VARBASE @@ -34,12 +34,12 @@ FILES_SUBST+= RUNTIMEDIR=${RUNTIMEDIR:Q} FILES_SUBST+= PYTHONBIN=${PYTHONBIN:Q} PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 2.0.16 -REPLACE_PYTHON= bin/pygopherd -REPLACE_PYTHON+= pygopherd/GopherExceptionsTest.py -REPLACE_PYTHON+= pygopherd/fileextTest.py -REPLACE_PYTHON+= pygopherd/gopherentryTest.py -REPLACE_PYTHON+= pygopherd/initializationTest.py -REPLACE_PYTHON+= pygopherd/testutil.py +REPLACE_PYTHON= bin/pygopherd +REPLACE_PYTHON+= pygopherd/GopherExceptionsTest.py +REPLACE_PYTHON+= pygopherd/fileextTest.py +REPLACE_PYTHON+= pygopherd/gopherentryTest.py +REPLACE_PYTHON+= pygopherd/initializationTest.py +REPLACE_PYTHON+= pygopherd/testutil.py SUBST_CLASSES+= man SUBST_STAGE.man= pre-configure diff --git a/net/radiusclient-ng/Makefile b/net/radiusclient-ng/Makefile index 5736b57f948..f02ab16a7e4 100644 --- a/net/radiusclient-ng/Makefile +++ b/net/radiusclient-ng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2017/09/04 18:00:58 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/03 11:45:51 rillig Exp $ DISTNAME= radiusclient-ng-0.5.5.1 CATEGORIES= net @@ -16,12 +16,12 @@ USE_LIBTOOL= YES PKG_SYSCONFSUBDIR= radiusclient-ng EGDIR= ${PREFIX}/share/examples/radiusclient-ng -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} -EGFILES= issue port-id-map radiusclient.conf dictionary dictionary.ascend \ - dictionary.compat dictionary.merit dictionary.sip +EGFILES= issue port-id-map radiusclient.conf dictionary dictionary.ascend \ + dictionary.compat dictionary.merit dictionary.sip .for f in ${EGFILES} -CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} +CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor .include "../../mk/bsd.pkg.mk" diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile index 0f24b15f88f..f71a96baeea 100644 --- a/net/radiusd-cistron/Makefile +++ b/net/radiusd-cistron/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2019/08/11 13:22:29 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2019/11/03 11:45:51 rillig Exp $ DISTNAME= radiusd-cistron-1.6.8 PKGREVISION= 7 @@ -15,9 +15,9 @@ USE_TOOLS+= perl:run REPLACE_PERL= src/checkrad.pl -MAKE_FILE= Makefile.BSD -BUILD_DIRS= src -INSTALL_DIRS= src +MAKE_FILE= Makefile.BSD +BUILD_DIRS= src +INSTALL_DIRS= src INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \ ${PKGMANDIR}/man8 sbin share/examples/raddb \ share/doc/radiusd-cistron @@ -27,7 +27,7 @@ RCD_SCRIPTS= radiusd OWN_DIRS_PERMS= /var/log/radacct ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700 PKG_SYSCONFSUBDIR= raddb -EGDIR= ${PREFIX}/share/examples/raddb +EGDIR= ${PREFIX}/share/examples/raddb CONF_FILES= .for cfile in clients.sample dictionary dictionary.ascend dictionary.bay \ dictionary.cisco dictionary.cistron dictionary.compat \ @@ -35,7 +35,7 @@ CONF_FILES= dictionary.shiva dictionary.tunnel dictionary.usr \ dictionary.versanet hints.sample huntgroups.sample \ naslist.sample naspasswd.sample realms.sample users.sample -CONF_FILES+= ${EGDIR}/${cfile} ${PKG_SYSCONFDIR}/${cfile:S/.sample//} +CONF_FILES+= ${EGDIR}/${cfile} ${PKG_SYSCONFDIR}/${cfile:S/.sample//} .endfor post-install: diff --git a/net/radsecproxy/Makefile b/net/radsecproxy/Makefile index 8bb012c1d58..eeeaf144d42 100644 --- a/net/radsecproxy/Makefile +++ b/net/radsecproxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2019/10/01 16:38:08 he Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/03 11:45:52 rillig Exp $ VERSION= 1.8.1 DISTNAME= radsecproxy-${VERSION} @@ -13,7 +13,7 @@ LICENSE= modified-bsd USE_TOOLS+= gmake -GNU_CONFIGURE= YES +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl} diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile index 50168fd5159..83a45482f48 100644 --- a/net/rdist6/Makefile +++ b/net/rdist6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/12/15 21:40:33 markd Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/03 11:45:52 rillig Exp $ # DISTNAME= freerdist-0.94 @@ -14,8 +14,8 @@ USE_TOOLS+= byacc RDIST6_NAME= rdist6 INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 -INSTALL_TARGET= install install.man -MAKE_ENV+= RDIST6_NAME=${RDIST6_NAME:Q} +INSTALL_TARGET= install install.man +MAKE_ENV+= RDIST6_NAME=${RDIST6_NAME:Q} CONFLICTS= rdist6-[0-9]* diff --git a/net/rp-l2tp/Makefile b/net/rp-l2tp/Makefile index f5a222a92dc..1f594768fcf 100644 --- a/net/rp-l2tp/Makefile +++ b/net/rp-l2tp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2017/09/04 18:08:26 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/03 11:45:52 rillig Exp $ # DISTNAME= rp-l2tp-0.3 @@ -12,7 +12,7 @@ COMMENT= User-space implementation of layer 2 tunnelling protocol NOT_FOR_PLATFORM+= Interix-*-* # no userland protocol stack support -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} USE_TOOLS+= gmake diff --git a/net/ruby-soap4r/Makefile b/net/ruby-soap4r/Makefile index 1bcf8ca3875..1bfe47b8dc2 100644 --- a/net/ruby-soap4r/Makefile +++ b/net/ruby-soap4r/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2015/06/08 15:13:02 taca Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/03 11:45:52 rillig Exp $ DISTNAME= soap4r-ruby1.9-2.0.5 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/-ruby1.9//} @@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2 OR ruby-license USE_LANGUAGES= # none RUBYGEM_OPTIONS+= --format-executable -OVERRIDE_GEMSPEC= \ +OVERRIDE_GEMSPEC= \ :files lib/soap/rpc/element.rb.orig= lib/xsd/xmlparser.rb.orig= .include "../../lang/ruby/gem.mk" diff --git a/net/ruby-stompserver/Makefile b/net/ruby-stompserver/Makefile index ff2e32fff2b..a6a09e67db0 100644 --- a/net/ruby-stompserver/Makefile +++ b/net/ruby-stompserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/05/23 19:23:11 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 11:45:52 rillig Exp $ DISTNAME= drizztbsd-stompserver-1c7a275 PKGNAME= ${RUBY_PKGPREFIX}-stompserver-1.0.0 @@ -41,11 +41,11 @@ STOMPSERVER_GROUP?= stompserver PKG_USERS_VARS+= STOMPSERVER_USER PKG_GROUPS_VARS+= STOMPSERVER_GROUP -PKG_USERS= ${STOMPSERVER_USER}:${STOMPSERVER_GROUP} -PKG_GROUPS= ${STOMPSERVER_GROUP} -PKG_GECOS.${STOMPSERVER_USER}=stompserver server user -PKG_HOME.${STOMPSERVER_USER}=${STOMPSERVER_WRKDIR} -PKG_SHELL.${STOMPSERVER_USER}=${NOLOGIN} +PKG_USERS= ${STOMPSERVER_USER}:${STOMPSERVER_GROUP} +PKG_GROUPS= ${STOMPSERVER_GROUP} +PKG_GECOS.${STOMPSERVER_USER}= stompserver server user +PKG_HOME.${STOMPSERVER_USER}= ${STOMPSERVER_WRKDIR} +PKG_SHELL.${STOMPSERVER_USER}= ${NOLOGIN} EGDIR= ${PREFIX}/share/examples/stompserver diff --git a/net/samba/Makefile b/net/samba/Makefile index f5f14298a2a..3eb1a9d4053 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.276 2019/08/11 13:22:29 wiz Exp $ +# $NetBSD: Makefile,v 1.277 2019/11/03 11:45:52 rillig Exp $ DISTNAME= samba-${VERSION} CATEGORIES= net @@ -52,26 +52,26 @@ FILES_SUBST+= WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT:Q} USE_TOOLS+= gmake mktemp perl:run pkg-config REPLACE_PERL= script/findsmb.in -BROKEN_GETTEXT_DETECTION=yes -GNU_CONFIGURE= yes -GNU_CONFIGURE_LIBDIR= ${SAMBA_LIBDIR} -CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} -CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} -CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} -CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR} -CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR} -CONFIGURE_ARGS+= --with-modulesdir=${SAMBA_MODULESDIR} -CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR} -CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE:Q} -CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR} -CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR} -CONFIGURE_ARGS+= --with-mandir=${PREFIX}/${PKGMANDIR} -CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat -CONFIGURE_ARGS+= --enable-external-libtdb +BROKEN_GETTEXT_DETECTION= yes +GNU_CONFIGURE= yes +GNU_CONFIGURE_LIBDIR= ${SAMBA_LIBDIR} +CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} +CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} +CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} +CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR} +CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR} +CONFIGURE_ARGS+= --with-modulesdir=${SAMBA_MODULESDIR} +CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR} +CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE:Q} +CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR} +CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR} +CONFIGURE_ARGS+= --with-mandir=${PREFIX}/${PKGMANDIR} +CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat +CONFIGURE_ARGS+= --enable-external-libtdb # # Explicitly disable samba4 merged-build option which is broken. # -CONFIGURE_ARGS+= --enable-merged-build=no +CONFIGURE_ARGS+= --enable-merged-build=no .include "../../net/samba/options.mk" diff --git a/net/samba/options.mk b/net/samba/options.mk index 8e518b409ad..ef56c28e1bf 100644 --- a/net/samba/options.mk +++ b/net/samba/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.39 2018/01/16 07:48:47 maya Exp $ +# $NetBSD: options.mk,v 1.40 2019/11/03 11:45:52 rillig Exp $ # Recommended package options for various setups: # @@ -154,10 +154,10 @@ NSS_WINBIND_cmd= \ # Install a /usr/lib/${NSS_WINBIND:T} -> ${PREFIX}/${NSS_WINBIND} symlink # Unfortunately NSS_WINDIND_cmd can not be used to determine whether the # (de)install templates are needed or not. -.if ${OS_VARIANT} != "SmartOS" +. if ${OS_VARIANT} != "SmartOS" INSTALL_TEMPLATES+= INSTALL.nss_winbind DEINSTALL_TEMPLATES+= DEINSTALL.nss_winbind -.endif +. endif .PHONY: samba-nss-winbind-install post-install: samba-nss-winbind-install diff --git a/net/samba4/Makefile b/net/samba4/Makefile index e11ccce59c2..656c83f6328 100644 --- a/net/samba4/Makefile +++ b/net/samba4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.81 2019/09/09 00:33:05 taca Exp $ +# $NetBSD: Makefile,v 1.82 2019/11/03 11:45:52 rillig Exp $ DISTNAME= samba-4.10.8 PKGREVISION= 1 @@ -58,7 +58,7 @@ FILES_SUBST+= SMB_PID=${SMB_PID} USE_TOOLS+= gmake mktemp perl:run pkg-config USE_GNU_ICONV= yes # FIXME: something doesn't work on NetBSD -BROKEN_GETTEXT_DETECTION=yes +BROKEN_GETTEXT_DETECTION= yes # Debugging #CONFIGURE_ARGS+= -vvv diff --git a/net/scapy/Makefile b/net/scapy/Makefile index 2abfdc9cab4..9be2fb2ad5d 100644 --- a/net/scapy/Makefile +++ b/net/scapy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2019/09/02 13:19:50 adam Exp $ +# $NetBSD: Makefile,v 1.29 2019/11/03 11:45:52 rillig Exp $ DISTNAME= scapy-2.3.2 PKGREVISION= 1 @@ -17,7 +17,7 @@ DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline NO_BUILD= yes -PYTHON_VERSIONS_ACCEPTED= 27 # py-libpcap, py-libdnet +PYTHON_VERSIONS_ACCEPTED= 27 # py-libpcap, py-libdnet INSTALLATION_DIRS+= share/examples/scapy diff --git a/net/scapy/options.mk b/net/scapy/options.mk index e7b3b920f56..1b8856c287b 100644 --- a/net/scapy/options.mk +++ b/net/scapy/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.10 2019/09/02 13:19:50 adam Exp $ +# $NetBSD: options.mk,v 1.11 2019/11/03 11:45:52 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.scapy @@ -18,7 +18,7 @@ DEPENDS+= ${PYPKGPREFIX}-amkCrypto-[0-9]*:../../security/py-amkCrypto ### .if !empty(PKG_OPTIONS:Mgnuplot) DEPENDS+= ${PYPKGPREFIX}-gnuplot-[0-9]*:../../graphics/py-gnuplot -PYTHON_VERSIONS_ACCEPTED= 27 # py-gnuplot +PYTHON_VERSIONS_ACCEPTED= 27 # py-gnuplot .endif ### diff --git a/net/sendfile/Makefile b/net/sendfile/Makefile index bfa8472fb40..8611947e44d 100644 --- a/net/sendfile/Makefile +++ b/net/sendfile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2016/05/17 10:32:08 fhajny Exp $ +# $NetBSD: Makefile,v 1.37 2019/11/03 11:45:53 rillig Exp $ # DISTNAME= sendfile-2.1b @@ -26,8 +26,8 @@ OVERRIDE_GNU_CONFIG_SCRIPTS= yes post-configure: cd ${WRKSRC} &&${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} config -OWN_DIRS+= ${VARBASE}/spool/sendfile -OWN_DIRS_PERMS+=${VARBASE}/spool/sendfile/LOG ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700 -OWN_DIRS_PERMS+=${VARBASE}/spool/sendfile/OUTGOING ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 1777 +OWN_DIRS+= ${VARBASE}/spool/sendfile +OWN_DIRS_PERMS+= ${VARBASE}/spool/sendfile/LOG ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700 +OWN_DIRS_PERMS+= ${VARBASE}/spool/sendfile/OUTGOING ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 1777 .include "../../mk/bsd.pkg.mk" diff --git a/net/ser/Makefile b/net/ser/Makefile index bf9b2e8322f..4c57f75c125 100644 --- a/net/ser/Makefile +++ b/net/ser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2017/09/04 18:00:59 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/03 11:45:53 rillig Exp $ # DISTNAME= ser-0.8.14_src @@ -22,10 +22,10 @@ CONF_FILES= ${PREFIX}/${EGDIR}/ser.cfg ${PKG_SYSCONFDIR}/ser.cfg 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} -INSTALL_ENV+= BASEDIR=${DESTDIR} +MAKE_ENV+= BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread:Q} +MAKE_ENV+= cfg-prefix=${PREFIX}/share/examples +MAKE_ENV+= EGDIR=${EGDIR:Q} +INSTALL_ENV+= BASEDIR=${DESTDIR} CHECK_PORTABILITY_SKIP+= scripts/sc diff --git a/net/siproxd/Makefile b/net/siproxd/Makefile index 638bbae2691..a95449d7a9c 100644 --- a/net/siproxd/Makefile +++ b/net/siproxd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2018/11/14 15:25:28 hauke Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 11:45:53 rillig Exp $ DISTNAME= siproxd-0.8.2 PKGREVISION= 2 @@ -24,8 +24,8 @@ SIPROXD_HOME?= ${VARBASE}/chroot/siproxd PKG_GROUPS= ${SIPROXD_GROUP} PKG_USERS= ${SIPROXD_USER}:${SIPROXD_GROUP} -PKG_GECOS.${SIPROXD_USER}= SIP proxy -PKG_HOME.${SIPROXD_USER}= ${SIPROXD_HOME} +PKG_GECOS.${SIPROXD_USER}= SIP proxy +PKG_HOME.${SIPROXD_USER}= ${SIPROXD_HOME} PKG_GROUPS_VARS+= SIPROXD_GROUP PKG_USERS_VARS+= SIPROXD_USER @@ -54,9 +54,9 @@ INSTALLATION_DIRS= sbin ${DOCDIR} ${EGDIR} SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths= doc/siproxd.conf.example -SUBST_MESSAGE.paths= performing pathname substitutions -SUBST_VARS.paths= VARBASE PREFIX PKG_SYSCONFDIR SIPROXD_USER SIPROXD_HOME +SUBST_FILES.paths= doc/siproxd.conf.example +SUBST_MESSAGE.paths= performing pathname substitutions +SUBST_VARS.paths= VARBASE PREFIX PKG_SYSCONFDIR SIPROXD_USER SIPROXD_HOME post-install: .for ff in README RELNOTES doc/FAQ doc/KNOWN_BUGS doc/RFC3261_compliance.txt diff --git a/net/sipsak/Makefile b/net/sipsak/Makefile index 4afa88c98f4..a70dfc965a2 100644 --- a/net/sipsak/Makefile +++ b/net/sipsak/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:30 jperkin Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:53 rillig Exp $ DISTNAME= sipsak-0.9.6-1 PKGNAME= ${DISTNAME:S/-1//} @@ -17,7 +17,7 @@ GNU_CONFIGURE= YES USE_TOOLS+= gmake # get rid of inline -SUBST_CLASSES+= inline +SUBST_CLASSES+= inline SUBST_STAGE.inline= pre-configure SUBST_FILES.inline= header_f.h header_f.c SUBST_SED.inline= -e 's/^inline //g' diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile index 49c63bf191f..db7adaa78dd 100644 --- a/net/smokeping/Makefile +++ b/net/smokeping/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2019/08/11 13:22:30 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2019/11/03 11:45:53 rillig Exp $ DISTNAME= smokeping-2.6.7 PKGREVISION= 8 @@ -62,7 +62,7 @@ SUBST_MESSAGE.files= Fixing configuration files. SUBST_CLASSES+= libs SUBST_STAGE.libs= pre-configure SUBST_FILES.libs= bin/smokeping_cgi bin/smokeping bin/smokeinfo bin/tSmoke -SUBST_SED.libs= -e "s|FindBin::Bin/../lib|FindBin::Bin/../lib/smokeping|g" +SUBST_SED.libs= -e "s|FindBin::Bin/../lib|FindBin::Bin/../lib/smokeping|g" SUBST_MESSAGE.libs= Fixing library path OWN_DIRS+= ${SMOKEPING_HOME} diff --git a/net/socket++/Makefile b/net/socket++/Makefile index fcaf64e2161..cde98de925f 100644 --- a/net/socket++/Makefile +++ b/net/socket++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2017/11/06 13:36:39 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/03 11:45:53 rillig Exp $ DISTNAME= socket++-1.12.10 PKGREVISION= 2 @@ -18,11 +18,11 @@ TEST_DIRS= test TEST_TARGET= check pre-configure: - cd ${WRKSRC}; \ - ${LOCALBASE}/bin/libtoolize --automake; \ - aclocal -I .; \ - autoheader; \ - automake --add-missing; \ - autoconf + cd ${WRKSRC}; \ + ${LOCALBASE}/bin/libtoolize --automake; \ + aclocal -I .; \ + autoheader; \ + automake --add-missing; \ + autoconf .include "../../mk/bsd.pkg.mk" diff --git a/net/spread/Makefile b/net/spread/Makefile index 310adc0bdc2..5735c7f23d8 100644 --- a/net/spread/Makefile +++ b/net/spread/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2019/08/11 13:22:30 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2019/11/03 11:45:53 rillig Exp $ # DISTNAME= spread-src-3.17.3 @@ -11,13 +11,13 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.spread.org/ COMMENT= Group communication system providing a number of messaging services -WRKSRC= ${WRKDIR}/${DISTNAME} -USE_GCC_RUNTIME=yes -USE_TOOLS+= perl -GNU_CONFIGURE= YES +WRKSRC= ${WRKDIR}/${DISTNAME} +USE_GCC_RUNTIME= yes +USE_TOOLS+= perl +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --includedir=${PREFIX:Q}/include/spread CONFIGURE_ARGS+= --with-pid-dir=${RUNTIME_DIR:Q} -MAKE_FLAGS+= LD=${CC:Q} +MAKE_FLAGS+= LD=${CC:Q} BUILD_DEFS+= SPREAD_DIR diff --git a/net/spreadlogd/Makefile b/net/spreadlogd/Makefile index 16b68e7c639..aaa5705e6ce 100644 --- a/net/spreadlogd/Makefile +++ b/net/spreadlogd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2019/08/11 13:22:30 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/03 11:45:53 rillig Exp $ # DISTNAME= spreadlogd @@ -33,7 +33,7 @@ INSTALLATION_DIRS+= ${EXAMPLEDIR} post-install: ${INSTALL_DATA} ${WRKSRC}/spreadlogd.conf ${DESTDIR}${EXAMPLEDIR}/spreadlogd.conf.sample -BUILDLINK_API_DEPENDS.libevent+=libevent>=1.0c +BUILDLINK_API_DEPENDS.libevent+= libevent>=1.0c .include "../../net/spread/buildlink3.mk" .include "../../devel/libevent/buildlink3.mk" diff --git a/net/sysmon/Makefile b/net/sysmon/Makefile index 7e0ee6af72b..2195b9aa4d8 100644 --- a/net/sysmon/Makefile +++ b/net/sysmon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2018/07/04 13:40:31 jperkin Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 11:45:53 rillig Exp $ DISTNAME= sysmon-0.93 CATEGORIES= net @@ -21,13 +21,13 @@ SMDOC= ${PREFIX}/share/doc/sysmon CONF_FILES= ${EGDIR}/sysmon.conf.dist \ ${PKG_SYSCONFDIR}/sysmon.conf -SUBST_CLASSES+= paths -SUBST_FILES.paths= ${WRKSRC}/autoconf/Makefile.in -SUBST_STAGE.paths= pre-configure -SUBST_SED.paths= -e 's,@destdir@,${DESTDIR},g' +SUBST_CLASSES+= paths +SUBST_FILES.paths= ${WRKSRC}/autoconf/Makefile.in +SUBST_STAGE.paths= pre-configure +SUBST_SED.paths= -e 's,@destdir@,${DESTDIR},g' -INSTALLATION_DIRS= share/examples/sysmon -INSTALLATION_DIRS+= share/doc/sysmon bin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 +INSTALLATION_DIRS= share/examples/sysmon +INSTALLATION_DIRS+= share/doc/sysmon bin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 post-install: ${INSTALL_DATA} ${WRKSRC}/examples/sysmon.conf.dist ${DESTDIR}${EGDIR}/sysmon.conf.dist diff --git a/net/tacacs-shrubbery/Makefile b/net/tacacs-shrubbery/Makefile index 08d1e15b1be..7860180d3f7 100644 --- a/net/tacacs-shrubbery/Makefile +++ b/net/tacacs-shrubbery/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/08/11 13:22:30 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:54 rillig Exp $ # DISTNAME= tacacs-F4.0.4.28 @@ -22,7 +22,7 @@ MAKE_JOBS_SAFE= no GNU_CONFIGURE= yes USE_TOOLS+= bison flex perl -USE_LIBTOOL= yes +USE_LIBTOOL= yes USE_LANGUAGES= c c++ USE_FEATURES+= snprintf diff --git a/net/tacacs-shrubbery/options.mk b/net/tacacs-shrubbery/options.mk index 7cbff9bfbe5..a1ad83cefbb 100644 --- a/net/tacacs-shrubbery/options.mk +++ b/net/tacacs-shrubbery/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2012/05/10 19:01:08 schwarz Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/03 11:45:54 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.tacacs-shrubbery PKG_SUPPORTED_OPTIONS= tacacs-shrubbery-acls-support tacacs-shrubbery-drop-root-privileges tcpwrappers skey @@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --with-groupid=${TACACS_GROUP:Q} .if !empty(PKG_OPTIONS:Mtcpwrappers) CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} -. include "../../security/tcp_wrappers/buildlink3.mk" +. include "../../security/tcp_wrappers/buildlink3.mk" .else CONFIGURE_ARGS+= --without-libwrap .endif @@ -34,13 +34,13 @@ CONFIGURE_ARGS+= --without-libwrap .if !empty(PKG_OPTIONS:Mskey) CONFIGURE_ARGS+= --with-skey=${BUILDLINK_PREFIX.skey} CHECK_BUILTIN.skey:=yes -. include "../../security/skey/builtin.mk" +. include "../../security/skey/builtin.mk" CHECK_BUILTIN.skey:=no -. if !empty(USE_BUILTIN.skey:M[nN][oO]) || ${OPSYS} == "OpenBSD" +. if !empty(USE_BUILTIN.skey:M[nN][oO]) || ${OPSYS} == "OpenBSD" # pkgsrc's version uses three arguments only, as does OpenBSD's CPPFLAGS+= -DOLDSKEY -. endif -. include "../../security/skey/buildlink3.mk" +. endif +. include "../../security/skey/buildlink3.mk" .else CONFIGURE_ARGS+= --without-skey .endif diff --git a/net/taskserver/Makefile b/net/taskserver/Makefile index c445668e1a1..cb46e7a2bac 100644 --- a/net/taskserver/Makefile +++ b/net/taskserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/07/20 22:46:42 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/03 11:45:54 rillig Exp $ DISTNAME= taskd-1.1.0 PKGNAME= ${DISTNAME:S/taskd/taskserver/} @@ -42,7 +42,7 @@ INSTALLATION_DIRS+= ${EGDIR}/pki BUILD_DEFS+= TASKD_USER TASKD_GROUP TASKD_DATA VARBASE -REPLACE_SH= src/taskdctl +REPLACE_SH= src/taskdctl SUBST_CLASSES+= abspath SUBST_STAGE.abspath= post-configure SUBST_MESSAGE.abspath= Set absolute paths. diff --git a/net/tcl-scotty/Makefile b/net/tcl-scotty/Makefile index c0f070e3e35..46a2ad1903b 100644 --- a/net/tcl-scotty/Makefile +++ b/net/tcl-scotty/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2018/05/29 12:56:55 he Exp $ +# $NetBSD: Makefile,v 1.47 2019/11/03 11:45:54 rillig Exp $ # DISTNAME= scotty-${DIST_VERS} @@ -20,11 +20,11 @@ DIST_VERS= 2.1.11 CONFIGURE_DIRS= unix BUILD_DIRS= unix -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-tcl-config=${BUILDLINK_PREFIX.tcl}/lib \ - --enable-multicast \ - --enable-gdmo --without-tk-config -CONFIGURE_ENV+= TARGET=scotty +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-tcl-config=${BUILDLINK_PREFIX.tcl}/lib \ + --enable-multicast \ + --enable-gdmo --without-tk-config +CONFIGURE_ENV+= TARGET=scotty .include "../../mk/bsd.prefs.mk" @@ -35,7 +35,7 @@ USE_TOOLS+= lex yacc PLIST_SUBST+= MACHINE="${MACHINE}" -INSTALL_TARGET= tnm-install install-man sinstall +INSTALL_TARGET= tnm-install install-man sinstall SPECIAL_PERMS+= bin/ntping ${SETUID_ROOT_PERMS} SPECIAL_PERMS+= bin/straps ${SETUID_ROOT_PERMS} diff --git a/net/tcpillust/Makefile b/net/tcpillust/Makefile index c9470a4a024..318bd23fd96 100644 --- a/net/tcpillust/Makefile +++ b/net/tcpillust/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2018/03/12 11:17:23 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2019/11/03 11:45:54 rillig Exp $ DISTNAME= tcpillust-1.0a PKGREVISION= 11 @@ -12,10 +12,10 @@ COMMENT= Graphical TCP connection analysis tool USE_IMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-tcl-include=${BUILDLINK_PREFIX.tcl}/include -CONFIGURE_ARGS+=--with-tcl-lib=${BUILDLINK_PREFIX.tcl}/lib -CONFIGURE_ARGS+=--with-tk-include=${BUILDLINK_PREFIX.tk}/include -CONFIGURE_ARGS+=--with-tk-lib=${BUILDLINK_PREFIX.tk}/lib +CONFIGURE_ARGS+= --with-tcl-include=${BUILDLINK_PREFIX.tcl}/include +CONFIGURE_ARGS+= --with-tcl-lib=${BUILDLINK_PREFIX.tcl}/lib +CONFIGURE_ARGS+= --with-tk-include=${BUILDLINK_PREFIX.tk}/include +CONFIGURE_ARGS+= --with-tk-lib=${BUILDLINK_PREFIX.tk}/lib DOCS= README SAMPLES= tcpclient.log tcpserver.log diff --git a/net/teamspeak-server/Makefile b/net/teamspeak-server/Makefile index d3433165e85..aa12f595b4d 100644 --- a/net/teamspeak-server/Makefile +++ b/net/teamspeak-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/02/04 09:34:49 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/03 11:45:54 rillig Exp $ PKGNAME= teamspeak-server-2.0.24.01 DISTNAME= ts2_server_rc2_202319 @@ -14,10 +14,10 @@ HOMEPAGE= http://www.goteamspeak.com/ COMMENT= Teamspeak group VoIP server LICENSE= teamspeak-license-200700213 -RESTRICTED= Redistribution to third parties is expressly prohibited -NO_SRC_ON_CDROM= ${RESTRICTED} -NO_BIN_ON_FTP= ${RESTRICTED} -NO_BIN_ON_CDROM= ${RESTRICTED} +RESTRICTED= Redistribution to third parties is expressly prohibited +NO_SRC_ON_CDROM= ${RESTRICTED} +NO_BIN_ON_FTP= ${RESTRICTED} +NO_BIN_ON_CDROM= ${RESTRICTED} EMUL_PLATFORMS= linux-i386 EMUL_MODULES.linux= base @@ -51,7 +51,7 @@ PKG_GECOS.${TSUSER}= Teamspeak server user PKG_HOME.${TSUSER}= ${TSHOME} PKG_SHELL.${TSUSER}= ${SH} -FILES_SUBST+= TSUSER=${TSUSER} +FILES_SUBST+= TSUSER=${TSUSER} INSTALLATION_DIRS= ${LIB_DIR} share/examples/rc.d ${SHARE_DIR}/httpdocs \ ${SHARE_DIR}/tcpquerydocs ${SHARE_DIR}/mysql_sql \ diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile index 6987f9687be..2dcb39c0646 100644 --- a/net/tigervnc/Makefile +++ b/net/tigervnc/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.26 2019/08/11 13:22:30 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2019/11/03 11:45:54 rillig Exp $ -DISTNAME= tigervnc-1.9.0 -PKGREVISION= 3 -CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/} -GITHUB_TAG= v${PKGVERSION_NOREV} +DISTNAME= tigervnc-1.9.0 +PKGREVISION= 3 +CATEGORIES= net +MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/} +GITHUB_TAG= v${PKGVERSION_NOREV} XORG_SERVER_FILE= xorg-server-1.17.2 SITES.${XORG_SERVER_FILE}.tar.bz2= ${MASTER_SITE_XORG:=xserver/} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://tigervnc.org/ @@ -29,14 +29,14 @@ INSTALL_DIRS= . unix/xserver/hw/vnc LDFLAGS+= ${BUILDLINK_LDADD.gettext} -CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" -OVERRIDE_GNU_CONFIG_SCRIPTS= yes -LIBTOOL_OVERRIDE=unix/xserver/libtool +CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" +OVERRIDE_GNU_CONFIG_SCRIPTS= yes +LIBTOOL_OVERRIDE= unix/xserver/libtool SUBST_CLASSES+= hpath SUBST_STAGE.hpath= pre-configure SUBST_MESSAGE.hpath= fixing hardcoded paths -SUBST_FILES.hpath= unix/vncserver +SUBST_FILES.hpath= unix/vncserver SUBST_SED.hpath+= -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' SUBST_VARS.hpath+= PREFIX X11BASE diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile index a6127e7dd3e..ff504fa1bdc 100644 --- a/net/tinyfugue/Makefile +++ b/net/tinyfugue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2019/05/23 19:23:11 rillig Exp $ +# $NetBSD: Makefile,v 1.35 2019/11/03 11:45:54 rillig Exp $ DISTNAME= tf-40s1 PKGNAME= tf-4.0s1 @@ -16,9 +16,9 @@ MAKE_JOBS_SAFE= no MAKE_FILE= ${WRKSRC}/unix/Makefile MAKE_ENV+= TFVER=${DISTNAME:S/^tf-//} -PATCH_SITES= http://discworld.imaginary.com/external/taffyd/ -PATCHFILES= tf-40s1-mccp-patch.gz -PATCH_DIST_STRIP=-p1 +PATCH_SITES= http://discworld.imaginary.com/external/taffyd/ +PATCHFILES= tf-40s1-mccp-patch.gz +PATCH_DIST_STRIP= -p1 INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 diff --git a/net/tkined/Makefile b/net/tkined/Makefile index 72f4adf260e..92497bc0656 100644 --- a/net/tkined/Makefile +++ b/net/tkined/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2018/03/12 11:17:23 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2019/11/03 11:45:55 rillig Exp $ # DISTNAME= scotty-2.1.11 @@ -11,11 +11,11 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.ibr.cs.tu-bs.de/projects/nm/tkined/welcome.html.orig COMMENT= Graphical network discovery and monitoring tool based on scotty -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-tcl-config=${BUILDLINK_PREFIX.tcl}/lib \ - --with-tk-config=${BUILDLINK_PREFIX.tk}/lib \ - --enable-multicast --enable-gdmo -CONFIGURE_ENV+= TARGET=tkined +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-tcl-config=${BUILDLINK_PREFIX.tcl}/lib \ + --with-tk-config=${BUILDLINK_PREFIX.tk}/lib \ + --enable-multicast --enable-gdmo +CONFIGURE_ENV+= TARGET=tkined USE_LIBTOOL= yes diff --git a/net/tnftp/options.mk b/net/tnftp/options.mk index c73bce64b79..17b6f72031c 100644 --- a/net/tnftp/options.mk +++ b/net/tnftp/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.11 2015/09/30 08:25:37 tnn Exp $ +# $NetBSD: options.mk,v 1.12 2019/11/03 11:45:55 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.tnftp -PKG_SUPPORTED_OPTIONS= inet6 ssl socks -PKG_SUGGESTED_OPTIONS= inet6 +PKG_SUPPORTED_OPTIONS= inet6 ssl socks +PKG_SUGGESTED_OPTIONS= inet6 CHECK_BUILTIN.openssl:= yes .include "../../security/openssl/builtin.mk" diff --git a/net/tor/Makefile b/net/tor/Makefile index 0f1c5aaa05b..1f9f5a608ff 100644 --- a/net/tor/Makefile +++ b/net/tor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.145 2019/09/21 23:57:17 alnsn Exp $ +# $NetBSD: Makefile,v 1.146 2019/11/03 11:45:55 rillig Exp $ DISTNAME= tor-0.4.1.6 CATEGORIES= net security @@ -54,7 +54,7 @@ FILES_SUBST+= TOR_USER=${TOR_USER} TOR_GROUP=${TOR_GROUP} INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples -CHECK_PORTABILITY_SKIP+=contrib/* +CHECK_PORTABILITY_SKIP+= contrib/* .include "options.mk" diff --git a/net/traceroute-as/Makefile b/net/traceroute-as/Makefile index 363d4a3a092..2486e917a08 100644 --- a/net/traceroute-as/Makefile +++ b/net/traceroute-as/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2016/04/21 16:35:15 jperkin Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/03 11:45:55 rillig Exp $ # DISTNAME= traceroute_991603.tar @@ -18,9 +18,9 @@ PKG_LIBRARIES.*= # empty PKG_SYSDEFS.SunOS= -DSYSV PKG_SYSDEFS.*= #empty -MAKE_FLAGS+= CC=${CC:Q} PKG_CFLAGS=${CFLAGS:M*:Q} PKG_SYSDEFS=${PKG_SYSDEFS:Q} -MAKE_FLAGS+= PKG_LIBRARIES=${PKG_LIBRARIES:Q} DESTMAN=${DESTDIR}${PREFIX}/${PKGMANDIR} -INSTALL_PROGRAM_SUID= ${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${BINOWN} -g ${BINGRP} -m 4555 -MAKE_ENV+= BSD_INSTALL_PROGRAM_SUID=${INSTALL_PROGRAM_SUID:Q} +MAKE_FLAGS+= CC=${CC:Q} PKG_CFLAGS=${CFLAGS:M*:Q} PKG_SYSDEFS=${PKG_SYSDEFS:Q} +MAKE_FLAGS+= PKG_LIBRARIES=${PKG_LIBRARIES:Q} DESTMAN=${DESTDIR}${PREFIX}/${PKGMANDIR} +INSTALL_PROGRAM_SUID= ${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${BINOWN} -g ${BINGRP} -m 4555 +MAKE_ENV+= BSD_INSTALL_PROGRAM_SUID=${INSTALL_PROGRAM_SUID:Q} .include "../../mk/bsd.pkg.mk" diff --git a/net/traceroute-nanog/Makefile b/net/traceroute-nanog/Makefile index 5207474e2d1..775cc3c4ddc 100644 --- a/net/traceroute-nanog/Makefile +++ b/net/traceroute-nanog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2017/04/17 19:53:11 schwarz Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 11:45:55 rillig Exp $ DISTNAME= traceroute-nanog_6.4.2.orig PKGNAME= ${DISTNAME:S/.orig//:S/_/-/} @@ -45,10 +45,10 @@ CPPFLAGS+= -Dsocklen_t=int INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8 do-build: - cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} traceroute.c -o traceroute-nanog ${LDFLAGS} -lm ${LIBS} + cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} traceroute.c -o traceroute-nanog ${LDFLAGS} -lm ${LIBS} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/traceroute-nanog ${DESTDIR}${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/${PKGNAME}/debian/traceroute-nanog.genuine.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/traceroute-nanog.8 + ${INSTALL_PROGRAM} ${WRKSRC}/traceroute-nanog ${DESTDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/${PKGNAME}/debian/traceroute-nanog.genuine.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/traceroute-nanog.8 .include "../../mk/bsd.pkg.mk" diff --git a/net/trickle/Makefile b/net/trickle/Makefile index 1111f658bbd..42fa0659c8e 100644 --- a/net/trickle/Makefile +++ b/net/trickle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2017/09/06 09:03:03 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2019/11/03 11:45:55 rillig Exp $ # DISTNAME= trickle-1.06 @@ -18,7 +18,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/trickle CONF_FILES= ${EGDIR}/trickled.conf ${PKG_SYSCONFDIR}/trickled.conf -RCD_SCRIPTS= trickled +RCD_SCRIPTS= trickled INSTALLATION_DIRS+= ${EGDIR} pre-install: diff --git a/net/tsocks/Makefile b/net/tsocks/Makefile index fa2fc1d4f6a..ab977b062d2 100644 --- a/net/tsocks/Makefile +++ b/net/tsocks/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/05/23 19:23:11 rillig Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/03 11:45:55 rillig Exp $ # DISTNAME= tsocks-1.8beta5 @@ -14,9 +14,9 @@ LICENSE= gnu-gpl-v2 MAKE_JOBS_SAFE= no WRKSRC= ${WRKDIR}/tsocks-1.8 -GNU_CONFIGURE= YES -USE_TOOLS+= gmake -USE_LIBTOOL= yes +GNU_CONFIGURE= YES +USE_TOOLS+= gmake +USE_LIBTOOL= yes CONFIGURE_ARGS+= --with-conf=${PKG_SYSCONFDIR}/tsocks.conf diff --git a/net/ttt/Makefile b/net/ttt/Makefile index dba7bd21fc0..8eb89665b01 100644 --- a/net/ttt/Makefile +++ b/net/ttt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2018/03/12 11:17:23 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2019/11/03 11:45:56 rillig Exp $ # DISTNAME= ttt-1.8.2 @@ -10,12 +10,12 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://www.sonycsl.co.jp/person/kjc/software.html COMMENT= Tele Traffic Tapper -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl} CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk} INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 -INSTALL_TARGET= install install-man +INSTALL_TARGET= install install-man INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \ exec_prefix=${DESTDIR}${PREFIX} \ mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} @@ -28,13 +28,13 @@ REPLACE_FILES.sys-BLTWISH= ttt.tcl .include "../../mk/bsd.prefs.mk" -CFLAGS+= -DUSE_INTERP_RESULT +CFLAGS+= -DUSE_INTERP_RESULT CONFIGURE_ARGS+= ttt_cv_prog_cflags=${CFLAGS:Q} .if ${OPSYS} == "NetBSD" -.if empty(OS_VERSION:M1.[56]*) +. if empty(OS_VERSION:M1.[56]*) .include "../../mk/pthread.buildlink3.mk" -.endif +. endif .endif .include "options.mk" diff --git a/net/tvnjviewer/Makefile b/net/tvnjviewer/Makefile index 77a1446980f..8c9f765f0a8 100644 --- a/net/tvnjviewer/Makefile +++ b/net/tvnjviewer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2016/04/14 21:58:09 abs Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/03 11:45:56 rillig Exp $ DISTNAME= tvnjviewer-2.7.2-bin PKGNAME= ${DISTNAME:S:-bin::} @@ -11,9 +11,9 @@ HOMEPAGE= http://www.tightvnc.com/doc/java/README.txt COMMENT= JAVA VNC viewer LICENSE= gnu-gpl-v2 -WRKSRC= ${WRKDIR} -USE_LANGUAGES= # none -USE_JAVA= run +WRKSRC= ${WRKDIR} +USE_LANGUAGES= # none +USE_JAVA= run INSTALLATION_DIRS= bin lib/java/tvnjviewer share/doc/tvnjviewer do-build: diff --git a/net/ucspi-ssl/Makefile b/net/ucspi-ssl/Makefile index c8db210965c..8bcbbbd0508 100644 --- a/net/ucspi-ssl/Makefile +++ b/net/ucspi-ssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2019/08/20 00:14:25 schmonz Exp $ +# $NetBSD: Makefile,v 1.39 2019/11/03 11:45:56 rillig Exp $ # DISTNAME= ucspi-ssl-0.10.11 @@ -52,30 +52,30 @@ do-test: ./package/rts do-install: do-install-sslperl -. for i in ${SSL_SCRIPTS} +.for i in ${SSL_SCRIPTS} ${INSTALL_SCRIPT} ${WRKSRC}/command/${i} ${DESTDIR}${PREFIX}/bin -. endfor +.endfor -. for i in ${SSL_PROGRAMS} +.for i in ${SSL_PROGRAMS} ${INSTALL_PROGRAM} ${WRKSRC}/command/${i} ${DESTDIR}${PREFIX}/bin -. endfor +.endfor -. for i in ${SSL_MAN1PAGES} +.for i in ${SSL_MAN1PAGES} ${INSTALL_MAN} ${WRKSRC}/man/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 -. endfor +.endfor -. for i in ${SSL_MAN2PAGES} +.for i in ${SSL_MAN2PAGES} ${INSTALL_MAN} ${WRKSRC}/man/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man2 -. endfor +.endfor -. for i in dh1024.pem +.for i in dh1024.pem ${INSTALL_DATA} ${WRKSRC}/etc/${i} ${DESTDIR}${EGDIR} -. endfor +.endfor -. for i in CERTS CHAIN-SSL CHANGES TLSVERSION_CIPHERSUITES TLS_1_3 TODO UCSPI-SSL +.for i in CERTS CHAIN-SSL CHANGES TLSVERSION_CIPHERSUITES TLS_1_3 TODO UCSPI-SSL ${INSTALL_DATA} ${WRKSRC}/doc/${i} \ ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} -. endfor +.endfor .include "../../net/fehqlibs/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/net/ucspi-tcp/options.mk b/net/ucspi-tcp/options.mk index 77d840368fe..76426a79f99 100644 --- a/net/ucspi-tcp/options.mk +++ b/net/ucspi-tcp/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.8 2018/11/15 13:46:07 schmonz Exp $ +# $NetBSD: options.mk,v 1.9 2019/11/03 11:45:56 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ucspi-tcp PKG_SUPPORTED_OPTIONS+= ucspi-tcp-nodefaultrbl @@ -7,8 +7,8 @@ PKG_SUGGESTED_OPTIONS+= ucspi-tcp-nodefaultrbl .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mucspi-tcp-nodefaultrbl) -NODEFAULTRBL_PATCH= rblsmtpd-nodefaultrbl.patch -PATCHFILES+= ${NODEFAULTRBL_PATCH} -SITES.${NODEFAULTRBL_PATCH}= http://pyropus.ca/software/misc/ +NODEFAULTRBL_PATCH= rblsmtpd-nodefaultrbl.patch +PATCHFILES+= ${NODEFAULTRBL_PATCH} +SITES.${NODEFAULTRBL_PATCH}= http://pyropus.ca/software/misc/ PATCH_DIST_STRIP.${NODEFAULTRBL_PATCH}= -p1 .endif diff --git a/net/udns/Makefile b/net/udns/Makefile index a9f0fb17a63..a895c3dddd5 100644 --- a/net/udns/Makefile +++ b/net/udns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2014/02/24 19:29:02 schnoebe Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/03 11:45:56 rillig Exp $ DISTNAME= udns-0.4 CATEGORIES= net @@ -38,8 +38,8 @@ LDFLAGS.SunOS+= -lsocket -lnsl # gcc on NetBSD botch's if (!<ptr>) tests at -O2. (or higher) .if ${OPSYS} == "NetBSD" -. if ${MACHINE_ARCH} == "alpha" +. if ${MACHINE_ARCH} == "alpha" BUILDLINK_TRANSFORM+= opt:-O[2-9]:-O1 # BUILDLINK_TRANSFORM+= rm:-O[2-9] -. endif +. endif .endif diff --git a/net/unbound/Makefile b/net/unbound/Makefile index d508073d7f8..474b2db4560 100644 --- a/net/unbound/Makefile +++ b/net/unbound/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2019/10/03 09:44:38 he Exp $ +# $NetBSD: Makefile,v 1.71 2019/11/03 11:45:56 rillig Exp $ DISTNAME= unbound-1.9.4 CATEGORIES= net @@ -38,31 +38,31 @@ CHECK_BUILTIN.openssl= no PLIST_VARS+= sha2 gost .if defined(USE_BUILTIN.openssl) && !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) -PLIST_VARS.gost!= \ - if ${PKG_ADMIN} pmatch 'openssl>=1.0.0' ${BUILTIN_PKG.openssl}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -PLIST_VARS.sha2!= \ - if ${PKG_ADMIN} pmatch 'openssl>=0.9.8' ${BUILTIN_PKG.openssl}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi +PLIST_VARS.gost!= \ + if ${PKG_ADMIN} pmatch 'openssl>=1.0.0' ${BUILTIN_PKG.openssl}; then \ + ${ECHO} "yes"; \ + else \ + ${ECHO} "no"; \ + fi +PLIST_VARS.sha2!= \ + if ${PKG_ADMIN} pmatch 'openssl>=0.9.8' ${BUILTIN_PKG.openssl}; then \ + ${ECHO} "yes"; \ + else \ + ${ECHO} "no"; \ + fi .else -PLIST_VARS.gost!= \ - if ${PKG_INFO} -qe 'openssl>=1.0.0'; then \ - ${ECHO} yes; \ - else \ - ${ECHO} no; \ - fi -PLIST_VARS.sha2!= \ - if ${PKG_INFO} -qe 'openssl>=0.9.8'; then \ - ${ECHO} yes; \ - else \ - ${ECHO} no; \ - fi +PLIST_VARS.gost!= \ + if ${PKG_INFO} -qe 'openssl>=1.0.0'; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi +PLIST_VARS.sha2!= \ + if ${PKG_INFO} -qe 'openssl>=0.9.8'; then \ + ${ECHO} yes; \ + else \ + ${ECHO} no; \ + fi .endif .if ${PLIST_VARS.gost} == "yes" CONFIGURE_ARGS+= --enable-gost @@ -82,12 +82,12 @@ SUBST_FILES.paths= doc/example.conf doc/*.5 doc/*.8 SUBST_SED.paths= -e "s|/usr/local|${PREFIX}|" INSTALL_MAKE_FLAGS+= \ - configfile=${PREFIX}/share/examples/unbound/unbound.conf + configfile=${PREFIX}/share/examples/unbound/unbound.conf PKG_SYSCONFSUBDIR= unbound CONF_FILES+= share/examples/unbound/unbound.conf \ - ${PKG_SYSCONFDIR}/unbound.conf + ${PKG_SYSCONFDIR}/unbound.conf RCD_SCRIPTS= unbound SMF_METHODS= unbound diff --git a/net/unison2.48/Makefile b/net/unison2.48/Makefile index 99a9dff251f..582edb45ad8 100644 --- a/net/unison2.48/Makefile +++ b/net/unison2.48/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/10/28 20:04:21 gdt Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/03 11:45:56 rillig Exp $ GITHUB_TAG= v${PKGVERSION_NOREV} DISTNAME= unison-2.48.15v4 @@ -17,11 +17,11 @@ LICENSE= gnu-gpl-v3 MAKE_JOBS_SAFE= no .if (${MACHINE_ARCH} == "arm") -BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=3.12.0nb2 +BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=3.12.0nb2 .else -BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=3.11.2 +BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=3.11.2 .endif -BUILDLINK_API_DEPENDS.ocaml-lablgtk+= ocaml-lablgtk>=2.16.0 +BUILDLINK_API_DEPENDS.ocaml-lablgtk+= ocaml-lablgtk>=2.16.0 WRKSRC= ${WRKDIR}/${DISTNAME} USE_TOOLS+= gmake diff --git a/net/unison2.51/Makefile b/net/unison2.51/Makefile index 6fd63c06889..e3bc55d329e 100644 --- a/net/unison2.51/Makefile +++ b/net/unison2.51/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2019/10/28 20:02:29 gdt Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/03 11:45:56 rillig Exp $ # This package is "unison-2.51.x" because 2.51 is the standard # approach, and hence uses the bare name. @@ -18,7 +18,7 @@ LICENSE= gnu-gpl-v3 #MAKE_JOBS_SAFE= no # docs: unison-manual.pdf/html/ps/dvi -#WRKSRC= ${WRKDIR}/src +#WRKSRC= ${WRKDIR}/src USE_TOOLS+= gmake MAKE_FLAGS+= CFLAGS="" -C src MAKE_ENV+= HOME=${WRKDIR:Q} diff --git a/net/upnpinspector/Makefile b/net/upnpinspector/Makefile index 12cc0c8fa97..3eaf9d12584 100644 --- a/net/upnpinspector/Makefile +++ b/net/upnpinspector/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2019/09/02 13:19:50 adam Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/03 11:45:56 rillig Exp $ DISTNAME= UPnP-Inspector-0.2.2 PKGREVISION= 4 @@ -15,7 +15,7 @@ DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2 USE_LANGUAGES= # none -PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 +PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/userppp/Makefile b/net/userppp/Makefile index a19a87d0d09..af998398361 100644 --- a/net/userppp/Makefile +++ b/net/userppp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/10/23 17:19:16 asau Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/03 11:45:57 rillig Exp $ DISTNAME= ppp-001107.src PKGNAME= userppp-001107 @@ -17,14 +17,14 @@ MANCOMPRESSED_IF_MANZ= YES PKG_SYSCONFSUBDIR= ppp -CFLAGS+= -fno-strict-aliasing +CFLAGS+= -fno-strict-aliasing # fix build on -current for wrong is* arguments (char instead of unsigned char) BUILDLINK_TRANSFORM+= rm:-Werror SUBST_CLASSES+= cfgdir SUBST_STAGE.cfgdir= do-configure SUBST_FILES.cfgdir= ppp/ppp.8 pppctl/pppctl.8 -SUBST_SED.cfgdir= -e "s,/etc/ppp,${PKG_SYSCONFDIR}," +SUBST_SED.cfgdir= -e "s,/etc/ppp,${PKG_SYSCONFDIR}," SUBST_SED.cfgdir+= -e "s,/usr/share,${PREFIX}/share," .include "../../mk/bsd.prefs.mk" diff --git a/net/uucp/Makefile b/net/uucp/Makefile index d17f78f7ba0..c075c18ccfd 100644 --- a/net/uucp/Makefile +++ b/net/uucp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2017/11/26 10:54:19 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/03 11:45:57 rillig Exp $ DISTNAME= uucp-1.07 PKGREVISION= 7 @@ -77,11 +77,11 @@ UUCPD_CPPFLAGS.${OPSYS}+= -DSUPPORT_UTMP .if exists(/usr/include/utmpx.h) UUCPD_CPPFLAGS.${OPSYS}+= -DSUPPORT_UTMPX .endif -UUCPD_CPPFLAGS.Darwin= -DSUPPORT_UTMP -UUCPD_CPPFLAGS.*= # empty -UUCPD_LIBS.Darwin= # empty -UUCPD_LIBS.*= -lcrypt -lutil -OPSYSVARS+= UUCPD_CPPFLAGS UUCPD_LIBS +UUCPD_CPPFLAGS.Darwin= -DSUPPORT_UTMP +UUCPD_CPPFLAGS.*= # empty +UUCPD_LIBS.Darwin= # empty +UUCPD_LIBS.*= -lcrypt -lutil +OPSYSVARS+= UUCPD_CPPFLAGS UUCPD_LIBS INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man8 share/examples/uucp diff --git a/net/vnc/Makefile b/net/vnc/Makefile index 9b00bacab7c..3655c14fd53 100644 --- a/net/vnc/Makefile +++ b/net/vnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2019/08/11 13:22:32 wiz Exp $ +# $NetBSD: Makefile,v 1.61 2019/11/03 11:45:57 rillig Exp $ DISTNAME= vnc-3.3.3r2 PKGNAME= vnc-3.3.3.2 @@ -24,11 +24,11 @@ BUILD_DEFS+= IPV6_READY BUILD_TARGET= World -MAKE_ENV+= CC=${CC:Q} #for make imake in Xvnc/config/imake +MAKE_ENV+= CC=${CC:Q} #for make imake in Xvnc/config/imake -PKG_OPTIONS_VAR= PKG_OPTIONS.vnc -PKG_SUPPORTED_OPTIONS= inet6 -PKG_SUGGESTED_OPTIONS= inet6 +PKG_OPTIONS_VAR= PKG_OPTIONS.vnc +PKG_SUPPORTED_OPTIONS= inet6 +PKG_SUGGESTED_OPTIONS= inet6 .include "../../mk/bsd.options.mk" @@ -58,7 +58,7 @@ INSTALLATION_DIRS= bin share/doc/vnc .if ${OPSYS} == "SunOS" _WRAP_EXTRA_ARGS.CC+= -D_POSIX_SOURCE CWRAPPERS_APPEND.cc+= -D_POSIX_SOURCE -SPECIAL_PERMS+= bin/Xvnc ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 2555 +SPECIAL_PERMS+= bin/Xvnc ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 2555 .endif .if ${OS_VARIANT} == "SmartOS" diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile index c0a6fc92dc0..5af4c19e99a 100644 --- a/net/vnstat/Makefile +++ b/net/vnstat/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.18 2018/03/12 11:17:24 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/03 11:45:57 rillig Exp $ DISTNAME= vnstat-1.14 PKGREVISION= 5 CATEGORIES= net MASTER_SITES= http://humdi.net/vnstat/ -#DISTFILES=${DISTNAME}.tar.gz +#DISTFILES= ${DISTNAME}.tar.gz MAINTAINER= sborrill@NetBSD.org HOMEPAGE= http://humdi.net/vnstat/ @@ -32,7 +32,7 @@ SUBST_FILES.fix-etcpath+= man/vnstat.1 man/vnstatd.1 SUBST_FILES.fix-etcpath+= man/vnstati.1 SUBST_SED.fix-etcpath= -e 's,/etc/,${PKG_SYSCONFDIR}/,g' -CONF_FILES= ${VNSTAT_EGDIR}/vnstat.conf ${VNSTAT_CONFIG} +CONF_FILES= ${VNSTAT_EGDIR}/vnstat.conf ${VNSTAT_CONFIG} RCD_SCRIPTS= vnstatd diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile index b205e1e92ba..bb52a7d6962 100644 --- a/net/vsftpd/Makefile +++ b/net/vsftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2018/12/26 11:11:23 adam Exp $ +# $NetBSD: Makefile,v 1.48 2019/11/03 11:45:57 rillig Exp $ DISTNAME= vsftpd-3.0.3 PKGREVISION= 1 @@ -39,17 +39,17 @@ MAKE_ENV+= LIBS=${LIBS:Q} .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" && ${OS_VERSION} == "5.11" -SUBST_CLASSES+= dirfd -SUBST_STAGE.dirfd= pre-build -SUBST_FILES.dirfd= port/solaris_bogons.h -SUBST_SED.dirfd= -e '/dirfd_extras/d' +SUBST_CLASSES+= dirfd +SUBST_STAGE.dirfd= pre-build +SUBST_FILES.dirfd= port/solaris_bogons.h +SUBST_SED.dirfd= -e '/dirfd_extras/d' .endif .if !empty(PKGSRC_COMPILER:Mclang) -SUBST_CLASSES+= idirafter -SUBST_MESSAGE.idirafter=Fix buggy -idirafter for clang -SUBST_STAGE.idirafter= pre-build -SUBST_FILES.idirafter= Makefile -SUBST_SED.idirafter= -e 's,-idirafter ,-I,' +SUBST_CLASSES+= idirafter +SUBST_MESSAGE.idirafter= Fix buggy -idirafter for clang +SUBST_STAGE.idirafter= pre-build +SUBST_FILES.idirafter= Makefile +SUBST_SED.idirafter= -e 's,-idirafter ,-I,' .endif VSFTPD_USER?= vsftpd diff --git a/net/wakeup/Makefile b/net/wakeup/Makefile index 6dd718b8a58..dffe2493fd5 100644 --- a/net/wakeup/Makefile +++ b/net/wakeup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/23 17:19:18 asau Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/03 11:45:57 rillig Exp $ # DISTNAME= hpwake @@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.berens-partner.de/wann/computer/wol.html COMMENT= Wakeup On LAN client for remote power-up of machines -USE_TOOLS+= gunzip +USE_TOOLS+= gunzip USE_BSD_MAKEFILE= yes INSTALLATION_DIRS= bin diff --git a/net/walker/Makefile b/net/walker/Makefile index d985ba0bd97..99553f512a5 100644 --- a/net/walker/Makefile +++ b/net/walker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/08/11 13:22:32 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/03 11:45:57 rillig Exp $ # DISTNAME= walker-3.8 @@ -14,10 +14,10 @@ DEPENDS+= p5-Net-DNS>=0.50:../../net/p5-Net-DNS DEPENDS+= p5-Net-DNS-SEC>=0.12:../../security/p5-Net-DNS-SEC INSTALLATION_DIRS+= ${PKGMANDIR}/man1 bin -NO_BUILD= yes -REPLACE_PERL= walker -USE_LANGUAGES= # none -USE_TOOLS+= perl:run +NO_BUILD= yes +REPLACE_PERL= walker +USE_LANGUAGES= # none +USE_TOOLS+= perl:run do-install: ${INSTALL} ${WRKSRC}/walker ${DESTDIR}${PREFIX}/bin/ diff --git a/net/wget/options.mk b/net/wget/options.mk index 3629bfa4e8d..e2d8abb2eed 100644 --- a/net/wget/options.mk +++ b/net/wget/options.mk @@ -1,10 +1,10 @@ -# $NetBSD: options.mk,v 1.12 2018/11/04 16:34:57 bsiegert Exp $ +# $NetBSD: options.mk,v 1.13 2019/11/03 11:45:58 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.wget -PKG_SUPPORTED_OPTIONS= idn inet6 psl +PKG_OPTIONS_VAR= PKG_OPTIONS.wget +PKG_SUPPORTED_OPTIONS= idn inet6 psl PKG_OPTIONS_REQUIRED_GROUPS= ssl -PKG_OPTIONS_GROUP.ssl= gnutls openssl -PKG_SUGGESTED_OPTIONS= idn inet6 openssl psl +PKG_OPTIONS_GROUP.ssl= gnutls openssl +PKG_SUGGESTED_OPTIONS= idn inet6 openssl psl .include "../../mk/bsd.options.mk" diff --git a/net/whoson/Makefile b/net/whoson/Makefile index dc24a7836ca..5e1631aeb2c 100644 --- a/net/whoson/Makefile +++ b/net/whoson/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2014/12/13 14:22:05 mef Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/03 11:45:58 rillig Exp $ # DISTNAME= whoson-2.05 @@ -17,8 +17,8 @@ GNU_CONFIGURE= yes WHOSOND_CHROOT?= ${VARBASE}/chroot/whosond CONFIGURE_ARGS+= --with-config="${PKG_SYSCONFDIR}/whoson.conf" -RCD_SCRIPTS= whosond -OWN_DIRS+= ${WHOSOND_CHROOT} +RCD_SCRIPTS= whosond +OWN_DIRS+= ${WHOSOND_CHROOT} EXDIR= ${PREFIX}/share/examples/whoson CONF_FILES= ${EXDIR}/whoson.conf ${PKG_SYSCONFDIR}/whoson.conf diff --git a/net/wide-dhcpv6/Makefile b/net/wide-dhcpv6/Makefile index 81feedfc805..8b98c73e2e1 100644 --- a/net/wide-dhcpv6/Makefile +++ b/net/wide-dhcpv6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/23 17:19:19 asau Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/03 11:45:58 rillig Exp $ DISTNAME= wide-dhcpv6-20080615 CATEGORIES= net @@ -9,8 +9,8 @@ HOMEPAGE= http://wide-dhcpv6.sourceforge.net/ COMMENT= DHCP6 client, server and relay agent by WIDE project LICENSE= modified-bsd -USE_TOOLS+= lex yacc -GNU_CONFIGURE= yes +USE_TOOLS+= lex yacc +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-localdbdir=${VARBASE:Q}/db @@ -27,11 +27,11 @@ INSTALLATION_DIRS= ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin \ share/examples/wide-dhcpv6 -SUBST_CLASSES+= fix-paths -SUBST_STAGE.fix-paths= pre-configure -SUBST_MESSAGE.fix-paths=Fixing absolute paths. -SUBST_FILES.fix-paths= ${MAN5} ${MAN8} -SUBST_SED.fix-paths= -e 's,/usr/local/etc,${PKG_SYSCONFDIR:Q},g' +SUBST_CLASSES+= fix-paths +SUBST_STAGE.fix-paths= pre-configure +SUBST_MESSAGE.fix-paths= Fixing absolute paths. +SUBST_FILES.fix-paths= ${MAN5} ${MAN8} +SUBST_SED.fix-paths= -e 's,/usr/local/etc,${PKG_SYSCONFDIR:Q},g' SUBST_CLASSES+= dprintf SUBST_STAGE.dprintf= post-configure diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile index 0b1d6966f04..9b533d02fd2 100644 --- a/net/wu-ftpd/Makefile +++ b/net/wu-ftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2019/02/04 09:34:49 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2019/11/03 11:45:58 rillig Exp $ DISTNAME= wu-ftpd-2.6.2 PKGREVISION= 3 @@ -21,7 +21,7 @@ CONFLICTS+= lukemftpd-[0-9]* GNU_CONFIGURE= YES USE_TOOLS+= yacc -CONFIGURE_ARGS+=--enable-quota --enable-noop --enable-skey +CONFIGURE_ARGS+= --enable-quota --enable-noop --enable-skey DIST_SUBDIR= wu-ftpd diff --git a/net/x2vnc/options.mk b/net/x2vnc/options.mk index 2c1662a7e23..07b0bc8509f 100644 --- a/net/x2vnc/options.mk +++ b/net/x2vnc/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2018/03/07 11:57:32 wiz Exp $ +# $NetBSD: options.mk,v 1.4 2019/11/03 11:45:58 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.x2vnc @@ -9,6 +9,6 @@ PKG_SUGGESTED_OPTIONS= .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdga) -. include "../../x11/libXxf86dga/buildlink3.mk" -. include "../../x11/xorgproto/buildlink3.mk" +. include "../../x11/libXxf86dga/buildlink3.mk" +. include "../../x11/xorgproto/buildlink3.mk" .endif diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile index dc5e0badc6a..c709b3575b2 100644 --- a/net/xtraceroute/Makefile +++ b/net/xtraceroute/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2017/09/06 10:40:32 wiz Exp $ +# $NetBSD: Makefile,v 1.61 2019/11/03 11:45:58 rillig Exp $ # DISTNAME= xtraceroute-0.8.14 @@ -17,9 +17,9 @@ USE_PKGLOCALEDIR= yes USE_TOOLS+= msgfmt USE_FEATURES= snprintf -CONFIGURE_ARGS+= --with-gtk-prefix="${BUILDLINK_PREFIX.gtk}" -CONFIGURE_ARGS+= --with-GL-prefix=${LOCALBASE} -CONFIGURE_ARGS+= --with-lib-MesaGL +CONFIGURE_ARGS+= --with-gtk-prefix="${BUILDLINK_PREFIX.gtk}" +CONFIGURE_ARGS+= --with-GL-prefix=${LOCALBASE} +CONFIGURE_ARGS+= --with-lib-MesaGL .include "../../mk/bsd.prefs.mk" diff --git a/net/xymon/options.mk b/net/xymon/options.mk index 4f42250737c..8e8150c5b2f 100644 --- a/net/xymon/options.mk +++ b/net/xymon/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.2 2012/05/10 21:58:38 spz Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/03 11:45:58 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.xymon -PKG_SUPPORTED_OPTIONS= ldap snmp ssl -PKG_SUGGESTED_OPTIONS= ldap ssl +PKG_OPTIONS_VAR= PKG_OPTIONS.xymon +PKG_SUPPORTED_OPTIONS= ldap snmp ssl +PKG_SUGGESTED_OPTIONS= ldap ssl .include "../../mk/bsd.options.mk" @@ -13,9 +13,9 @@ PLIST_VARS+= snmp CONFIGURE_ARGS+= "--ldapinclude" "${BUILDLINK_PREFIX.openldap-client}/include" CONFIGURE_ARGS+= "--ldaplib" "${BUILDLINK_PREFIX.openldap-client}/lib" CONFIGURE_ENV+= ENABLELDAP=y -.if !empty(PKG_OPTIONS:Mssl) +. if !empty(PKG_OPTIONS:Mssl) CONFIGURE_ENV+= ENABLELDAPSSL=y -.endif +. endif .include "../../databases/openldap-client/buildlink3.mk" .else CONFIGURE_ENV+= ENABLELDAP=n diff --git a/net/yaz/Makefile b/net/yaz/Makefile index e3726e47233..6c74a84bb06 100644 --- a/net/yaz/Makefile +++ b/net/yaz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2019/04/03 00:33:02 ryoon Exp $ +# $NetBSD: Makefile,v 1.75 2019/11/03 11:45:58 rillig Exp $ # DISTNAME= yaz-4.1.6 @@ -17,9 +17,9 @@ LICENSE= modified-bsd #../include/yaz/z-opac.h:37:2: error: unknown type name 'Z_External' MAKE_JOBS_SAFE= no -GNU_CONFIGURE= YES -USE_LIBTOOL= YES -USE_TOOLS+= pkg-config tclsh +GNU_CONFIGURE= YES +USE_LIBTOOL= YES +USE_TOOLS+= pkg-config tclsh CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.libiconv} CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-xml2=${BUILDLINK_PREFIX.libxml2} diff --git a/net/ytalk/Makefile b/net/ytalk/Makefile index 7a3e65506a0..fe74ee89d98 100644 --- a/net/ytalk/Makefile +++ b/net/ytalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2017/10/09 08:53:56 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/03 11:45:59 rillig Exp $ DISTNAME= ytalk-3.3.0 PKGREVISION= 1 @@ -13,7 +13,7 @@ CONFLICTS+= ytalk-x11-[0-9]* GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/ytalk CONF_FILES= ${EGDIR}/ytalkrc ${PKG_SYSCONFDIR}/ytalkrc |