diff options
174 files changed, 744 insertions, 744 deletions
diff --git a/sysutils/9base/Makefile b/sysutils/9base/Makefile index d90c724e1a9..b0686ec369f 100644 --- a/sysutils/9base/Makefile +++ b/sysutils/9base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2017/09/07 07:52:43 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/04 21:28:40 rillig Exp $ DISTNAME= 9base-6 PKGREVISION= 2 @@ -25,10 +25,10 @@ PKG_SHELL= bin/rc BUILDLINK_TRANSFORM+= rm:-static .elif ${OPSYS} == "SunOS" BUILDLINK_TRANSFORM+= rm:-static -CFLAGS+= -DPLAN9PORT -LDFLAGS+= -lsocket -lnsl +CFLAGS+= -DPLAN9PORT +LDFLAGS+= -lsocket -lnsl .else -LDFLAGS+= -static +LDFLAGS+= -static .endif #XXX see http://gnats.netbsd.org/43228 diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common index eac411f038b..cf5c9c415b2 100644 --- a/sysutils/amanda-common/Makefile.common +++ b/sysutils/amanda-common/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.44 2018/11/25 20:20:57 spz Exp $ +# $NetBSD: Makefile.common,v 1.45 2019/11/04 21:28:40 rillig Exp $ # used by sysutils/amanda-common/Makefile # used by sysutils/amanda-client/Makefile @@ -56,7 +56,7 @@ SUBST_CLASSES+= bool SUBST_MESSAGE.bool= Fix SWIG messing with stdbool.h. SUBST_STAGE.bool= pre-configure SUBST_FILES.bool= perl/Amanda/*.c perl/Amanda/*/*.c -SUBST_SED.bool= -e '/undef bool/d' +SUBST_SED.bool= -e '/undef bool/d' GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q} @@ -106,10 +106,10 @@ build-perl: .endif .if defined(PERL5_MODS) && !empty(PERL5_MODS) -INSTALLATION_DIRS+= ${PERL5_MODS:H:@_t_@${PERL5_SUB_INSTALLVENDORLIB}/${_t_}@} +INSTALLATION_DIRS+= ${PERL5_MODS:H:@_t_@${PERL5_SUB_INSTALLVENDORLIB}/${_t_}@} .endif .if defined(PERL5_LIBS) && !empty(PERL5_LIBS) -INSTALLATION_DIRS+= ${PERL5_LIBS:@_t_@${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/${_t_}@} +INSTALLATION_DIRS+= ${PERL5_LIBS:@_t_@${PERL5_SUB_INSTALLVENDORLIB}/auto/Amanda/${_t_}@} .endif .PHONY: post-install-extra diff --git a/sysutils/amanda-common/options.mk b/sysutils/amanda-common/options.mk index c89ec70a50a..d4c626f2349 100644 --- a/sysutils/amanda-common/options.mk +++ b/sysutils/amanda-common/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.14 2018/11/23 22:33:13 spz Exp $ +# $NetBSD: options.mk,v 1.15 2019/11/04 21:28:40 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.amanda # Common options. @@ -32,17 +32,17 @@ CONFIGURE_ARGS+= --without-ipv6 .endif .if !empty(PKG_OPTIONS:Mamanda-bsdtar) -CONFIGURE_ARGS+= --with-bsdtar=/usr/bin/tar +CONFIGURE_ARGS+= --with-bsdtar=/usr/bin/tar .else -CONFIGURE_ARGS+= --without-bsdtar +CONFIGURE_ARGS+= --without-bsdtar .endif .if !empty(PKG_OPTIONS:Mamanda-fqdn) -CONFIGURE_ARGS+= --with-fqdn +CONFIGURE_ARGS+= --with-fqdn .endif .if !empty(PKG_OPTIONS:Mamanda-ssh) -CONFIGURE_ARGS+= --with-ssh-security +CONFIGURE_ARGS+= --with-ssh-security . if !exists(/usr/bin/ssh) DEPENDS+= openssh-[0-9]*:../../security/openssh diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile index 2f3b89b115e..871c4d2cd33 100644 --- a/sysutils/amanda-server/Makefile +++ b/sysutils/amanda-server/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.64 2019/08/11 13:23:03 wiz Exp $ +# $NetBSD: Makefile,v 1.65 2019/11/04 21:28:40 rillig Exp $ PKGNAME= amanda-server-${AMANDA_VERSION} PKGREVISION= 1 COMMENT= Server part of Amanda, a network backup system -DEPENDS+= mtx-[0-9]*:../../sysutils/mtx +DEPENDS+= mtx-[0-9]*:../../sysutils/mtx USE_TOOLS+= awk:run mail:run CONFIGURE_ENV+= MAILER=${TOOLS_PATH.mail} MTX=${PREFIX}/sbin/mtx diff --git a/sysutils/amlogic-meson-fwtools/Makefile b/sysutils/amlogic-meson-fwtools/Makefile index 511bf5fb1e3..4f41f081d7e 100644 --- a/sysutils/amlogic-meson-fwtools/Makefile +++ b/sysutils/amlogic-meson-fwtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/06/17 17:08:26 gdt Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/04 21:28:40 rillig Exp $ # Version isn't super-meaningful; we're grabbing a collection of non-changing # tools from a variety of locations. @@ -13,7 +13,7 @@ COMMENT= Trusted Firmware packaging tools for the Amlogic Meson family of SoCs LICENSE= amlogic-meson-fwtools-license -RESTRICTED= Redistribution not permitted - see licenses/amlogic-meson-fwtools +RESTRICTED= Redistribution not permitted - see licenses/amlogic-meson-fwtools NO_SRC_ON_FTP= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} @@ -32,7 +32,7 @@ NO_BUILD= yes # # Hardkernel-supplied firmware tools # -ODROID= odroidc2-v2015.01 +ODROID= odroidc2-v2015.01 xFIPCREATE= fip_create FIPCREATE= ${ODROID}-${xFIPCREATE} @@ -40,10 +40,10 @@ DISTFILES+= ${FIPCREATE} SITES.${FIPCREATE}= ${MASTER_SITE_GITHUB:@url@ \ -${url}hardkernel/u-boot/raw/${ODROID}/fip/${xFIPCREATE} @} -xAML_ENCRYPT_GXB= aml_encrypt_gxb -AML_ENCRYPT_GXB= ${ODROID}-${xAML_ENCRYPT_GXB} -DISTFILES+= ${AML_ENCRYPT_GXB} -SITES.${AML_ENCRYPT_GXB}=${MASTER_SITE_GITHUB:@url@ \ +xAML_ENCRYPT_GXB= aml_encrypt_gxb +AML_ENCRYPT_GXB= ${ODROID}-${xAML_ENCRYPT_GXB} +DISTFILES+= ${AML_ENCRYPT_GXB} +SITES.${AML_ENCRYPT_GXB}= ${MASTER_SITE_GITHUB:@url@ \ -${url}hardkernel/u-boot/raw/${ODROID}/fip/gxb/${xAML_ENCRYPT_GXB} @} # @@ -51,10 +51,10 @@ SITES.${AML_ENCRYPT_GXB}=${MASTER_SITE_GITHUB:@url@ \ # LIBRETECH= libretech-cc -xAML_ENCRYPT_GXL= aml_encrypt_gxl -AML_ENCRYPT_GXL= ${LIBRETECH}-${xAML_ENCRYPT_GXL} -DISTFILES+= ${AML_ENCRYPT_GXL} -SITES.${AML_ENCRYPT_GXL}=${MASTER_SITE_GITHUB:@url@ \ +xAML_ENCRYPT_GXL= aml_encrypt_gxl +AML_ENCRYPT_GXL= ${LIBRETECH}-${xAML_ENCRYPT_GXL} +DISTFILES+= ${AML_ENCRYPT_GXL} +SITES.${AML_ENCRYPT_GXL}= ${MASTER_SITE_GITHUB:@url@ \ -${url}BayLibre/u-boot/raw/${LIBRETECH}/fip/gxl/${xAML_ENCRYPT_GXL} @} INSTALLATION_DIRS+= bin diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index 1665bf16665..277e84bf871 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2019/10/12 21:06:48 rillig Exp $ +# $NetBSD: Makefile,v 1.88 2019/11/04 21:28:41 rillig Exp $ DISTNAME= apcupsd-3.14.13r2365 PKGREVISION= 4 @@ -58,16 +58,16 @@ CONFIGURE_ARGS.NetBSD+= ac_cv_path_SHUTDOWN=/sbin/shutdown EGDIR= ${PREFIX}/share/examples/apcupsd -CONF_FILES_PERMS+= ${EGDIR}/apcupsd.conf ${PKG_SYSCONFDIR}/apcupsd.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644 -CONF_FILES_PERMS+= ${EGDIR}/apcupsd.css ${PKG_SYSCONFDIR}/apcupsd.css ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644 -CONF_FILES_PERMS+= ${EGDIR}/changeme ${PKG_SYSCONFDIR}/changeme ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 -CONF_FILES_PERMS+= ${EGDIR}/commfailure ${PKG_SYSCONFDIR}/commfailure ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 -CONF_FILES_PERMS+= ${EGDIR}/commok ${PKG_SYSCONFDIR}/commok ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 -CONF_FILES_PERMS+= ${EGDIR}/multimon.conf ${PKG_SYSCONFDIR}/multimon.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 -CONF_FILES_PERMS+= ${EGDIR}/hosts.conf ${PKG_SYSCONFDIR}/hosts.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 -CONF_FILES_PERMS+= ${EGDIR}/offbattery ${PKG_SYSCONFDIR}/offbattery ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 -CONF_FILES_PERMS+= ${EGDIR}/onbattery ${PKG_SYSCONFDIR}/onbattery ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 -CONF_FILES_PERMS+= ${EGDIR}/apccontrol ${PKG_SYSCONFDIR}/apccontrol ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 +CONF_FILES_PERMS+= ${EGDIR}/apcupsd.conf ${PKG_SYSCONFDIR}/apcupsd.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644 +CONF_FILES_PERMS+= ${EGDIR}/apcupsd.css ${PKG_SYSCONFDIR}/apcupsd.css ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644 +CONF_FILES_PERMS+= ${EGDIR}/changeme ${PKG_SYSCONFDIR}/changeme ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 +CONF_FILES_PERMS+= ${EGDIR}/commfailure ${PKG_SYSCONFDIR}/commfailure ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 +CONF_FILES_PERMS+= ${EGDIR}/commok ${PKG_SYSCONFDIR}/commok ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 +CONF_FILES_PERMS+= ${EGDIR}/multimon.conf ${PKG_SYSCONFDIR}/multimon.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 +CONF_FILES_PERMS+= ${EGDIR}/hosts.conf ${PKG_SYSCONFDIR}/hosts.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 +CONF_FILES_PERMS+= ${EGDIR}/offbattery ${PKG_SYSCONFDIR}/offbattery ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 +CONF_FILES_PERMS+= ${EGDIR}/onbattery ${PKG_SYSCONFDIR}/onbattery ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 +CONF_FILES_PERMS+= ${EGDIR}/apccontrol ${PKG_SYSCONFDIR}/apccontrol ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755 RCD_SCRIPTS= apcupsd @@ -78,8 +78,8 @@ PLATFORM_SUBDIR.*= ${OPSYS:tl} RCD_SCRIPT_SRC.apcupsd= ${WRKSRC}/platforms/${PLATFORM_SUBDIR}/apcupsd -EGFILES= ${PLATFORM_SUBDIR}/apccontrol etc/changeme etc/commfailure etc/commok \ - etc/offbattery etc/onbattery etc/multimon.conf etc/hosts.conf +EGFILES= ${PLATFORM_SUBDIR}/apccontrol etc/changeme etc/commfailure etc/commok \ + etc/offbattery etc/onbattery etc/multimon.conf etc/hosts.conf INSTALLATION_DIRS= share/examples/apcupsd share/examples/rc.d \ share/doc/apcupsd share/doc/apcupsd/manual diff --git a/sysutils/arm-trusted-firmware-sun50i_a64/Makefile b/sysutils/arm-trusted-firmware-sun50i_a64/Makefile index 4d89c7f43c5..45bc09a68c7 100644 --- a/sysutils/arm-trusted-firmware-sun50i_a64/Makefile +++ b/sysutils/arm-trusted-firmware-sun50i_a64/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/02/27 06:23:39 martin Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/04 21:28:41 rillig Exp $ VERSION= 2.0.20190222 # v2.0 is too old GITHUB_PROJECT= arm-trusted-firmware @@ -36,6 +36,6 @@ do-install: # XXX kludge. pkgsrc passes down run path flags in LDFLAGS assuming # gcc is used for linking, but here we call the linker directly. -COMPILER_RPATH_FLAG=-R +COMPILER_RPATH_FLAG= -R .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile index 684576b908e..e04081320be 100644 --- a/sysutils/asapm/Makefile +++ b/sysutils/asapm/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.43 2017/01/19 18:52:25 agc Exp $ +# $NetBSD: Makefile,v 1.44 2019/11/04 21:28:41 rillig Exp $ # -DISTNAME= asapm-2.11 +DISTNAME= asapm-2.11 PKGREVISION= 4 -CATEGORIES= sysutils x11 -MASTER_SITES= http://www.tigr.net/afterstep/download/asapm/ -MASTER_SITES+= ftp://ftp.afterstep.org/apps/asapm/ +CATEGORIES= sysutils x11 +MASTER_SITES= http://www.tigr.net/afterstep/download/asapm/ +MASTER_SITES+= ftp://ftp.afterstep.org/apps/asapm/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.tigr.net/afterstep/view.php?applet=asapm/data diff --git a/sysutils/attr/Makefile b/sysutils/attr/Makefile index c000af5802b..20291e16f3a 100644 --- a/sysutils/attr/Makefile +++ b/sysutils/attr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/08/21 21:09:27 markd Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/04 21:28:41 rillig Exp $ ATTR_VERS= 2.4.47 PKGNAME= attr-${ATTR_VERS} @@ -12,12 +12,12 @@ HOMEPAGE= http://savannah.nongnu.org/projects/attr COMMENT= Commands for Manipulating Filesystem Extended Attributes LICENSE= gnu-gpl-v2 -WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -GNU_CONFIGURE= yes -USE_TOOLS+= gmake msgfmt -USE_LIBTOOL= yes -BUILD_TARGET= default -INSTALL_SH_OVERRIDE=no +WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} +GNU_CONFIGURE= yes +USE_TOOLS+= gmake msgfmt +USE_LIBTOOL= yes +BUILD_TARGET= default +INSTALL_SH_OVERRIDE= no LDFLAGS.Darwin+= -lintl LDFLAGS.NetBSD+= -lintl diff --git a/sysutils/backuppc/Makefile b/sysutils/backuppc/Makefile index b40adb24904..d558719235a 100644 --- a/sysutils/backuppc/Makefile +++ b/sysutils/backuppc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/08/11 13:23:03 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/04 21:28:41 rillig Exp $ DISTNAME= BackupPC-3.3.1 PKGNAME= ${DISTNAME:tl} @@ -88,7 +88,7 @@ SUBST_VARS.fix-paths+= PERL5 FILES_SUBST+= BACKUPPC_USER=${BACKUPPC_USER:Q} BACKUPPC_GROUP=${BACKUPPC_GROUP:Q} PKG_SYSCONFSUBDIR= BackupPC -PKG_SYSCONFDIR_PERMS= ${BACKUPPC_USER} ${BACKUPPC_GROUP} 0755 +PKG_SYSCONFDIR_PERMS= ${BACKUPPC_USER} ${BACKUPPC_GROUP} 0755 RCD_SCRIPTS= backuppc OWN_DIRS_PERMS+= ${VARBASE}/BackupPC ${BACKUPPC_USER} ${BACKUPPC_GROUP} 0750 diff --git a/sysutils/baloo/Makefile b/sysutils/baloo/Makefile index 7014bc544c7..228705e2419 100644 --- a/sysutils/baloo/Makefile +++ b/sysutils/baloo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/08/22 12:23:45 ryoon Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/04 21:28:41 rillig Exp $ DISTNAME= baloo-${_KDE_VERSION} PKGREVISION= 17 @@ -14,9 +14,9 @@ USE_TOOLS+= gmake .include "../../mk/bsd.prefs.mk" -PLIST_VARS+= polkit +PLIST_VARS+= polkit .if ${OPSYS} != "Darwin" -PLIST.polkit= yes +PLIST.polkit= yes INSTALLATION_DIRS+= share/PolicyKit/policy .endif INSTALLATION_DIRS+= share/dbus-1/interfaces share/dbus-1/system-services diff --git a/sysutils/bkpupsd/Makefile b/sysutils/bkpupsd/Makefile index fcde3fd7ef4..bd4050f1ffa 100644 --- a/sysutils/bkpupsd/Makefile +++ b/sysutils/bkpupsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2017/09/10 14:13:15 joerg Exp $ +# $NetBSD: Makefile,v 1.36 2019/11/04 21:28:41 rillig Exp $ # DISTNAME= bkpupsd-2.2.1 @@ -19,7 +19,7 @@ INSTALLATION_DIRS= libexec/bkpupsd sbin ${PKGMANDIR}/cat5 \ share/doc/bkpupsd share/examples/bkpupsd # Original program assumes BSD code base. -ONLY_FOR_PLATFORM= NetBSD-*-* +ONLY_FOR_PLATFORM= NetBSD-*-* .include "../../mk/bsd.prefs.mk" @@ -32,7 +32,7 @@ MESSAGE_SUBST+= DOCDIR=${DOCDIR} EGDIR= ${PREFIX}/share/examples/bkpupsd CONF_FILES= ${EGDIR}/upstab ${PKG_SYSCONFDIR}/upstab -RCD_SCRIPTS= bkpupsd +RCD_SCRIPTS= bkpupsd RCD_SCRIPT_SRC.bkpupsd= # need to avoid automatic handling pre-install: diff --git a/sysutils/boxbackup-client/Makefile b/sysutils/boxbackup-client/Makefile index 966a9115d45..821445707e7 100644 --- a/sysutils/boxbackup-client/Makefile +++ b/sysutils/boxbackup-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2019/08/11 13:23:03 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/04 21:28:41 rillig Exp $ # DISTNAME= boxbackup-0.11.1 @@ -21,13 +21,13 @@ USE_TOOLS+= perl:run gmake REPLACE_PERL+= bin/bbackupd/bbackupd-config INSTALLATION_DIRS+= bin -#INSTALL_TARGET= install-backup-client +#INSTALL_TARGET= install-backup-client .include "../../mk/bsd.prefs.mk" # for backtrace .if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h) -LIBS+= -lexecinfo +LIBS+= -lexecinfo .endif do-install: diff --git a/sysutils/boxbackup-server/Makefile b/sysutils/boxbackup-server/Makefile index 5367267f315..c3c72e69a36 100644 --- a/sysutils/boxbackup-server/Makefile +++ b/sysutils/boxbackup-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2019/08/11 13:23:03 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/04 21:28:41 rillig Exp $ # DISTNAME= boxbackup-0.11.1 @@ -30,7 +30,7 @@ INSTALLATION_DIRS+= bin # for backtrace .if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h) -LIBS+= -lexecinfo +LIBS+= -lexecinfo .endif do-install: diff --git a/sysutils/bup/Makefile b/sysutils/bup/Makefile index 96683ed2b4f..5872b30ea0e 100644 --- a/sysutils/bup/Makefile +++ b/sysutils/bup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2019/09/12 00:28:47 gdt Exp $ +# $NetBSD: Makefile,v 1.37 2019/11/04 21:28:42 rillig Exp $ DISTNAME= bup-0.29.3 CATEGORIES= sysutils @@ -28,7 +28,7 @@ DEPENDS+= git-base-[0-9]*:../../devel/git-base # TEST_DEPENDS BUILD_DEPENDS+= rsync-[0-9]*:../../net/rsync -PYTHON_VERSIONS_ACCEPTED= 27 # py-fuse-bindings +PYTHON_VERSIONS_ACCEPTED= 27 # py-fuse-bindings DOCDIR= ${WRKDIR}/bup-man diff --git a/sysutils/burn/Makefile b/sysutils/burn/Makefile index b116655150c..2093c358cdd 100644 --- a/sysutils/burn/Makefile +++ b/sysutils/burn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2019/04/03 00:33:06 ryoon Exp $ +# $NetBSD: Makefile,v 1.39 2019/11/04 21:28:42 rillig Exp $ # DISTNAME= burn-0.4.1 @@ -24,7 +24,7 @@ MAKE_JOBS_SAFE= no MAKE_ENV+= ADDITIONAL_CPPFLAGS=-D_POSIX_SOURCE MAKE_ENV+= ADDITIONAL_LDFLAGS=-lutil -FIX_GNUSTEP_INSTALLATION_DIR= yes +FIX_GNUSTEP_INSTALLATION_DIR= yes SUBST_FILES.gnustep_installation_dir+= Bundles/CDparanoia/GNUmakefile SUBST_FILES.gnustep_installation_dir+= Bundles/CDrecord/GNUmakefile SUBST_FILES.gnustep_installation_dir+= Bundles/MkIsoFs/GNUmakefile diff --git a/sysutils/burp/Makefile b/sysutils/burp/Makefile index ded26214b34..ebf918afec2 100644 --- a/sysutils/burp/Makefile +++ b/sysutils/burp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2016/09/01 16:18:07 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/04 21:28:42 rillig Exp $ DISTNAME= burp-1.4.40 PKGREVISION= 2 @@ -25,9 +25,9 @@ SUBST_FILES.dirs= configs/server/burp.conf \ configs/CA/CA.cnf \ configs/CA/burp_ca \ manpages/*.8 -SUBST_SED.dirs= -e 's,@LIBEXECDIR@,${PREFIX}/libexec/burp,' \ - -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},' \ - -e 's,@SBINDIR@,${PREFIX}/sbin,' +SUBST_SED.dirs= -e 's,@LIBEXECDIR@,${PREFIX}/libexec/burp,' \ + -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},' \ + -e 's,@SBINDIR@,${PREFIX}/sbin,' REPLACE_SH+= configs/certs/CA/burp_ca \ configs/server/notify_script \ diff --git a/sysutils/caja-dropbox/Makefile b/sysutils/caja-dropbox/Makefile index 3ef4bc446e3..a3b4c45b290 100644 --- a/sysutils/caja-dropbox/Makefile +++ b/sysutils/caja-dropbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2019/07/21 22:25:41 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/04 21:28:42 rillig Exp $ # Makefile.common already includes python .mk files, so need to set this here PYTHON_VERSIONS_INCOMPATIBLE= 27 @@ -14,7 +14,7 @@ COMMENT= Dropbox Caja extension DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils -CONFIGURE_ARGS+= ac_cv_path_PYTHON3=${PYTHONBIN} +CONFIGURE_ARGS+= ac_cv_path_PYTHON3=${PYTHONBIN} REPLACE_PYTHON= caja-dropbox.in rst2man.py diff --git a/sysutils/ccze/Makefile b/sysutils/ccze/Makefile index 6fc6112f7d4..40cdafbb1b0 100644 --- a/sysutils/ccze/Makefile +++ b/sysutils/ccze/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2015/09/08 11:57:50 jperkin Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/04 21:28:42 rillig Exp $ DISTNAME= ccze-0.2.1 PKGREVISION= 4 @@ -9,8 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://bonehunter.rulez.org/software/ccze/ COMMENT= Log coloriser, fast and light on resources -GNU_CONFIGURE= yes -USE_TOOLS+= gmake +GNU_CONFIGURE= yes +USE_TOOLS+= gmake BUILDLINK_TRANSFORM+= rm:-Wmulticharacter LDFLAGS.SunOS+= -lsocket -lnsl diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile index ed7b769e402..5a63f323ad5 100644 --- a/sysutils/cdrdao/Makefile +++ b/sysutils/cdrdao/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2018/11/15 01:13:01 markd Exp $ +# $NetBSD: Makefile,v 1.38 2019/11/04 21:28:42 rillig Exp $ .include "../../sysutils/cdrdao/Makefile.common" @@ -17,22 +17,22 @@ INSTALLATION_DIRS+= share/doc/cdrdao/testtocs \ share/examples/cdrdao/psxcopy post-install: - ${INSTALL_MAN} ${WRKSRC}/README \ - ${WRKSRC}/README.PlexDAE \ - ${DESTDIR}${PREFIX}/share/doc/cdrdao - ${INSTALL_MAN} ${WRKSRC}/testtocs/*.toc \ - ${DESTDIR}${PREFIX}/share/doc/cdrdao/testtocs - ${INSTALL_MAN} ${WRKSRC}/contrib/mp32dao/mp32dao.pl \ - ${DESTDIR}${PREFIX}/share/examples/cdrdao - ${INSTALL_MAN} ${WRKSRC}/contrib/psxcopy-0.2/Makefile \ - ${WRKSRC}/contrib/psxcopy-0.2/README \ - ${WRKSRC}/contrib/psxcopy-0.2/cdjob.c \ - ${WRKSRC}/contrib/psxcopy-0.2/psxdump.c \ - ${WRKSRC}/contrib/psxcopy-0.2/read-psx \ - ${WRKSRC}/contrib/psxcopy-0.2/write-psx \ - ${DESTDIR}${PREFIX}/share/examples/cdrdao/psxcopy - ${INSTALL_MAN} ${WRKSRC}/contrib/wav2dao/wav2dao.pl \ - ${DESTDIR}${PREFIX}/share/examples/cdrdao + ${INSTALL_MAN} ${WRKSRC}/README \ + ${WRKSRC}/README.PlexDAE \ + ${DESTDIR}${PREFIX}/share/doc/cdrdao + ${INSTALL_MAN} ${WRKSRC}/testtocs/*.toc \ + ${DESTDIR}${PREFIX}/share/doc/cdrdao/testtocs + ${INSTALL_MAN} ${WRKSRC}/contrib/mp32dao/mp32dao.pl \ + ${DESTDIR}${PREFIX}/share/examples/cdrdao + ${INSTALL_MAN} ${WRKSRC}/contrib/psxcopy-0.2/Makefile \ + ${WRKSRC}/contrib/psxcopy-0.2/README \ + ${WRKSRC}/contrib/psxcopy-0.2/cdjob.c \ + ${WRKSRC}/contrib/psxcopy-0.2/psxdump.c \ + ${WRKSRC}/contrib/psxcopy-0.2/read-psx \ + ${WRKSRC}/contrib/psxcopy-0.2/write-psx \ + ${DESTDIR}${PREFIX}/share/examples/cdrdao/psxcopy + ${INSTALL_MAN} ${WRKSRC}/contrib/wav2dao/wav2dao.pl \ + ${DESTDIR}${PREFIX}/share/examples/cdrdao .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile index 620fb02e1a5..5b22ba9d3fe 100644 --- a/sysutils/cdrtools/Makefile +++ b/sysutils/cdrtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.118 2018/08/28 11:32:33 tnn Exp $ +# $NetBSD: Makefile,v 1.119 2019/11/04 21:28:42 rillig Exp $ DISTNAME= cdrtools-3.01 PKGNAME= ${DISTNAME:S/a/alpha/:S/-pre/pre/} @@ -22,7 +22,7 @@ MAKE_JOBS_SAFE= no # makefiles.5 USE_TOOLS+= gm4 gmake tbl -CFLAGS.NetBSD+= -DUSE_GETRAWPARTITION +CFLAGS.NetBSD+= -DUSE_GETRAWPARTITION LDFLAGS.NetBSD+= -lutil LDFLAGS+= ${BUILDLINK_LDADD.iconv} @@ -97,7 +97,7 @@ SUBST_MESSAGE.oss= Fixing OSS sound device path. SUBST_CLASSES+= ins_base SUBST_STAGE.ins_base= pre-configure SUBST_FILES.ins_base= DEFAULTS/Defaults.* -SUBST_SED.ins_base= -e "/^INS_BASE=/d" +SUBST_SED.ins_base= -e "/^INS_BASE=/d" SUBST_MESSAGE.ins_base= Fixing INS_BASE. do-configure: diff --git a/sysutils/cfengine3/Makefile.cf b/sysutils/cfengine3/Makefile.cf index b38533ddf3a..9ec3c5d4197 100644 --- a/sysutils/cfengine3/Makefile.cf +++ b/sysutils/cfengine3/Makefile.cf @@ -1,131 +1,131 @@ -# $NetBSD: Makefile.cf,v 1.2 2015/12/08 17:15:21 fhajny Exp $ +# $NetBSD: Makefile.cf,v 1.3 2019/11/04 21:28:42 rillig Exp $ # Generated by "make update-masterfiles", post-configure -CFILES+=cfe_internal/CFE_cfengine.cf -CFILES+=cfe_internal/core/deprecated/cfengine_processes.cf -CFILES+=cfe_internal/core/host_info_report.cf -CFILES+=cfe_internal/core/limit_robot_agents.cf -CFILES+=cfe_internal/core/log_rotation.cf -CFILES+=cfe_internal/core/main.cf -CFILES+=cfe_internal/enterprise/CFE_hub_specific.cf -CFILES+=cfe_internal/enterprise/CFE_knowledge.cf -CFILES+=cfe_internal/enterprise/file_change.cf -CFILES+=cfe_internal/enterprise/ha/ha.cf -CFILES+=cfe_internal/enterprise/ha/ha_def.cf -CFILES+=cfe_internal/enterprise/ha/ha_update.cf -CFILES+=cfe_internal/enterprise/main.cf -CFILES+=cfe_internal/update/cfe_internal_dc_workflow.cf -CFILES+=cfe_internal/update/cfe_internal_local_git_remote.cf -CFILES+=cfe_internal/update/cfe_internal_update_from_repository.cf -CFILES+=cfe_internal/update/update_bins.cf -CFILES+=cfe_internal/update/update_policy.cf -CFILES+=cfe_internal/update/update_processes.cf -CFILES+=controls/3.5/cf_agent.cf -CFILES+=controls/3.5/cf_execd.cf -CFILES+=controls/3.5/cf_hub.cf -CFILES+=controls/3.5/cf_monitord.cf -CFILES+=controls/3.5/cf_runagent.cf -CFILES+=controls/3.5/cf_serverd.cf -CFILES+=controls/3.5/def.cf -CFILES+=controls/3.5/def_inputs.cf -CFILES+=controls/3.5/reports.cf -CFILES+=controls/3.5/update_def.cf -CFILES+=controls/3.5/update_def_inputs.cf -CFILES+=controls/3.6/cf_agent.cf -CFILES+=controls/3.6/cf_execd.cf -CFILES+=controls/3.6/cf_hub.cf -CFILES+=controls/3.6/cf_monitord.cf -CFILES+=controls/3.6/cf_runagent.cf -CFILES+=controls/3.6/cf_serverd.cf -CFILES+=controls/3.6/def.cf -CFILES+=controls/3.6/def_inputs.cf -CFILES+=controls/3.6/reports.cf -CFILES+=controls/3.6/update_def.cf -CFILES+=controls/3.6/update_def_inputs.cf -CFILES+=controls/3.7/cf_agent.cf -CFILES+=controls/3.7/cf_execd.cf -CFILES+=controls/3.7/cf_hub.cf -CFILES+=controls/3.7/cf_monitord.cf -CFILES+=controls/3.7/cf_runagent.cf -CFILES+=controls/3.7/cf_serverd.cf -CFILES+=controls/3.7/def.cf -CFILES+=controls/3.7/def_inputs.cf -CFILES+=controls/3.7/reports.cf -CFILES+=controls/3.7/update_def.cf -CFILES+=controls/3.7/update_def_inputs.cf -CFILES+=inventory/any.cf -CFILES+=inventory/debian.cf -CFILES+=inventory/freebsd.cf -CFILES+=inventory/generic.cf -CFILES+=inventory/linux.cf -CFILES+=inventory/lsb.cf -CFILES+=inventory/macos.cf -CFILES+=inventory/os.cf -CFILES+=inventory/redhat.cf -CFILES+=inventory/suse.cf -CFILES+=inventory/windows.cf -CFILES+=lib/3.5/bundles.cf -CFILES+=lib/3.5/cfe_internal.cf -CFILES+=lib/3.5/commands.cf -CFILES+=lib/3.5/common.cf -CFILES+=lib/3.5/databases.cf -CFILES+=lib/3.5/feature.cf -CFILES+=lib/3.5/files.cf -CFILES+=lib/3.5/guest_environments.cf -CFILES+=lib/3.5/monitor.cf -CFILES+=lib/3.5/packages.cf -CFILES+=lib/3.5/paths.cf -CFILES+=lib/3.5/processes.cf -CFILES+=lib/3.5/services.cf -CFILES+=lib/3.5/storage.cf -CFILES+=lib/3.6/autorun.cf -CFILES+=lib/3.6/bundles.cf -CFILES+=lib/3.6/cfe_internal.cf -CFILES+=lib/3.6/cfe_internal_hub.cf -CFILES+=lib/3.6/cfengine_enterprise_hub_ha.cf -CFILES+=lib/3.6/commands.cf -CFILES+=lib/3.6/common.cf -CFILES+=lib/3.6/databases.cf -CFILES+=lib/3.6/edit_xml.cf -CFILES+=lib/3.6/examples.cf -CFILES+=lib/3.6/feature.cf -CFILES+=lib/3.6/files.cf -CFILES+=lib/3.6/guest_environments.cf -CFILES+=lib/3.6/monitor.cf -CFILES+=lib/3.6/packages.cf -CFILES+=lib/3.6/paths.cf -CFILES+=lib/3.6/processes.cf -CFILES+=lib/3.6/services.cf -CFILES+=lib/3.6/stdlib.cf -CFILES+=lib/3.6/storage.cf -CFILES+=lib/3.6/users.cf -CFILES+=lib/3.6/vcs.cf -CFILES+=lib/3.7/autorun.cf -CFILES+=lib/3.7/bundles.cf -CFILES+=lib/3.7/cfe_internal.cf -CFILES+=lib/3.7/cfe_internal_hub.cf -CFILES+=lib/3.7/cfengine_enterprise_hub_ha.cf -CFILES+=lib/3.7/commands.cf -CFILES+=lib/3.7/common.cf -CFILES+=lib/3.7/databases.cf -CFILES+=lib/3.7/edit_xml.cf -CFILES+=lib/3.7/examples.cf -CFILES+=lib/3.7/feature.cf -CFILES+=lib/3.7/files.cf -CFILES+=lib/3.7/guest_environments.cf -CFILES+=lib/3.7/monitor.cf -CFILES+=lib/3.7/packages.cf -CFILES+=lib/3.7/paths.cf -CFILES+=lib/3.7/processes.cf -CFILES+=lib/3.7/services.cf -CFILES+=lib/3.7/stdlib.cf -CFILES+=lib/3.7/storage.cf -CFILES+=lib/3.7/users.cf -CFILES+=lib/3.7/vcs.cf -CFILES+=modules/packages/apt_get -CFILES+=modules/packages/pkgsrc -CFILES+=modules/packages/yum -CFILES+=services/autorun/hello.cf -CFILES+=services/main.cf -CFILES+=sketches/meta/api-runfile.cf -CFILES+=templates/host_info_report.mustache +CFILES+= cfe_internal/CFE_cfengine.cf +CFILES+= cfe_internal/core/deprecated/cfengine_processes.cf +CFILES+= cfe_internal/core/host_info_report.cf +CFILES+= cfe_internal/core/limit_robot_agents.cf +CFILES+= cfe_internal/core/log_rotation.cf +CFILES+= cfe_internal/core/main.cf +CFILES+= cfe_internal/enterprise/CFE_hub_specific.cf +CFILES+= cfe_internal/enterprise/CFE_knowledge.cf +CFILES+= cfe_internal/enterprise/file_change.cf +CFILES+= cfe_internal/enterprise/ha/ha.cf +CFILES+= cfe_internal/enterprise/ha/ha_def.cf +CFILES+= cfe_internal/enterprise/ha/ha_update.cf +CFILES+= cfe_internal/enterprise/main.cf +CFILES+= cfe_internal/update/cfe_internal_dc_workflow.cf +CFILES+= cfe_internal/update/cfe_internal_local_git_remote.cf +CFILES+= cfe_internal/update/cfe_internal_update_from_repository.cf +CFILES+= cfe_internal/update/update_bins.cf +CFILES+= cfe_internal/update/update_policy.cf +CFILES+= cfe_internal/update/update_processes.cf +CFILES+= controls/3.5/cf_agent.cf +CFILES+= controls/3.5/cf_execd.cf +CFILES+= controls/3.5/cf_hub.cf +CFILES+= controls/3.5/cf_monitord.cf +CFILES+= controls/3.5/cf_runagent.cf +CFILES+= controls/3.5/cf_serverd.cf +CFILES+= controls/3.5/def.cf +CFILES+= controls/3.5/def_inputs.cf +CFILES+= controls/3.5/reports.cf +CFILES+= controls/3.5/update_def.cf +CFILES+= controls/3.5/update_def_inputs.cf +CFILES+= controls/3.6/cf_agent.cf +CFILES+= controls/3.6/cf_execd.cf +CFILES+= controls/3.6/cf_hub.cf +CFILES+= controls/3.6/cf_monitord.cf +CFILES+= controls/3.6/cf_runagent.cf +CFILES+= controls/3.6/cf_serverd.cf +CFILES+= controls/3.6/def.cf +CFILES+= controls/3.6/def_inputs.cf +CFILES+= controls/3.6/reports.cf +CFILES+= controls/3.6/update_def.cf +CFILES+= controls/3.6/update_def_inputs.cf +CFILES+= controls/3.7/cf_agent.cf +CFILES+= controls/3.7/cf_execd.cf +CFILES+= controls/3.7/cf_hub.cf +CFILES+= controls/3.7/cf_monitord.cf +CFILES+= controls/3.7/cf_runagent.cf +CFILES+= controls/3.7/cf_serverd.cf +CFILES+= controls/3.7/def.cf +CFILES+= controls/3.7/def_inputs.cf +CFILES+= controls/3.7/reports.cf +CFILES+= controls/3.7/update_def.cf +CFILES+= controls/3.7/update_def_inputs.cf +CFILES+= inventory/any.cf +CFILES+= inventory/debian.cf +CFILES+= inventory/freebsd.cf +CFILES+= inventory/generic.cf +CFILES+= inventory/linux.cf +CFILES+= inventory/lsb.cf +CFILES+= inventory/macos.cf +CFILES+= inventory/os.cf +CFILES+= inventory/redhat.cf +CFILES+= inventory/suse.cf +CFILES+= inventory/windows.cf +CFILES+= lib/3.5/bundles.cf +CFILES+= lib/3.5/cfe_internal.cf +CFILES+= lib/3.5/commands.cf +CFILES+= lib/3.5/common.cf +CFILES+= lib/3.5/databases.cf +CFILES+= lib/3.5/feature.cf +CFILES+= lib/3.5/files.cf +CFILES+= lib/3.5/guest_environments.cf +CFILES+= lib/3.5/monitor.cf +CFILES+= lib/3.5/packages.cf +CFILES+= lib/3.5/paths.cf +CFILES+= lib/3.5/processes.cf +CFILES+= lib/3.5/services.cf +CFILES+= lib/3.5/storage.cf +CFILES+= lib/3.6/autorun.cf +CFILES+= lib/3.6/bundles.cf +CFILES+= lib/3.6/cfe_internal.cf +CFILES+= lib/3.6/cfe_internal_hub.cf +CFILES+= lib/3.6/cfengine_enterprise_hub_ha.cf +CFILES+= lib/3.6/commands.cf +CFILES+= lib/3.6/common.cf +CFILES+= lib/3.6/databases.cf +CFILES+= lib/3.6/edit_xml.cf +CFILES+= lib/3.6/examples.cf +CFILES+= lib/3.6/feature.cf +CFILES+= lib/3.6/files.cf +CFILES+= lib/3.6/guest_environments.cf +CFILES+= lib/3.6/monitor.cf +CFILES+= lib/3.6/packages.cf +CFILES+= lib/3.6/paths.cf +CFILES+= lib/3.6/processes.cf +CFILES+= lib/3.6/services.cf +CFILES+= lib/3.6/stdlib.cf +CFILES+= lib/3.6/storage.cf +CFILES+= lib/3.6/users.cf +CFILES+= lib/3.6/vcs.cf +CFILES+= lib/3.7/autorun.cf +CFILES+= lib/3.7/bundles.cf +CFILES+= lib/3.7/cfe_internal.cf +CFILES+= lib/3.7/cfe_internal_hub.cf +CFILES+= lib/3.7/cfengine_enterprise_hub_ha.cf +CFILES+= lib/3.7/commands.cf +CFILES+= lib/3.7/common.cf +CFILES+= lib/3.7/databases.cf +CFILES+= lib/3.7/edit_xml.cf +CFILES+= lib/3.7/examples.cf +CFILES+= lib/3.7/feature.cf +CFILES+= lib/3.7/files.cf +CFILES+= lib/3.7/guest_environments.cf +CFILES+= lib/3.7/monitor.cf +CFILES+= lib/3.7/packages.cf +CFILES+= lib/3.7/paths.cf +CFILES+= lib/3.7/processes.cf +CFILES+= lib/3.7/services.cf +CFILES+= lib/3.7/stdlib.cf +CFILES+= lib/3.7/storage.cf +CFILES+= lib/3.7/users.cf +CFILES+= lib/3.7/vcs.cf +CFILES+= modules/packages/apt_get +CFILES+= modules/packages/pkgsrc +CFILES+= modules/packages/yum +CFILES+= services/autorun/hello.cf +CFILES+= services/main.cf +CFILES+= sketches/meta/api-runfile.cf +CFILES+= templates/host_info_report.mustache diff --git a/sysutils/cfengine3/options.mk b/sysutils/cfengine3/options.mk index 7fb15863bf6..f60da37207f 100644 --- a/sysutils/cfengine3/options.mk +++ b/sysutils/cfengine3/options.mk @@ -1,11 +1,11 @@ -# $NetBSD: options.mk,v 1.2 2015/04/07 08:43:35 fhajny Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/04 21:28:42 rillig Exp $ # -PKG_OPTIONS_VAR= PKG_OPTIONS.cfengine3 +PKG_OPTIONS_VAR= PKG_OPTIONS.cfengine3 PKG_OPTIONS_REQUIRED_GROUPS= db -PKG_OPTIONS_GROUP.db= qdbm tokyocabinet lmdb -PKG_SUPPORTED_OPTIONS= qdbm tokyocabinet mysql pgsql -PKG_SUGGESTED_OPTIONS= tokyocabinet +PKG_OPTIONS_GROUP.db= qdbm tokyocabinet lmdb +PKG_SUPPORTED_OPTIONS= qdbm tokyocabinet mysql pgsql +PKG_SUGGESTED_OPTIONS= tokyocabinet .include "../../mk/bsd.options.mk" diff --git a/sysutils/coreutils/Makefile.common b/sysutils/coreutils/Makefile.common index 1732191acf3..4c312ff420a 100644 --- a/sysutils/coreutils/Makefile.common +++ b/sysutils/coreutils/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2019/05/02 15:31:16 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.20 2019/11/04 21:28:43 rillig Exp $ # # used by sysutils/coreutils/Makefile # used by misc/gnuls/Makefile @@ -38,7 +38,7 @@ CONFIGURE_ENV+= FORCE_UNSAFE_CONFIGURE=yes CONFIGURE_ENV.Interix+= ac_list_mounted_fs=found -CONFIGURE_ENV.DragonFly+= gl_cv_search_pthread_join=-lpthread +CONFIGURE_ENV.DragonFly+= gl_cv_search_pthread_join=-lpthread # Various tests rely on GCC's -O2 behaviour (e.g. -D__NO_INLINE__) and # without it we run into undefined symbol issues. @@ -76,7 +76,7 @@ CONFIGURE_ARGS+= --program-prefix=g #CONFIGURE_ARGS+= --enable-install-program=su #.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \ # ${OPSYS} == "OpenBSD" -#MAKE_FLAGS+= setuid_root_mode=a=rx -#MESSAGE_SRC= ${.CURDIR}/MESSAGE.gsu +#MAKE_FLAGS+= setuid_root_mode=a=rx +#MESSAGE_SRC= ${.CURDIR}/MESSAGE.gsu #MESSAGE_SUBST+= OPSYS=${OPSYS:Q} #.endif diff --git a/sysutils/cpuburn/Makefile b/sysutils/cpuburn/Makefile index f442f20c3af..4167b3c9e1c 100644 --- a/sysutils/cpuburn/Makefile +++ b/sysutils/cpuburn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2017/08/01 16:47:44 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/04 21:28:43 rillig Exp $ # DISTNAME= cpuburn_1_4 @@ -12,7 +12,7 @@ MAINTAINER= abs@NetBSD.org #HOMEPAGE= http://pages.sbcglobal.net/redelm/ COMMENT= CPU load testing utilities for Pentium pro and later -ONLY_FOR_PLATFORM= *-*-i[3456]86 +ONLY_FOR_PLATFORM= *-*-i[3456]86 WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} diff --git a/sysutils/crashme/Makefile b/sysutils/crashme/Makefile index 10c9107b1ae..4ea97bc6c45 100644 --- a/sysutils/crashme/Makefile +++ b/sysutils/crashme/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2017/09/25 12:47:44 gson Exp $ +# $NetBSD: Makefile,v 1.25 2019/11/04 21:28:43 rillig Exp $ # -DISTNAME= crashme-2.4 -CATEGORIES= sysutils +DISTNAME= crashme-2.4 +CATEGORIES= sysutils MASTER_SITES= http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/crashme/ # ftp://ftp.std.com/pub/gjc/ diff --git a/sysutils/daemontools/options.mk b/sysutils/daemontools/options.mk index 5a08baf755a..b1f99bb1902 100644 --- a/sysutils/daemontools/options.mk +++ b/sysutils/daemontools/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2017/10/03 00:21:44 schmonz Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/04 21:28:43 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.daemontools PKG_SUPPORTED_OPTIONS+= daemontools-moresignals @@ -7,8 +7,8 @@ PKG_SUGGESTED_OPTIONS+= daemontools-moresignals .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdaemontools-moresignals) -MORESIGNALS_PATCH= daemontools-0.76.sigq12.patch -PATCHFILES+= ${MORESIGNALS_PATCH} -SITES.${MORESIGNALS_PATCH}= http://thedjbway.b0llix.net/patches/ +MORESIGNALS_PATCH= daemontools-0.76.sigq12.patch +PATCHFILES+= ${MORESIGNALS_PATCH} +SITES.${MORESIGNALS_PATCH}= http://thedjbway.b0llix.net/patches/ PATCH_DIST_STRIP.${MORESIGNALS_PATCH}= -p1 .endif diff --git a/sysutils/dbus-python-common/Makefile b/sysutils/dbus-python-common/Makefile index e53e81d56dc..8f1b4593c5c 100644 --- a/sysutils/dbus-python-common/Makefile +++ b/sysutils/dbus-python-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2019/04/26 13:14:14 maya Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/04 21:28:43 rillig Exp $ DISTNAME= dbus-python-1.2.8 PKGNAME= ${DISTNAME:S/python/python-common/} @@ -13,14 +13,14 @@ LICENSE= mit CONFLICTS+= py[0-9]*-dbus<1.1.1 -PYTHON_FOR_BUILD_ONLY= yes -#BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0:../../textproc/py-docutils -#DEPENDS+= ${PYPKGPREFIX}-pyrex>=0.9.3:../../lang/py-pyrex -#PYTHON_VERSIONS_INCOMPATIBLE= 36 # py-pyrex +PYTHON_FOR_BUILD_ONLY= yes +#BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0:../../textproc/py-docutils +#DEPENDS+= ${PYPKGPREFIX}-pyrex>=0.9.3:../../lang/py-pyrex +#PYTHON_VERSIONS_INCOMPATIBLE= 36 # py-pyrex -USE_TOOLS+= pkg-config gmake -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --disable-html-docs --disable-api-docs +USE_TOOLS+= pkg-config gmake +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --disable-html-docs --disable-api-docs BUILDLINK_TRANSFORM.SunOS+= rm:-std=c9x diff --git a/sysutils/dbus-sharp-glib/Makefile b/sysutils/dbus-sharp-glib/Makefile index 6e662a02d23..adc1f63c42f 100644 --- a/sysutils/dbus-sharp-glib/Makefile +++ b/sysutils/dbus-sharp-glib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2019/04/03 00:33:06 ryoon Exp $ +# $NetBSD: Makefile,v 1.20 2019/11/04 21:28:43 rillig Exp $ # DISTNAME= dbus-sharp-glib-0.5.0 @@ -17,11 +17,11 @@ USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE+= dbus-sharp-glib-1.0.pc.in -SUBST_CLASSES+= fix-mcs -SUBST_STAGE.fix-mcs= pre-configure -SUBST_MESSAGE.fix-mcs= Fix compiler name -SUBST_FILES.fix-mcs= configure -SUBST_SED.fix-mcs= -e 's,gmcs,mcs,' +SUBST_CLASSES+= fix-mcs +SUBST_STAGE.fix-mcs= pre-configure +SUBST_MESSAGE.fix-mcs= Fix compiler name +SUBST_FILES.fix-mcs= configure +SUBST_SED.fix-mcs= -e 's,gmcs,mcs,' .include "../../sysutils/dbus-sharp/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/dbus-sharp/Makefile b/sysutils/dbus-sharp/Makefile index 84852144ee1..55e8bafe039 100644 --- a/sysutils/dbus-sharp/Makefile +++ b/sysutils/dbus-sharp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2019/04/03 00:33:06 ryoon Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/04 21:28:43 rillig Exp $ # DISTNAME= dbus-sharp-0.7.0 @@ -17,11 +17,11 @@ USE_LANGUAGES= # none PKGCONFIG_OVERRIDE+= dbus-sharp-1.0.pc.in -SUBST_CLASSES+= fix-mcs -SUBST_STAGE.fix-mcs= pre-configure -SUBST_MESSAGE.fix-mcs= Fix compiler name -SUBST_FILES.fix-mcs= configure -SUBST_SED.fix-mcs= -e 's,gmcs,mcs,' +SUBST_CLASSES+= fix-mcs +SUBST_STAGE.fix-mcs= pre-configure +SUBST_MESSAGE.fix-mcs= Fix compiler name +SUBST_FILES.fix-mcs= configure +SUBST_SED.fix-mcs= -e 's,gmcs,mcs,' .include "../../lang/mono/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile index cd6020599a6..7e78d5539ec 100644 --- a/sysutils/dbus/Makefile +++ b/sysutils/dbus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.118 2019/06/11 20:04:23 wiz Exp $ +# $NetBSD: Makefile,v 1.119 2019/11/04 21:28:43 rillig Exp $ DISTNAME= dbus-1.12.16 CATEGORIES= sysutils @@ -68,7 +68,7 @@ PLIST.linux= yes CONFIGURE_ARGS+= --disable-selinux .endif -PLIST_VARS+= linux +PLIST_VARS+= linux DBUS_CONF_DIR= ${PKG_SYSCONFBASE}/dbus-1 OWN_DIRS+= ${DBUS_CONF_DIR}/services diff --git a/sysutils/dbus/options.mk b/sysutils/dbus/options.mk index f83d9d3ac96..b5c84e47f7c 100644 --- a/sysutils/dbus/options.mk +++ b/sysutils/dbus/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.12 2018/08/16 08:57:09 wiz Exp $ +# $NetBSD: options.mk,v 1.13 2019/11/04 21:28:43 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.dbus PKG_SUPPORTED_OPTIONS+= debug x11 @@ -13,7 +13,7 @@ PKG_SUPPORTED_OPTIONS+= kqueue PKG_SUGGESTED_OPTIONS+= kqueue .endif -PLIST_VARS+= launchd +PLIST_VARS+= launchd # We may want to make it SUGGESTED once we have a framework for # launchd support. See PR/49591. PKG_SUPPORTED_OPTIONS.Darwin+= launchd @@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --disable-verbose-mode .endif .if !empty(PKG_OPTIONS:Mkqueue) -CONFIGURE_ARGS+= --enable-kqueue +CONFIGURE_ARGS+= --enable-kqueue .else CONFIGURE_ARGS+= --disable-kqueue .endif diff --git a/sysutils/depot/Makefile b/sysutils/depot/Makefile index d4b01f3d9cd..34c7a302e25 100644 --- a/sysutils/depot/Makefile +++ b/sysutils/depot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2012/10/23 19:50:58 asau Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/04 21:28:44 rillig Exp $ # DISTNAME= depot-5.14 @@ -20,7 +20,7 @@ MAKE_ENV+= CC=${CC:Q} INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 -INSTALL_DIRS= src/cmd man/man1 man/man5 +INSTALL_DIRS= src/cmd man/man1 man/man5 INSTALL_MAKE_FLAGS+= BINDIR=${DESTDIR}${PREFIX}/bin INSTALL_MAKE_FLAGS+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} diff --git a/sysutils/dfc/Makefile b/sysutils/dfc/Makefile index 4bbf5be63ab..c529342ce4f 100644 --- a/sysutils/dfc/Makefile +++ b/sysutils/dfc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2017/09/19 08:11:44 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/04 21:28:44 rillig Exp $ DISTNAME= dfc-3.1.1 PKGREVISION= 1 @@ -19,7 +19,7 @@ INSTALLATION_DIRS= ${EGDIR} MAKE_DIRS= ${PKG_SYSCONFDIR}/xdg OWN_DIRS= ${PKG_SYSCONFDIR}/xdg/dfc CONF_FILES= ${EGDIR}/dfcrc ${PKG_SYSCONFDIR}/xdg/dfc/dfcrc -USE_PKGLOCALEDIR= yes +USE_PKGLOCALEDIR= yes CMAKE_ARGS+= -DLOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale CMAKE_ARGS+= -DNLS_ENABLED=true diff --git a/sysutils/di/Makefile b/sysutils/di/Makefile index db1c3a4e785..9c72682a267 100644 --- a/sysutils/di/Makefile +++ b/sysutils/di/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2018/08/13 05:32:48 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:44 rillig Exp $ DISTNAME= di-4.47 CATEGORIES= sysutils @@ -9,8 +9,8 @@ HOMEPAGE= https://gentoo.com/di/ COMMENT= Alternative df command LICENSE= zlib -USE_LANGUAGES= c -USE_TOOLS+= msgfmt +USE_LANGUAGES= c +USE_TOOLS+= msgfmt USE_PKGLOCALEDIR= yes MAKE_ENV+= prefix=${PREFIX} \ diff --git a/sysutils/dmidecode/Makefile b/sysutils/dmidecode/Makefile index 4d9719f03b4..c19b6900022 100644 --- a/sysutils/dmidecode/Makefile +++ b/sysutils/dmidecode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2019/10/29 17:27:51 msaitoh Exp $ +# $NetBSD: Makefile,v 1.29 2019/11/04 21:28:44 rillig Exp $ # DISTNAME= dmidecode-3.2 @@ -12,14 +12,14 @@ HOMEPAGE= http://www.nongnu.org/dmidecode/ COMMENT= Print out DMI (SMBIOS) table in human-readable format LICENSE= gnu-gpl-v2 -PATCH_SITES= http://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id= -DIST_SUBDIR= dmidecode-patches -PATCHFILES= fde47bb227b8fa817c88d7e10a8eb771c46de1df -PATCHFILES+= 74dfb854b8199ddb0a27e89296fa565f4706cb9d -PATCHFILES+= e12ec26e19e02281d3e7258c3aabb88a5cf5ec1d -PATCHFILES+= 1d0db85949a5bdd96375f6131d393a11204302a6 -PATCHFILES+= fd08479625b5845e4d725ab628628f7ebfccc407 -PATCH_DIST_STRIP= -p1 +PATCH_SITES= http://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id= +DIST_SUBDIR= dmidecode-patches +PATCHFILES= fde47bb227b8fa817c88d7e10a8eb771c46de1df +PATCHFILES+= 74dfb854b8199ddb0a27e89296fa565f4706cb9d +PATCHFILES+= e12ec26e19e02281d3e7258c3aabb88a5cf5ec1d +PATCHFILES+= 1d0db85949a5bdd96375f6131d393a11204302a6 +PATCHFILES+= fd08479625b5845e4d725ab628628f7ebfccc407 +PATCH_DIST_STRIP= -p1 MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} diff --git a/sysutils/dtc/linux-dtb.mk b/sysutils/dtc/linux-dtb.mk index a544428b8fa..d8f88e49e8b 100644 --- a/sysutils/dtc/linux-dtb.mk +++ b/sysutils/dtc/linux-dtb.mk @@ -1,4 +1,4 @@ -# $NetBSD: linux-dtb.mk,v 1.2 2017/05/31 13:24:31 jmcneill Exp $ +# $NetBSD: linux-dtb.mk,v 1.3 2019/11/04 21:28:44 rillig Exp $ LK_VERSION= 4.11.3 PKGNAME= dtb-${DTB_ARCH}-${DTB_DEVICE}-${LK_VERSION} @@ -17,8 +17,8 @@ LICENSE= gnu-gpl-v2 DISTINFO_FILE= ${.CURDIR}/../../sysutils/dtc/linux-distinfo -GENERATE_PLIST= cd ${DESTDIR}${PREFIX}; -GENERATE_PLIST+=${FIND} * -type f | ${SORT}; +GENERATE_PLIST= cd ${DESTDIR}${PREFIX}; +GENERATE_PLIST+= ${FIND} * -type f | ${SORT}; DTC= ${LOCALBASE}/bin/dtc DTS_DIR= ${WRKSRC}/arch/${DTB_ARCH}/boot/dts diff --git a/sysutils/dupeguru/Makefile b/sysutils/dupeguru/Makefile index 0b0bedaf313..4fd4cdf1b4a 100644 --- a/sysutils/dupeguru/Makefile +++ b/sysutils/dupeguru/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/04/25 07:33:18 maya Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/04 21:28:44 rillig Exp $ DISTNAME= dupeguru-src-4.0.3 PKGNAME= ${DISTNAME:S/-src//} @@ -21,13 +21,13 @@ DEPENDS+= ${PYPKGPREFIX}-Send2Trash-[0-9]*:../../sysutils/py-Send2Trash EXTRACT_USING= bsdtar -WRKSRC= ${WRKDIR} -USE_LANGUAGES= c -USE_TOOLS= gmake pax +WRKSRC= ${WRKDIR} +USE_LANGUAGES= c +USE_TOOLS= gmake pax #MAKE_JOBS_SAFE= no PYTHON_VERSIONS_INCOMPATIBLE= 27 -REPLACE_PYTHON+= qt/run_template.py +REPLACE_PYTHON+= qt/run_template.py INSTALLATION_DIRS= bin share/applications share/dupeguru diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile index f87a46b3b57..b95c8083e2d 100644 --- a/sysutils/duplicity/Makefile +++ b/sysutils/duplicity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2019/09/02 13:20:08 adam Exp $ +# $NetBSD: Makefile,v 1.49 2019/11/04 21:28:44 rillig Exp $ DISTNAME= duplicity-0.7.17 PKGREVISION= 1 @@ -28,8 +28,8 @@ DEPENDS+= ${PYPKGPREFIX}-swiftclient-[0-9]*:../../www/py-swiftclient DEPENDS+= ${PYPKGPREFIX}-gdata-[0-9]*:../../www/py-gdata .include "../../net/librsync/buildlink3.mk" -REPLACE_PYTHON+= bin/duplicity \ - bin/rdiffdir +REPLACE_PYTHON+= bin/duplicity \ + bin/rdiffdir PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.6.22 EGG_NAME= ${DISTNAME:S/09/9/} diff --git a/sysutils/dvd+rw-tools/Makefile b/sysutils/dvd+rw-tools/Makefile index 484e3385e67..28d4adc7cc6 100644 --- a/sysutils/dvd+rw-tools/Makefile +++ b/sysutils/dvd+rw-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2012/10/23 19:50:59 asau Exp $ +# $NetBSD: Makefile,v 1.34 2019/11/04 21:28:44 rillig Exp $ # DISTNAME= dvd+rw-tools-7.1 @@ -20,8 +20,8 @@ USE_TOOLS+= m4 gmake INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 # These are the only platforms listed in growisofs.c -ONLY_FOR_PLATFORM=Linux-*-* OpenBSD-*-* NetBSD-*-* FreeBSD-*-* \ - DragonFly-*-* SunOS-*-* HP-UX-*-* IRIX-*-* +ONLY_FOR_PLATFORM= Linux-*-* OpenBSD-*-* NetBSD-*-* FreeBSD-*-* \ + DragonFly-*-* SunOS-*-* HP-UX-*-* IRIX-*-* LDFLAGS.NetBSD+= -lrt # sem_* functions diff --git a/sysutils/e2fsprogs/buildlink3.mk b/sysutils/e2fsprogs/buildlink3.mk index f5d6b042595..e6665c901fc 100644 --- a/sysutils/e2fsprogs/buildlink3.mk +++ b/sysutils/e2fsprogs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2018/10/04 12:21:33 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/11/04 21:28:44 rillig Exp $ BUILDLINK_TREE+= e2fsprogs @@ -6,7 +6,7 @@ BUILDLINK_TREE+= e2fsprogs E2FSPROGS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.e2fsprogs+= e2fsprogs>=1.43.7nb1 -BUILDLINK_PKGSRCDIR.e2fsprogs?= ../../sysutils/e2fsprogs +BUILDLINK_PKGSRCDIR.e2fsprogs?= ../../sysutils/e2fsprogs .endif # E2FSPROGS_BUILDLINK3_MK diff --git a/sysutils/easydiskpasswd/Makefile b/sysutils/easydiskpasswd/Makefile index 79f657a391b..b9a539ab3f9 100644 --- a/sysutils/easydiskpasswd/Makefile +++ b/sysutils/easydiskpasswd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2018/08/19 20:16:41 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/04 21:28:45 rillig Exp $ DISTNAME= easydiskpasswd-1.0 PKGREVISION= 1 @@ -15,7 +15,7 @@ INSTALLATION_DIRS= bin # we depend on SCIOCCOMMAND, a header defining sense codes # and the "make" infrastructure -ONLY_FOR_PLATFORM= NetBSD-[3-9]*-* +ONLY_FOR_PLATFORM= NetBSD-[3-9]*-* .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) diff --git a/sysutils/fam/builtin.mk b/sysutils/fam/builtin.mk index e86897e4a43..de3352eabf4 100644 --- a/sysutils/fam/builtin.mk +++ b/sysutils/fam/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.5 2013/11/23 12:10:13 obache Exp $ +# $NetBSD: builtin.mk,v 1.6 2019/11/04 21:28:45 rillig Exp $ BUILTIN_PKG:= fam @@ -44,4 +44,4 @@ USE_BUILTIN.fam!= \ . endif . endif # PREFER.fam .endif -MAKEVARS+= USE_BUILTIN.fam +MAKEVARS+= USE_BUILTIN.fam diff --git a/sysutils/file/builtin.mk b/sysutils/file/builtin.mk index 37c62c00801..2c0bbd9808e 100644 --- a/sysutils/file/builtin.mk +++ b/sysutils/file/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.7 2013/11/23 12:10:13 obache Exp $ +# $NetBSD: builtin.mk,v 1.8 2019/11/04 21:28:45 rillig Exp $ BUILTIN_PKG:= file @@ -25,13 +25,13 @@ BUILTIN_CMD.file= ${BIN_FILE} BUILTIN_CMD.file= file . endif .endif -MAKEVARS+= IS_BUILTIN.file +MAKEVARS+= IS_BUILTIN.file .if !defined(BUILTIN_PKG.file) && !empty(IS_BUILTIN.file:M[yY][eE][sS]) BUILTIN_VERSION.file!= ${BUILTIN_CMD.file} --version 2>&1 | ${GREP} 'file-' | ${SED} 's/file-//' BUILTIN_PKG.file= file-${BUILTIN_VERSION.file} .endif -MAKEVARS+= BUILTIN_PKG.file +MAKEVARS+= BUILTIN_PKG.file ### ### Determine whether we should use the built-in implementation if it @@ -58,4 +58,4 @@ USE_BUILTIN.file!= \ . endif . endif # PREFER.file .endif -MAKEVARS+= USE_BUILTIN.file +MAKEVARS+= USE_BUILTIN.file diff --git a/sysutils/flashrom/Makefile b/sysutils/flashrom/Makefile index 1309f718d8d..9c68597bfac 100644 --- a/sysutils/flashrom/Makefile +++ b/sysutils/flashrom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2019/07/11 17:04:04 nia Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/04 21:28:45 rillig Exp $ # DISTNAME= flashrom-v1.1 @@ -10,7 +10,7 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= jakllsch@NetBSD.org HOMEPAGE= https://www.flashrom.org/ COMMENT= Universal (coreboot/LinuxBIOS) flash utility -LICENSE= gnu-gpl-v2 +LICENSE= gnu-gpl-v2 USE_TOOLS+= gmake pkg-config @@ -26,7 +26,7 @@ SUBST_FILES.pciutils= Makefile SUBST_FILES.pciutils+= hwaccess.h SUBST_MESSAGE.pciutils= adjusting pciutils headers SUBST_STAGE.pciutils= pre-configure -SUBST_SED.pciutils+= -e 's,<pci/pci.h>,<pciutils/pci.h>,g' +SUBST_SED.pciutils+= -e 's,<pci/pci.h>,<pciutils/pci.h>,g' .if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" LDFLAGS+= -lpci diff --git a/sysutils/fscd/Makefile b/sysutils/fscd/Makefile index 145978b66d2..be06527231d 100644 --- a/sysutils/fscd/Makefile +++ b/sysutils/fscd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2017/12/24 09:49:03 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:45 rillig Exp $ DISTNAME= fscd-1.1 PKGREVISION= 1 @@ -10,11 +10,11 @@ HOMEPAGE= https://vcs.in-berlin.de/schrank21_fscd/index COMMENT= FreeBSD service check daemon to monitor services LICENSE= 2-clause-bsd -CPPFLAGS+= -DSYSCONFDIR=\"${PKG_SYSCONFDIR}/\" +CPPFLAGS+= -DSYSCONFDIR=\"${PKG_SYSCONFDIR}/\" # Only for platforms with kqueue. ONLY_FOR_PLATFORM= NetBSD-[2-9].*-* FreeBSD-[4-9].*-* OpenBSD-*-* DragonFly-*-* Darwin-*-* -RCD_SCRIPTS= fscd +RCD_SCRIPTS= fscd INSTALLATION_DIRS= bin sbin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 .include "../../mk/compiler.mk" diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile index 3eee9a96ede..275708df2ec 100644 --- a/sysutils/fsviewer/Makefile +++ b/sysutils/fsviewer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2018/03/12 11:17:33 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2019/11/04 21:28:45 rillig Exp $ DISTNAME= FSViewer.app-0.2.5 PKGNAME= FSViewer-0.2.5 @@ -6,8 +6,8 @@ PKGREVISION= 19 CATEGORIES= sysutils x11 windowmaker #MASTER_SITES= #http://www.bayernline.de/~gscholz/linux/fsviewer/ -#PATCH_SITES= #http://www.bayernline.de/~gscholz/linux/fsviewer/ -PATCHFILES= FSViewer.app-0.2.5-WM-0.81.0.patch.gz +#PATCH_SITES= #http://www.bayernline.de/~gscholz/linux/fsviewer/ +PATCHFILES= FSViewer.app-0.2.5-WM-0.81.0.patch.gz PATCH_DIST_STRIP= -p1 MAINTAINER= johnam@mail.kemper.org diff --git a/sysutils/gamin/Makefile.common b/sysutils/gamin/Makefile.common index 31f51c4335c..762cfbfaefb 100644 --- a/sysutils/gamin/Makefile.common +++ b/sysutils/gamin/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2017/07/30 22:47:55 wiz Exp $ +# $NetBSD: Makefile.common,v 1.9 2019/11/04 21:28:45 rillig Exp $ # # used by sysutils/gamin/Makefile # used by sysutils/libgamin/Makefile @@ -32,11 +32,11 @@ CONFIGURE_ARGS+= CPPFLAGS="-D_NETBSD_SOURCE" PKG_SYSCONFSUBDIR= gamin DOCDIR= ${PREFIX}/share/doc/gamin -SUBST_CLASSES+= sysconfdir -SUBST_MESSAGE.sysconfdir=fixing up sysconfdir -SUBST_STAGE.sysconfdir= pre-configure -SUBST_FILES.sysconfdir= doc/config.html doc/gamin.html server/gam_conf.c -SUBST_SED.sysconfdir= -e "s,/etc/gamin/,${PKG_SYSCONFDIR}/," +SUBST_CLASSES+= sysconfdir +SUBST_MESSAGE.sysconfdir= fixing up sysconfdir +SUBST_STAGE.sysconfdir= pre-configure +SUBST_FILES.sysconfdir= doc/config.html doc/gamin.html server/gam_conf.c +SUBST_SED.sysconfdir= -e "s,/etc/gamin/,${PKG_SYSCONFDIR}/," DISTINFO_FILE= ${.CURDIR}/../../sysutils/gamin/distinfo PATCHDIR= ${.CURDIR}/../../sysutils/gamin/patches diff --git a/sysutils/gnome-commander/Makefile b/sysutils/gnome-commander/Makefile index 86e54daa7e6..71efd02528a 100644 --- a/sysutils/gnome-commander/Makefile +++ b/sysutils/gnome-commander/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.121 2019/10/19 12:46:07 nia Exp $ +# $NetBSD: Makefile,v 1.122 2019/11/04 21:28:45 rillig Exp $ DISTNAME= gnome-commander-1.2.8.15 PKGREVISION= 84 @@ -6,8 +6,8 @@ CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-commander/1.2/} EXTRACT_SUFX= .tar.xz -MAINTAINER= pkgsrc@blackmouse.biz -HOMEPAGE= http://www.nongnu.org/gcmd/ +MAINTAINER= pkgsrc@blackmouse.biz +HOMEPAGE= http://www.nongnu.org/gcmd/ COMMENT= GNOME Commander is a fast and powerful graphical filemanager USE_LANGUAGES= c c++ diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile index 59b331e736b..2faf1746af8 100644 --- a/sysutils/gnome-vfs/Makefile +++ b/sysutils/gnome-vfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.121 2019/07/21 22:24:11 wiz Exp $ +# $NetBSD: Makefile,v 1.122 2019/11/04 21:28:46 rillig Exp $ PKGREVISION= 39 @@ -10,7 +10,7 @@ OWN_DIRS= ${PKG_SYSCONFDIR}/modules EGFILES+= modules/default-modules.conf EGFILES+= modules/ssl-modules.conf -GCONF_SCHEMAS= desktop_default_applications.schemas +GCONF_SCHEMAS= desktop_default_applications.schemas GCONF_SCHEMAS+= desktop_gnome_url_handlers.schemas GCONF_SCHEMAS+= system_dns_sd.schemas GCONF_SCHEMAS+= system_http_proxy.schemas diff --git a/sysutils/gnome-vfs/options.mk b/sysutils/gnome-vfs/options.mk index 53bb0201fc8..599390dd20c 100644 --- a/sysutils/gnome-vfs/options.mk +++ b/sysutils/gnome-vfs/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2016/02/26 10:24:12 jperkin Exp $ +# $NetBSD: options.mk,v 1.8 2019/11/04 21:28:46 rillig Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-vfs @@ -19,9 +19,9 @@ CONFIGURE_ARGS+= --disable-fam .if !empty(PKG_OPTIONS:Mgssapi) .include "../../mk/krb5.buildlink3.mk" -. if !empty(USE_BUILTIN.${KRB5_TYPE}:M[yY][eE][sS]) +. if !empty(USE_BUILTIN.${KRB5_TYPE}:M[yY][eE][sS]) CONFIGURE_ENV+= KRB5_CONFIG=${SH_KRB5_CONFIG} -. endif +. endif .else CONFIGURE_ENV+= ac_cv_path_KRB5_CONFIG=none .endif diff --git a/sysutils/gnuit/Makefile b/sysutils/gnuit/Makefile index fb0f68aaa4e..7706ac606aa 100644 --- a/sysutils/gnuit/Makefile +++ b/sysutils/gnuit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2013/07/21 09:11:43 shattered Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/04 21:28:46 rillig Exp $ DISTNAME= gnuit-4.9.5 PKGREVISION= 1 @@ -14,10 +14,10 @@ CONFLICTS= git<=4.9.5nb1 PREV_PKGPATH= misc/git SUPERSEDES= git<=4.9.5nb1 -GNU_CONFIGURE= YES +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --htmldir=${PREFIX}/share/doc/gnuit CONFIGURE_ARGS+= --disable-transition -INFO_FILES= YES +INFO_FILES= YES post-extract: ${CP} ${WRKSRC}/term/gnuitrc.ansi.in ${WRKSRC}/term/gnuitrc.cons25.in diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile index 6f05a0bdd9a..8392dc0db12 100644 --- a/sysutils/grub/Makefile +++ b/sysutils/grub/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2018/07/04 13:40:37 jperkin Exp $ +# $NetBSD: Makefile,v 1.59 2019/11/04 21:28:46 rillig Exp $ DISTNAME= grub-0.97 PKGREVISION= 10 @@ -35,9 +35,9 @@ PLIST_VARS+= netboot CONFIGURE_ARGS+= --enable-diskless PLIST.netboot= yes -.for nic in ${GRUB_NETWORK_CARDS} +. for nic in ${GRUB_NETWORK_CARDS} CONFIGURE_ARGS+= --enable-${nic} -.endfor +. endfor post-install: grub-netboot-install .PHONY: grub-netboot-install diff --git a/sysutils/grub/hacks.mk b/sysutils/grub/hacks.mk index a16471533b2..2214362e7cd 100644 --- a/sysutils/grub/hacks.mk +++ b/sysutils/grub/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.2 2008/02/08 10:34:20 tnn Exp $ +# $NetBSD: hacks.mk,v 1.3 2019/11/04 21:28:46 rillig Exp $ .include "../../mk/bsd.prefs.mk" @@ -6,13 +6,13 @@ # # The standalone modules doesn't support propolice. # -.if !defined(HAS_PROPOLICE) +. if !defined(HAS_PROPOLICE) HAS_PROPOLICE!= ( ${CC} -v 2>&1 | ${GREP} 'propolice' ) 2>/dev/null || echo no MAKEVARS+= HAS_PROPOLICE -.endif +. endif -.if ${HAS_PROPOLICE} != "no" +. if ${HAS_PROPOLICE} != "no" CFLAGS+= -fno-stack-protector CXXFLAGS+= -fno-stack-protector -.endif +. endif .endif diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile index d0124ed2343..b1bd9122f4e 100644 --- a/sysutils/grub2/Makefile +++ b/sysutils/grub2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2018/11/24 07:55:28 triaxx Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/04 21:28:46 rillig Exp $ DISTNAME= grub-2.02 PKGNAME= ${DISTNAME:S/grub/grub2/} @@ -65,7 +65,7 @@ PLIST_SUBST+= GRUB_PLATFORM=${GRUB_PLATFORM} # Unset ABI to prevent pkgsrc's gcc wrapper from messing with -m flags. # .if defined(ABI) && !empty(ABI) -.undef ABI +. undef ABI .endif # diff --git a/sysutils/gvfs/Makefile b/sysutils/gvfs/Makefile index 703b269bef7..c8c60a6c548 100644 --- a/sysutils/gvfs/Makefile +++ b/sysutils/gvfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.103 2019/07/21 22:25:44 wiz Exp $ +# $NetBSD: Makefile,v 1.104 2019/11/04 21:28:46 rillig Exp $ # DISTNAME= gvfs-1.6.7 @@ -12,17 +12,17 @@ HOMEPAGE= https://www.gnome.org/ COMMENT= Userspace virtual filesystem LICENSE= gnu-lgpl-v2 -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -USE_TOOLS+= intltool gmake pkg-config msgfmt +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_TOOLS+= intltool gmake pkg-config msgfmt CONFIGURE_ARGS+= --enable-http CONFIGURE_ARGS+= --disable-bash-completion .include "../../mk/bsd.prefs.mk" -PKG_OPTIONS_VAR= PKG_OPTIONS.gvfs -PKG_SUPPORTED_OPTIONS+= avahi hal fuse samba -PKG_SUGGESTED_OPTIONS+= samba +PKG_OPTIONS_VAR= PKG_OPTIONS.gvfs +PKG_SUPPORTED_OPTIONS+= avahi hal fuse samba +PKG_SUGGESTED_OPTIONS+= samba PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} # XXX fuse.bl3.mk will fail if we include it and fuse is not available diff --git a/sysutils/gworkspace/Makefile b/sysutils/gworkspace/Makefile index 20ce806ebb2..8b92479c05a 100644 --- a/sysutils/gworkspace/Makefile +++ b/sysutils/gworkspace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2019/04/03 00:33:07 ryoon Exp $ +# $NetBSD: Makefile,v 1.53 2019/11/04 21:28:46 rillig Exp $ # DISTNAME= gworkspace-0.9.1 @@ -13,11 +13,11 @@ LICENSE= gnu-gpl-v2 CONFLICTS+= GWLib-[0-9]* -USE_TOOLS+= gs:run file:run sh:run -USE_LANGUAGES= objc +USE_TOOLS+= gs:run file:run sh:run +USE_LANGUAGES= objc CONFIGURE_ARGS+= --with-sh=${TOOLS_PATH.sh:Q} CONFIGURE_ARGS+= --with-file=${TOOLS_PATH.file:Q} -MAKE_FILE= GNUmakefile +MAKE_FILE= GNUmakefile .include "../../x11/gnustep-back/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index 20294b2d274..53ac4c15022 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.86 2019/10/03 21:28:45 rillig Exp $ +# $NetBSD: Makefile,v 1.87 2019/11/04 21:28:46 rillig Exp $ DISTNAME= hal-0.5.14 PKGREVISION= 22 @@ -29,7 +29,7 @@ EGDIR= ${PREFIX}/share/examples/hal CONF_FILES= ${EGDIR}/hal.conf ${PKG_SYSCONFBASE}/dbus-1/system.d/hal.conf -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} CONFIGURE_ARGS+= --localstatedir=${VARBASE} CONFIGURE_ARGS+= --with-pci-ids=${PREFIX}/share/pciids CONFIGURE_ARGS+= --with-usb-ids=${PREFIX}/share/usbids @@ -68,12 +68,12 @@ MAKE_DIRS+= /etc/udev/rules.d CONF_FILES+= ${EGDIR}/90-hal.rules \ /etc/udev/rules.d/90-hal.rules PLIST_VARS+= imac -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" +. if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" PLIST.imac= yes CONFIGURE_ARGS+= --with-imac -.else +. else CONFIGURE_ARGS+= --without-imac -.endif +. endif .else # Unsupported systems # Pull in the dummy backend .include "../../devel/libvolume_id/buildlink3.mk" diff --git a/sysutils/heirloom-doc/Makefile.common b/sysutils/heirloom-doc/Makefile.common index 98c389ef707..af34f8e0e3b 100644 --- a/sysutils/heirloom-doc/Makefile.common +++ b/sysutils/heirloom-doc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2014/12/03 14:08:40 joerg Exp $ +# $NetBSD: Makefile.common,v 1.6 2019/11/04 21:28:46 rillig Exp $ # used by archivers/heirloom-tar/Makefile # used by devel/heirloom-common/Makefile # used by devel/heirloom-getopt/Makefile @@ -155,7 +155,7 @@ LCRYPT= .endif .if ${NEED_LIBCURSES:U0} -LCURS=-lcurses +LCURS= -lcurses . if ${OPSYS} == "NetBSD" CFLAGS+= -DUSE_TERMCAP diff --git a/sysutils/hfsutils/Makefile b/sysutils/hfsutils/Makefile index b6a77d17df7..723988f721f 100644 --- a/sysutils/hfsutils/Makefile +++ b/sysutils/hfsutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2017/08/16 20:21:14 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/04 21:28:46 rillig Exp $ # DISTNAME= hfsutils-3.2.6 @@ -13,8 +13,8 @@ COMMENT= Command Line Interface HFS (not HFS+) disk access tools GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include/libhfs -BUILD_TARGET= all_cli -INSTALL_TARGET= install_cli +BUILD_TARGET= all_cli +INSTALL_TARGET= install_cli INSTALL_MAKE_FLAGS+= BINDEST=${DESTDIR}${PREFIX}/bin \ MANDEST=${DESTDIR}${PREFIX}/${PKGMANDIR} diff --git a/sysutils/hytctl/Makefile b/sysutils/hytctl/Makefile index a2b09a915bb..038324f8f81 100644 --- a/sysutils/hytctl/Makefile +++ b/sysutils/hytctl/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2015/09/06 06:50:52 kardel Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/04 21:28:47 rillig Exp $ PKGNAME= hytctl-1.0 CATEGORIES= sysutils -ONLY_FOR_PLATFORM= NetBSD-*-* +ONLY_FOR_PLATFORM= NetBSD-*-* MAINTAINER= kardel@NetBSD.org COMMENT= Admin tool to read/write HYT 221/271/939 device EEPROM values diff --git a/sysutils/ipa/options.mk b/sysutils/ipa/options.mk index d16198dc974..6b886c5db68 100644 --- a/sysutils/ipa/options.mk +++ b/sysutils/ipa/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2012/07/17 21:00:34 asau Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/04 21:28:47 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ipa PKG_SUPPORTED_OPTIONS= ipa-without-autorules \ @@ -11,33 +11,33 @@ PKG_SUPPORTED_OPTIONS= ipa-without-autorules \ ### Disable dynamic rules support ### .if !empty(PKG_OPTIONS:Mipa-without-autorules) -CONFIGURE_ARGS+= --disable-autorules +CONFIGURE_ARGS+= --disable-autorules .endif ### ### Disable limits support ### .if !empty(PKG_OPTIONS:Mipa-without-limits) -CONFIGURE_ARGS+= --disable-limits +CONFIGURE_ARGS+= --disable-limits .endif ### ### Disable static rules support ### .if !empty(PKG_OPTIONS:Mipa-without-rules) -CONFIGURE_ARGS+= --disable-rules +CONFIGURE_ARGS+= --disable-rules .endif ### ### Disable sublimits support ### .if !empty(PKG_OPTIONS:Mipa-without-sublimits) -CONFIGURE_ARGS+= --disable-sublimits +CONFIGURE_ARGS+= --disable-sublimits .endif ### ### Disable thresholds support ### .if !empty(PKG_OPTIONS:Mipa-without-thresholds) -CONFIGURE_ARGS+= --disable-thresholds +CONFIGURE_ARGS+= --disable-thresholds .endif diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile index 0110cbd09a3..2b96e060353 100644 --- a/sysutils/k3b/Makefile +++ b/sysutils/k3b/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.101 2019/08/22 12:23:46 ryoon Exp $ +# $NetBSD: Makefile,v 1.102 2019/11/04 21:28:47 rillig Exp $ DISTNAME= k3b-2.0.3a PKGREVISION= 24 @@ -17,7 +17,7 @@ DEPENDS+= {cdrtools,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrtools USE_TOOLS+= perl pkg-config gmake msgfmt USE_LANGUAGES= c c++ -CMAKE_ARGS+= -DK3B_BUILD_MUSE_DECODER_PLUGIN=OFF +CMAKE_ARGS+= -DK3B_BUILD_MUSE_DECODER_PLUGIN=OFF CONF_FILES= ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.k3bsetup.conf \ ${PKG_SYSCONFBASE}/dbus-1/system.d/org.kde.kcontrol.k3bsetup.conf diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile index bb502069e46..352118e6492 100644 --- a/sysutils/lavaps/Makefile +++ b/sysutils/lavaps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2019/08/11 13:23:09 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2019/11/04 21:28:47 rillig Exp $ # DISTNAME= lavaps-2.7 @@ -15,11 +15,11 @@ MAKE_JOBS_SAFE= no USE_LANGUAGES= c c++ USE_TOOLS+= perl pod2man pod2html -GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--with-tcltk \ - --with-tcl-ver=8.6.1 \ - --with-tk-ver=8.6.1 \ - --with-tcltk-lib-suffix-type=nodot +GNU_CONFIGURE= YES +CONFIGURE_ARGS+= --with-tcltk \ + --with-tcl-ver=8.6.1 \ + --with-tk-ver=8.6.1 \ + --with-tcltk-lib-suffix-type=nodot # prevents the GConf schema from going into / when building the tcl/tk version MAKE_ENV+= PKGSRC_INSTALL_SCHEMAS=no diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile index edac5c9fc91..155d47427ea 100644 --- a/sysutils/libgksu/Makefile +++ b/sysutils/libgksu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2019/07/21 22:24:12 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2019/11/04 21:28:47 rillig Exp $ DISTNAME= libgksu-2.0.12 PKGREVISION= 13 @@ -13,8 +13,8 @@ LICENSE= gnu-lgpl-v2 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-gtk-doc -CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/ -MAKE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/ +CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/ +MAKE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/ USE_LIBTOOL= yes USE_TOOLS+= gmake intltool pkg-config msgfmt diff --git a/sysutils/libgtop/Makefile b/sysutils/libgtop/Makefile index 14f918fed46..a10772985c1 100644 --- a/sysutils/libgtop/Makefile +++ b/sysutils/libgtop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2019/08/19 05:59:56 gutteridge Exp $ +# $NetBSD: Makefile,v 1.61 2019/11/04 21:28:47 rillig Exp $ DISTNAME= libgtop-2.28.4 PKGREVISION= 16 @@ -49,31 +49,31 @@ CPPFLAGS.NetBSD+= -D_KMEMUSER .include "../../mk/bsd.prefs.mk" INSTALL_MAKE_FLAGS+= libgtop_postinstall=true -PLIST_VARS+= server suid.h +PLIST_VARS+= server suid.h .if ${OPSYS} == "AIX" -PLIST.server= yes -PLIST.suid.h= yes -SPECIAL_PERMS= bin/libgtop_server2 ${REAL_ROOT_USER} system 2755 +PLIST.server= yes +PLIST.suid.h= yes +SPECIAL_PERMS= bin/libgtop_server2 ${REAL_ROOT_USER} system 2755 .elif ${OPSYS} == "DragonFly" || \ ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || \ ${OPSYS} == "OpenBSD" -PLIST.server= yes -PLIST.suid.h= yes -SPECIAL_PERMS= bin/libgtop_server2 ${REAL_ROOT_USER} kmem 2755 +PLIST.server= yes +PLIST.suid.h= yes +SPECIAL_PERMS= bin/libgtop_server2 ${REAL_ROOT_USER} kmem 2755 .elif ${OPSYS} == "Linux" -#PLIST.server= no -#PLIST.suid.h= no +#PLIST.server= no +#PLIST.suid.h= no .elif ${OPSYS} == "SunOS" -PLIST.server= yes -SPECIAL_PERMS= bin/libgtop_server2 ${REAL_ROOT_USER} sys 2755 +PLIST.server= yes +SPECIAL_PERMS= bin/libgtop_server2 ${REAL_ROOT_USER} sys 2755 .elif ${OPSYS} == "Darwin" -PLIST.server= yes +PLIST.server= yes .else -PLIST.server= yes -PLIST.suid.h= yes +PLIST.server= yes +PLIST.suid.h= yes .endif -PLIST_VARS+= glibtop_private.h +PLIST_VARS+= glibtop_private.h .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" PLIST.glibtop_private.h= yes .endif diff --git a/sysutils/libnotify/Makefile b/sysutils/libnotify/Makefile index 31c3bd15e84..d8a3c7f7055 100644 --- a/sysutils/libnotify/Makefile +++ b/sysutils/libnotify/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2019/10/07 09:28:13 prlw1 Exp $ +# $NetBSD: Makefile,v 1.57 2019/11/04 21:28:47 rillig Exp $ DISTNAME= libnotify-0.7.8 PKGREVISION= 1 @@ -16,9 +16,9 @@ SUPERSEDES+= libnotify07-[0-9]* USE_TOOLS+= gmake pkg-config -PKGCONFIG_OVERRIDE= output/meson-private/libnotify.pc -PKGCONFIG_OVERRIDE_STAGE=pre-install -MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE} +PKGCONFIG_OVERRIDE= output/meson-private/libnotify.pc +PKGCONFIG_OVERRIDE_STAGE= pre-install +MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE} .include "options.mk" diff --git a/sysutils/libpciaccess/builtin.mk b/sysutils/libpciaccess/builtin.mk index bd509728e95..31ae7a516f2 100644 --- a/sysutils/libpciaccess/builtin.mk +++ b/sysutils/libpciaccess/builtin.mk @@ -1,6 +1,6 @@ -# $NetBSD: builtin.mk,v 1.2 2014/07/13 13:00:33 obache Exp $ +# $NetBSD: builtin.mk,v 1.3 2019/11/04 21:28:47 rillig Exp $ -BUILTIN_PKG:= libpciaccess +BUILTIN_PKG:= libpciaccess PKGCONFIG_FILE.libpciaccess= ${X11BASE}/lib/pkgconfig/pciaccess.pc PKGCONFIG_FILE.libpciaccess+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/pciaccess.pc @@ -15,6 +15,6 @@ CHECK_BUILTIN.libpciaccess?= no .if !empty(CHECK_BUILTIN.libpciaccess:M[nN][oO]) . if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-9]*-*) && \ !empty(USE_BUILTIN.libpciaccess:M[yY][eE][sS]) -BUILDLINK_TRANSFORM+= l:pciaccess:pciaccess:z +BUILDLINK_TRANSFORM+= l:pciaccess:pciaccess:z . endif .endif # CHECK_BUILTIN.libpciaccess diff --git a/sysutils/libvirt/Makefile b/sysutils/libvirt/Makefile index fdc19ecc29a..768314ca017 100644 --- a/sysutils/libvirt/Makefile +++ b/sysutils/libvirt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2019/09/02 13:20:09 adam Exp $ +# $NetBSD: Makefile,v 1.69 2019/11/04 21:28:48 rillig Exp $ DISTNAME= libvirt-1.2.9 PKGREVISION= 32 @@ -19,7 +19,7 @@ USE_LIBTOOL= yes BUILD_DEFS+= VARBASE -PYTHON_VERSIONS_ACCEPTED= 27 # py-xml +PYTHON_VERSIONS_ACCEPTED= 27 # py-xml PY_PATCHPLIST= yes REPLACE_PYTHON+= docs/apibuild.py diff --git a/sysutils/libvirt/options.mk b/sysutils/libvirt/options.mk index 6ffbd7cba6f..ae3751c8a9a 100644 --- a/sysutils/libvirt/options.mk +++ b/sysutils/libvirt/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2016/07/09 12:47:05 rillig Exp $ +# $NetBSD: options.mk,v 1.5 2019/11/04 21:28:48 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libvirt @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --with-xenapi=${BUILDLINK_PREFIX.xentools42} .if !empty(PKG_OPTIONS:Mlibssh2) CONFIGURE_ARGS+= --with-ssh2=${BUILDLINK_PREFIX.libssh2} -. include "../../security/libssh2/buildlink3.mk" +. include "../../security/libssh2/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mlvm) @@ -33,15 +33,15 @@ CONFIGURE_ARGS+= --with-storage-lvm .if !empty(PKG_OPTIONS:Mhal) PLIST.hal= yes CONFIGURE_ARGS+= --with-hal=${BUILDLINK_PREFIX.hal} -. include "../../sysutils/hal/buildlink3.mk" +. include "../../sysutils/hal/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mdbus) CONFIGURE_ARGS+= --with-dbus=${BUILDLINK_PREFIX.dbus} -. include "../../sysutils/dbus/buildlink3.mk" +. include "../../sysutils/dbus/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mavahi) CONFIGURE_ARGS+= --with-avahi=${BUILDLINK_PREFIX.avahi} -. include "../../net/avahi/buildlink3.mk" +. include "../../net/avahi/buildlink3.mk" .endif diff --git a/sysutils/lilo/Makefile b/sysutils/lilo/Makefile index e5359949514..6526ec9af4c 100644 --- a/sysutils/lilo/Makefile +++ b/sysutils/lilo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/08/11 13:23:09 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2019/11/04 21:28:48 rillig Exp $ DISTNAME= lilo-22.8.src PKGREVISION= 8 @@ -20,9 +20,9 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} # Don't force perl for extra tool -- maybe a MESSAGE? #USE_PERL5= YES -#BUILD_DEPENDS+= dev86>=0.16.10:../../devel/dev86 +#BUILD_DEPENDS+= dev86>=0.16.10:../../devel/dev86 # bcc is old and doesn't have -v switch to indicate version -#BUILD_DEPENDS+= bcc>=95.3.12:../../devel/bcc +#BUILD_DEPENDS+= bcc>=95.3.12:../../devel/bcc BUILD_DEPENDS+= bin86>=0.16.10:../../devel/bin86 BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index 96d8e9c880e..1c2d1eda016 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.135 2019/09/18 18:30:54 tnn Exp $ +# $NetBSD: Makefile,v 1.136 2019/11/04 21:28:48 rillig Exp $ DISTNAME= lsof_4.91 PKGNAME= ${DISTNAME:S/_/-/} @@ -43,19 +43,19 @@ INTERACTIVE_STAGE+= test .include "../../mk/bsd.prefs.mk" .include "options.mk" -REAL_GROUP= ${REAL_ROOT_GROUP} +REAL_GROUP= ${REAL_ROOT_GROUP} .if ${OPSYS} == "NetBSD" -REAL_GROUP= kmem -CONFIGURE_ENV+= NETBSD_SYS="${NETBSDSRCDIR}/sys" -CPPFLAGS+= -D_KMEMUSER -D__NAMECACHE_PRIVATE +REAL_GROUP= kmem +CONFIGURE_ENV+= NETBSD_SYS="${NETBSDSRCDIR}/sys" +CPPFLAGS+= -D_KMEMUSER -D__NAMECACHE_PRIVATE .elif ${OPSYS} == "FreeBSD" BUILDLINK_PASSTHRU_DIRS+= /usr/src/sys .elif ${OPSYS} == "SunOS" -REAL_GROUP= sys -MAKE_ENV+= CPPFLAGS= -CONFIGURE_ENV+= LSOF_RANLIB="/bin/true" +REAL_GROUP= sys +MAKE_ENV+= CPPFLAGS= +CONFIGURE_ENV+= LSOF_RANLIB="/bin/true" .endif -INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man8 share/doc/lsof share/examples/lsof +INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man8 share/doc/lsof share/examples/lsof post-extract: .if ${OPSYS} == "FreeBSD" diff --git a/sysutils/lsof/options.mk b/sysutils/lsof/options.mk index 132a4c4ba84..b078b872f2c 100644 --- a/sysutils/lsof/options.mk +++ b/sysutils/lsof/options.mk @@ -1,24 +1,24 @@ -# $NetBSD: options.mk,v 1.1 2010/04/30 06:53:06 sbd Exp $ +# $NetBSD: options.mk,v 1.2 2019/11/04 21:28:48 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.lsof PKG_SUPPORTED_OPTIONS= lsof-more-secure lsof-less-secure-sockets .if defined(LSOF_MORE_SECURE) . if !empty(LSOF_MORE_SECURE:M1) -PKG_LEGACY_OPTIONS+= lsof-more-secure +PKG_LEGACY_OPTIONS+= lsof-more-secure PKG_OPTIONS_DEPRECATED_WARNINGS+= "Deprecated variable LSOF_MORE_SECURE set to 1, use PKG_OPTIONS.lsof+=lsof-more-secure instead." . elif !empty(LSOF_MORE_SECURE:M0) -PKG_LEGACY_OPTIONS+= -lsof-more-secure +PKG_LEGACY_OPTIONS+= -lsof-more-secure PKG_OPTIONS_DEPRECATED_WARNINGS+= "Deprecated variable LSOF_MORE_SECURE set to 0, use PKG_OPTIONS.lsof+=-lsof-more-secure instead." . endif .endif .if defined(LSOF_LESS_SECURE_SOCKETS) . if !empty(LSOF_LESS_SECURE_SOCKETS:M1) -PKG_LEGACY_OPTIONS+= lsof-less-secure-sockets +PKG_LEGACY_OPTIONS+= lsof-less-secure-sockets PKG_OPTIONS_DEPRECATED_WARNINGS+= "Deprecated variable LSOF_LESS_SECURE_SOCKETS set to 1, use PKG_OPTIONS.lsof+=lsof-less-secure-sockets instead." . elif !empty(LSOF_LESS_SECURE_SOCKETS:M0) -PKG_LEGACY_OPTIONS+= -lsof-less-secure-sockets +PKG_LEGACY_OPTIONS+= -lsof-less-secure-sockets PKG_OPTIONS_DEPRECATED_WARNINGS+= "Deprecated variable LSOF_LESS_SECURE_SOCKETS set to 0, use PKG_OPTIONS.lsof+=lsof-less-secure-sockets instead." . endif .endif diff --git a/sysutils/manifold/Makefile b/sysutils/manifold/Makefile index 4f9fb38afc2..31698c65b06 100644 --- a/sysutils/manifold/Makefile +++ b/sysutils/manifold/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/09/02 13:20:09 adam Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/04 21:28:48 rillig Exp $ PKGNAME= ${DISTNAME:S/^M/m/} PKGREVISION= 1 @@ -15,7 +15,7 @@ DEPENDS+= ${PYPKGPREFIX}-genshi-[0-9]*:../../www/py-genshi USE_LANGUAGES= # none -PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.2.0 +PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.2.0 post-extract: ${CHMOD} -R g-w ${WRKSRC}/* diff --git a/sysutils/mate-sensors-applet/Makefile b/sysutils/mate-sensors-applet/Makefile index c6839d597a9..ce5bb46b57b 100644 --- a/sysutils/mate-sensors-applet/Makefile +++ b/sysutils/mate-sensors-applet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2019/07/21 22:25:45 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2019/11/04 21:28:48 rillig Exp $ PKGREVISION= 1 .include "../../meta-pkgs/mate/Makefile.common" @@ -10,10 +10,10 @@ COMMENT= MATE Sensors applets TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt # for xsltproc -PLIST_VARS+= netbsd +PLIST_VARS+= netbsd .if ${OPSYS} == "NetBSD" CONFIGURE_ARGS+= --enable-netbsd -PLIST.netbsd= yes +PLIST.netbsd= yes .endif .include "../../devel/glib2/schemas.mk" diff --git a/sysutils/mc/options.mk b/sysutils/mc/options.mk index b3acccef296..bfb58e55fc5 100644 --- a/sysutils/mc/options.mk +++ b/sysutils/mc/options.mk @@ -1,10 +1,10 @@ -# $NetBSD: options.mk,v 1.14 2015/08/28 07:47:08 wiz Exp $ +# $NetBSD: options.mk,v 1.15 2019/11/04 21:28:48 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.mc +PKG_OPTIONS_VAR= PKG_OPTIONS.mc PKG_OPTIONS_REQUIRED_GROUPS= screen PKG_OPTIONS_GROUP.screen= ncurses slang -PKG_SUPPORTED_OPTIONS= mc-charset x11 -PKG_SUGGESTED_OPTIONS= mc-charset slang +PKG_SUPPORTED_OPTIONS= mc-charset x11 +PKG_SUGGESTED_OPTIONS= mc-charset slang .include "../../mk/bsd.options.mk" diff --git a/sysutils/mc46/options.mk b/sysutils/mc46/options.mk index 2b53f45394a..8b7371febfd 100644 --- a/sysutils/mc46/options.mk +++ b/sysutils/mc46/options.mk @@ -1,11 +1,11 @@ -# $NetBSD: options.mk,v 1.2 2013/10/25 06:53:33 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2019/11/04 21:28:48 rillig Exp $ # -PKG_OPTIONS_VAR= PKG_OPTIONS.mc +PKG_OPTIONS_VAR= PKG_OPTIONS.mc PKG_OPTIONS_REQUIRED_GROUPS= screen PKG_OPTIONS_GROUP.screen= ncurses slang -PKG_SUPPORTED_OPTIONS= glib12 mc-charset mc-edit mc-samba mc-subshell mc-vfs x11 -PKG_SUGGESTED_OPTIONS= mc-charset mc-edit mc-subshell mc-vfs slang +PKG_SUPPORTED_OPTIONS= glib12 mc-charset mc-edit mc-samba mc-subshell mc-vfs x11 +PKG_SUGGESTED_OPTIONS= mc-charset mc-edit mc-subshell mc-vfs slang .include "../../mk/bsd.options.mk" diff --git a/sysutils/memtestplus/Makefile b/sysutils/memtestplus/Makefile index 510c28f2a3a..8f82cf45e6d 100644 --- a/sysutils/memtestplus/Makefile +++ b/sysutils/memtestplus/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.28 2019/11/04 17:47:31 rillig Exp $ +# $NetBSD: Makefile,v 1.29 2019/11/04 21:28:48 rillig Exp $ # # Note -- version number also in the do-install rule -MAJVER=5 -MINVER=01 +MAJVER= 5 +MINVER= 01 DISTNAME= memtest86+-${MAJVER}.${MINVER} PKGNAME= memtestplus-${MAJVER}.${MINVER} diff --git a/sysutils/memtestplus/options.mk b/sysutils/memtestplus/options.mk index aca549b2f0a..99c83712fcd 100644 --- a/sysutils/memtestplus/options.mk +++ b/sysutils/memtestplus/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2018/07/04 13:40:38 jperkin Exp $ +# $NetBSD: options.mk,v 1.8 2019/11/04 21:28:48 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.memtestplus PKG_SUPPORTED_OPTIONS= iso serialconsole @@ -14,9 +14,9 @@ PLIST.iso= yes .endif .if !empty(PKG_OPTIONS:Mserialconsole) -SUBST_CLASSES+= serialopt -SUBST_STAGE.serialopt= pre-configure +SUBST_CLASSES+= serialopt +SUBST_STAGE.serialopt= pre-configure SUBST_MESSAGE.serialopt= Setting serial console option -SUBST_FILES.serialopt= config.h -SUBST_SED.serialopt= -e '/define.*SERIAL_CONSOLE_DEFAULT/s/0/1/' +SUBST_FILES.serialopt= config.h +SUBST_SED.serialopt= -e '/define.*SERIAL_CONSOLE_DEFAULT/s/0/1/' .endif diff --git a/sysutils/mksunbootcd/Makefile b/sysutils/mksunbootcd/Makefile index f686ccc839b..e1c7d546def 100644 --- a/sysutils/mksunbootcd/Makefile +++ b/sysutils/mksunbootcd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2012/10/23 19:51:13 asau Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/04 21:28:48 rillig Exp $ # DISTNAME= mksunbootcd-1.0 @@ -10,7 +10,7 @@ MAINTAINER= dmcmahill@NetBSD.org HOMEPAGE= http://www.NetBSD.org/ COMMENT= Combines filesystems for Sun computers to make bootable CD-ROM images -GNU_CONFIGURE=YES +GNU_CONFIGURE= YES INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 diff --git a/sysutils/monitoring/Makefile b/sysutils/monitoring/Makefile index 8a2b67a3d18..6079dbaecfd 100644 --- a/sysutils/monitoring/Makefile +++ b/sysutils/monitoring/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2019/09/02 13:20:09 adam Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/04 21:28:49 rillig Exp $ VERSION= e518a90eade4ca538468b6640dccb651e6034b9e DISTNAME= ${VERSION} @@ -14,7 +14,7 @@ LICENSE= modified-bsd WRKSRC= ${WRKDIR}/monitoring-${VERSION} -REPLACE_PYTHON+= Sources/monitoring.py Scripts/monitoring +REPLACE_PYTHON+= Sources/monitoring.py Scripts/monitoring PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.9.5 DOCDIR= ${PREFIX}/share/doc/monitoring diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile index 9597e2df3b2..f2dbf4531bd 100644 --- a/sysutils/mtools/Makefile +++ b/sysutils/mtools/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.56 2018/12/09 21:05:36 adam Exp $ +# $NetBSD: Makefile,v 1.57 2019/11/04 21:28:49 rillig Exp $ DISTNAME= mtools-4.0.18 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_GNU:=mtools/} +MASTER_SITES= ${MASTER_SITE_GNU:=mtools/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= is@NetBSD.org diff --git a/sysutils/neb-wipe/Makefile b/sysutils/neb-wipe/Makefile index 9145d62cbca..f6da9adf257 100644 --- a/sysutils/neb-wipe/Makefile +++ b/sysutils/neb-wipe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/10/23 19:51:14 asau Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/04 21:28:49 rillig Exp $ DISTNAME= neb-wipe-src-1.0 PKGNAME= neb-wipe-1.0 @@ -13,7 +13,7 @@ COMMENT= Secure disk partition eraser NO_CONFIGURE= yes ONLY_FOR_PLATFORM= NetBSD-*-* OpenBSD-*-* -LICENSE= original-bsd +LICENSE= original-bsd WRKSRC= ${WRKDIR} INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 diff --git a/sysutils/nvnet/Makefile b/sysutils/nvnet/Makefile index 588e213194a..1a964fc0c4c 100644 --- a/sysutils/nvnet/Makefile +++ b/sysutils/nvnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/23 19:51:15 asau Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/04 21:28:49 rillig Exp $ # PKGNAME= nvnet-20050620nb1 @@ -27,7 +27,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 INSTALLATION_DIRS= lkm ${PKGMANDIR}/man4 -MESSAGE_SUBST+= PREFIX=${PREFIX:Q} +MESSAGE_SUBST+= PREFIX=${PREFIX:Q} do-extract: ${TAR} -xzf ${DISTDIR}/nvnet-netbsd-src-20050620.tgz -C ${WRKDIR} diff --git a/sysutils/nvramtool/Makefile b/sysutils/nvramtool/Makefile index 2a7065ccdab..da65ffba5e9 100644 --- a/sysutils/nvramtool/Makefile +++ b/sysutils/nvramtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2017/09/03 08:53:15 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:49 rillig Exp $ # DISTNAME= nvramtool-4.0-9989-gf2dfef0-08bda29 @@ -11,10 +11,10 @@ HOMEPAGE= https://www.coreboot.org/Nvramtool COMMENT= Coreboot CMOS NVRAM manipulation utility LICENSE= gnu-gpl-v2 -USE_TOOLS+= gmake -USE_TOOLS+= date +USE_TOOLS+= gmake +USE_TOOLS+= date -USE_LANGUAGES+= c +USE_LANGUAGES+= c .include "../../mk/bsd.prefs.mk" @@ -25,7 +25,7 @@ ONLY_FOR_PLATFORM+= NetBSD-*-i386 NetBSD-*-x86_64 WRKSRC= ${WRKDIR}/${DISTNAME} -BUILD_TARGET= nvramtool +BUILD_TARGET= nvramtool INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8 diff --git a/sysutils/openxenmanager/Makefile b/sysutils/openxenmanager/Makefile index f5a091c28c8..46e5efa7fa5 100644 --- a/sysutils/openxenmanager/Makefile +++ b/sysutils/openxenmanager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2019/09/02 13:20:08 adam Exp $ +# $NetBSD: Makefile,v 1.35 2019/11/04 21:28:49 rillig Exp $ DISTNAME= openxenmanager_0.r80+dfsg.orig PKGNAME= openxenmanager-0.0.80 @@ -21,7 +21,7 @@ DEPENDS+= ${PYPKGPREFIX}-httplib2>=0.7.7:../../www/py-httplib2 INSTALLATION_DIRS= bin share REPLACE_PYTHON= openxenmanager/*py openxenmanager/pygtk_chart/*py -PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 +PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 OXMDIR= ${PREFIX} diff --git a/sysutils/ovmf/Makefile b/sysutils/ovmf/Makefile index f3650779678..7c9bd6ac49e 100644 --- a/sysutils/ovmf/Makefile +++ b/sysutils/ovmf/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.6 2019/04/25 07:33:20 maya Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/04 21:28:49 rillig Exp $ -PKGNAME= OVMF-0.0.20181116 -PKGREVISION= 1 -DISTNAME= edk2-20181116 -MASTER_SITES= ${MASTER_SITE_LOCAL} -CATEGORIES= sysutils +PKGNAME= OVMF-0.0.20181116 +PKGREVISION= 1 +DISTNAME= edk2-20181116 +MASTER_SITES= ${MASTER_SITE_LOCAL} +CATEGORIES= sysutils # Require openssl submodule -#DISTNAME= edk2-${GITHUB_TAG} -#MASTER_SITES= ${MASTER_SITE_GITHUB:=tianocore/} +#DISTNAME= edk2-${GITHUB_TAG} +#MASTER_SITES= ${MASTER_SITE_GITHUB:=tianocore/} #GITHUB_PROJECT= edk2 -#GITHUB_TAG= edk2-stable201811 -#MASTER_SITES= ${MASTER_SITE_GITHUB:=tianocore/} +#GITHUB_TAG= edk2-stable201811 +#MASTER_SITES= ${MASTER_SITE_GITHUB:=tianocore/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/tianocore/edk2/ diff --git a/sysutils/p5-Daemon-Generic/Makefile b/sysutils/p5-Daemon-Generic/Makefile index e72125e76e8..1f8244a2f49 100644 --- a/sysutils/p5-Daemon-Generic/Makefile +++ b/sysutils/p5-Daemon-Generic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/08/11 13:23:11 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/04 21:28:49 rillig Exp $ DISTNAME= Daemon-Generic-0.85 PKGNAME= p5-${DISTNAME} @@ -9,7 +9,7 @@ MASTER_SITES= https://cpan.metacpan.org/authors/id/M/MU/MUIR/modules/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://cpan.metacpan.org/authors/id/M/MU/MUIR/modules/ COMMENT= Framework to provide start/stop/reload for a daemon -LICENSE= ${PERL5_LICENSE} +LICENSE= ${PERL5_LICENSE} DEPENDS+= p5-File-Flock-[0-9]*:../../devel/p5-File-Flock DEPENDS+= p5-Data-Structure-Util-[0-9]*:../../devel/p5-Data-Structure-Util @@ -18,8 +18,8 @@ DEPENDS+= p5-Data-Structure-Util-[0-9]*:../../devel/p5-Data-Structure-Util BUILD_DEPENDS+= p5-AnyEvent-[0-9]*:../../devel/p5-AnyEvent BUILD_DEPENDS+= p5-Eval-LineNumbers-[0-9]*:../../devel/p5-Eval-LineNumbers -PERL5_PACKLIST= auto/Daemon/Generic/.packlist -USE_LANGUAGES= # none +PERL5_PACKLIST= auto/Daemon/Generic/.packlist +USE_LANGUAGES= # none .include "../../devel/p5-Event/buildlink3.mk" .include "../../lang/perl5/module.mk" diff --git a/sysutils/p5-Mac-AppleScript-Glue/Makefile b/sysutils/p5-Mac-AppleScript-Glue/Makefile index b2c3c2d1396..25de72dcdee 100644 --- a/sysutils/p5-Mac-AppleScript-Glue/Makefile +++ b/sysutils/p5-Mac-AppleScript-Glue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/08/11 13:23:13 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/04 21:28:50 rillig Exp $ DISTNAME= Mac-AppleScript-Glue-0.03 PKGNAME= p5-${DISTNAME} @@ -13,7 +13,7 @@ COMMENT= Perl 5 module allowing AppleScript to be written in Perl USE_LANGUAGES= # empty ONLY_FOR_PLATFORM= Darwin-*-* -PERL5_PACKLIST= auto/Mac/AppleScript/Glue/.packlist +PERL5_PACKLIST= auto/Mac/AppleScript/Glue/.packlist DEPENDS+= p5-Mac-AppleScript>=0.03:../../sysutils/p5-Mac-AppleScript BUILD_DEPENDS+= p5-Test-Pod-[0-9]*:../../devel/p5-Test-Pod diff --git a/sysutils/p5-Mac-AppleScript/Makefile b/sysutils/p5-Mac-AppleScript/Makefile index 01b0689957c..5c04d84b47e 100644 --- a/sysutils/p5-Mac-AppleScript/Makefile +++ b/sysutils/p5-Mac-AppleScript/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/08/11 13:23:13 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/04 21:28:50 rillig Exp $ DISTNAME= Mac-AppleScript-0.04 PKGNAME= p5-${DISTNAME} @@ -17,7 +17,7 @@ ONLY_FOR_PLATFORM= Darwin-*-* # upstream's Makefile.PL's OTHERFLAGS LDFLAGS+= -framework AppleScriptKit -framework Carbon -PERL5_PACKLIST= auto/Mac/AppleScript/.packlist +PERL5_PACKLIST= auto/Mac/AppleScript/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/p5-Monitoring-Plugin/Makefile b/sysutils/p5-Monitoring-Plugin/Makefile index 5bc20ac3e2a..45b5fd0ab01 100644 --- a/sysutils/p5-Monitoring-Plugin/Makefile +++ b/sysutils/p5-Monitoring-Plugin/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2019/08/11 13:23:13 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/04 21:28:50 rillig Exp $ DISTNAME= Monitoring-Plugin-0.40 -PKGNAME= p5-${DISTNAME} -PKGREVISION= 2 +PKGNAME= p5-${DISTNAME} +PKGREVISION= 2 CATEGORIES= sysutils perl5 MASTER_SITES= http://search.cpan.org/CPAN/authors/id/N/NI/NIERLEIN/ diff --git a/sysutils/p5-SSH-Batch/Makefile b/sysutils/p5-SSH-Batch/Makefile index 137f883caa3..ccb4798ca33 100644 --- a/sysutils/p5-SSH-Batch/Makefile +++ b/sysutils/p5-SSH-Batch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/08/11 13:23:13 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/04 21:28:50 rillig Exp $ DISTNAME= SSH-Batch-0.030 PKGNAME= p5-${DISTNAME} @@ -11,8 +11,8 @@ HOMEPAGE= https://metacpan.org/release/SSH-Batch COMMENT= Cluster operations based on parallel SSH, set and interval arithmetic LICENSE= original-bsd -USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/SSH/Batch/.packlist +USE_LANGUAGES= # empty +PERL5_PACKLIST= auto/SSH/Batch/.packlist PERL5_MODULE_TYPE= Module::Install::Bundled REPLACE_PERL+= bin/atnodes diff --git a/sysutils/p5-Server-Starter/Makefile b/sysutils/p5-Server-Starter/Makefile index 2acc3c074d7..30e047a1037 100644 --- a/sysutils/p5-Server-Starter/Makefile +++ b/sysutils/p5-Server-Starter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2019/08/11 13:23:14 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2019/11/04 21:28:50 rillig Exp $ DISTNAME= Server-Starter-0.34 PKGNAME= p5-${DISTNAME} @@ -12,14 +12,14 @@ COMMENT= Perl 5 superdaemon for hot-deploying server programs LICENSE= ${PERL5_LICENSE} USE_LANGUAGES= # empty -PERL5_PACKLIST= auto/Server/Starter/.packlist +PERL5_PACKLIST= auto/Server/Starter/.packlist BUILD_DEPENDS+= p5-Test-TCP>=0.11:../../net/p5-Test-TCP DEPENDS+= p5-Proc-Wait3-[0-9]*:../../devel/p5-Proc-Wait3 DEPENDS+= p5-List-MoreUtils-[0-9]*:../../devel/p5-List-MoreUtils DEPENDS+= p5-Scope-Guard-[0-9]*:../../devel/p5-Scope-Guard -PERL5_MODULE_TYPE= Module::Build +PERL5_MODULE_TYPE= Module::Build .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/p5-Sys-CPU/Makefile b/sysutils/p5-Sys-CPU/Makefile index 54e0c052e38..ccf0f94e155 100644 --- a/sysutils/p5-Sys-CPU/Makefile +++ b/sysutils/p5-Sys-CPU/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2019/08/11 13:23:14 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:50 rillig Exp $ DISTNAME= Sys-CPU-0.61 PKGNAME= p5-${DISTNAME} @@ -12,7 +12,7 @@ COMMENT= Perl 5 module for getting CPU information LICENSE= ${PERL5_LICENSE} USE_LANGUAGES= c -PERL5_PACKLIST= auto/Sys/CPU/.packlist +PERL5_PACKLIST= auto/Sys/CPU/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/p5-Unix-Statgrab/Makefile b/sysutils/p5-Unix-Statgrab/Makefile index 4adbaf0fbe0..7429ce9bda3 100644 --- a/sysutils/p5-Unix-Statgrab/Makefile +++ b/sysutils/p5-Unix-Statgrab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2019/08/11 13:23:15 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/04 21:28:50 rillig Exp $ DISTNAME= Unix-Statgrab-0.112 PKGNAME= p5-${DISTNAME} @@ -17,7 +17,7 @@ BUILD_DEPENDS+= p5-Test-LeakTrace-[0-9]*:../../devel/p5-Test-LeakTrace USE_LANGUAGES= c USE_TOOLS+= pkg-config -PERL5_PACKLIST= auto/Unix/Statgrab/.packlist +PERL5_PACKLIST= auto/Unix/Statgrab/.packlist PERL5_REQD+= 5.2 # File::Copy >= 0 PERL5_REQD+= 5.10.1 # parent >= 0 PERL5_REQD+= 5.11.2 # ExtUtils::CBuilder >= 0.27 diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile index 3078b4f4130..e2acb5cd4ca 100644 --- a/sysutils/pftop/Makefile +++ b/sysutils/pftop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2017/09/03 08:37:00 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2019/11/04 21:28:50 rillig Exp $ DISTNAME= pftop-0.7 PKGREVISION= 2 @@ -11,8 +11,8 @@ COMMENT= Utility for real-time display of statistics for PF NO_CONFIGURE= yes -MAKE_ENV+= OSLEVEL=${PF_VERSION:S/.//} -CFLAGS+= -I${PREFIX}/include +MAKE_ENV+= OSLEVEL=${PF_VERSION:S/.//} +CFLAGS+= -I${PREFIX}/include OSVERSION_SPECIFIC= yes INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin diff --git a/sysutils/polysh/Makefile b/sysutils/polysh/Makefile index f064517e472..4b3ba4dd53f 100644 --- a/sysutils/polysh/Makefile +++ b/sysutils/polysh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2019/09/02 13:20:08 adam Exp $ +# $NetBSD: Makefile,v 1.13 2019/11/04 21:28:50 rillig Exp $ DISTNAME= polysh-0.4 PKGREVISION= 2 @@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2 USE_LANGUAGES= # none -PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.4 +PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.4 REPLACE_PYTHON= polysh/rb_tree.py SUBST_CLASSES+= setup diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile index 58b2ad62939..56cd9c72eb0 100644 --- a/sysutils/puppet/Makefile +++ b/sysutils/puppet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2018/09/23 18:27:03 taca Exp $ +# $NetBSD: Makefile,v 1.38 2019/11/04 21:28:51 rillig Exp $ DISTNAME= puppet-5.5.2 CATEGORIES= sysutils @@ -53,17 +53,17 @@ CONF_FILES= ${EGDIR}/puppet.conf ${PKG_SYSCONFDIR}/puppet.conf ## Since these users are needed only for puppet server, ## puppet-server package should be created. #SUBST_CLASSES+= user -#SUBST_STAGE.user= post-patch -#SUBST_FILES.user= lib/puppet/defaults.rb +#SUBST_STAGE.user= post-patch +#SUBST_FILES.user= lib/puppet/defaults.rb #SUBST_SED.user= -e "s|@PUPPET_GROUP@|${PUPPET_GROUP}|g" -#SUBST_SED.user+= -e "s|@PUPPET_USER@|${PUPPET_USER}|g" +#SUBST_SED.user+= -e "s|@PUPPET_USER@|${PUPPET_USER}|g" # #PKG_GROUPS_VARS= PUPPET_GROUP -#PKG_USERS_VARS= PUPPET_USER +#PKG_USERS_VARS= PUPPET_USER # #PKG_GROUPS= ${PUPPET_GROUP} #PKG_USERS= ${PUPPET_USER}:${PUPPET_GROUP} -#PKG_GECOS.${PUPPET_USER}= Puppet configuration management pseudo-user +#PKG_GECOS.${PUPPET_USER}= Puppet configuration management pseudo-user PLIST_SUBST+= EGDIR=${EGDIR} PLIST_VARS+= sunos diff --git a/sysutils/py-dbus/Makefile b/sysutils/py-dbus/Makefile index 0956ff51a61..1a628349eac 100644 --- a/sysutils/py-dbus/Makefile +++ b/sysutils/py-dbus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2019/10/10 12:52:17 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2019/11/04 21:28:51 rillig Exp $ DISTNAME= dbus-python-1.2.12 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python//} @@ -10,14 +10,14 @@ HOMEPAGE= http://www.freedesktop.org/Software/dbus COMMENT= Python bindings for the D-BUS message bus system LICENSE= mit -USE_TOOLS+= pkg-config gmake -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --disable-html-docs --disable-api-docs +USE_TOOLS+= pkg-config gmake +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --disable-html-docs --disable-api-docs PY_PATCHPLIST= YES # py-expat is only needed at runtime -DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat +DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat BUILDLINK_TRANSFORM.SunOS+= rm:-std=c9x diff --git a/sysutils/py-gnome-menus/Makefile b/sysutils/py-gnome-menus/Makefile index b087d6f255d..06452d9e299 100644 --- a/sysutils/py-gnome-menus/Makefile +++ b/sysutils/py-gnome-menus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2019/09/02 13:20:08 adam Exp $ +# $NetBSD: Makefile,v 1.37 2019/11/04 21:28:51 rillig Exp $ DISTNAME= gnome-menus-2.30.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -18,10 +18,10 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake intltool msgfmt pkg-config USE_LIBTOOL= yes -CONFIGURE_ARGS+= --enable-python -BUILD_DIRS= python -INSTALL_DIRS= python -PY_PATCHPLIST= yes +CONFIGURE_ARGS+= --enable-python +BUILD_DIRS= python +INSTALL_DIRS= python +PY_PATCHPLIST= yes PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 2.30.5 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0 diff --git a/sysutils/py-notify-python/Makefile b/sysutils/py-notify-python/Makefile index 7a38a078078..2605fca4bf3 100644 --- a/sysutils/py-notify-python/Makefile +++ b/sysutils/py-notify-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2019/09/02 13:20:08 adam Exp $ +# $NetBSD: Makefile,v 1.28 2019/11/04 21:28:51 rillig Exp $ DISTNAME= notify-python-0.1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -19,9 +19,9 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config -PKGCONFIG_OVERRIDE+= notify-python.pc.in -PY_PATCHPLIST= yes -PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 +PKGCONFIG_OVERRIDE+= notify-python.pc.in +PY_PATCHPLIST= yes +PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 # Missing function attach_status_icon # http://trac.galago-project.org/ticket/121 diff --git a/sysutils/py-pefile/Makefile b/sysutils/py-pefile/Makefile index 1fc55a3a8f2..372fe6ea624 100644 --- a/sysutils/py-pefile/Makefile +++ b/sysutils/py-pefile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/09/02 13:20:08 adam Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/04 21:28:51 rillig Exp $ PEFILE_VERSION= 1.2.10-139 DISTNAME= pefile-${PEFILE_VERSION} @@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/erocarrera/pefile COMMENT= Python module to read and work with PE files LICENSE= modified-bsd -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 EGG_NAME= pefile-${PEFILE_VERSION:S/-/.post/} diff --git a/sysutils/qdirstat/Makefile b/sysutils/qdirstat/Makefile index faac1c832bf..d8a57235fc1 100644 --- a/sysutils/qdirstat/Makefile +++ b/sysutils/qdirstat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/08/27 22:28:50 markd Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/04 21:28:51 rillig Exp $ DISTNAME= qdirstat-1.6 CATEGORIES= sysutils @@ -14,7 +14,7 @@ USE_TOOLS+= perl:run REPLACE_PERL+= scripts/qdirstat-cache-writer -#SUBST_CLASSES+= filemanager +#SUBST_CLASSES+= filemanager #SUBST_STAGE.filemanager= post-patch #SUBST_MESSAGE.filemanager= Use dolphin not konqueror #SUBST_FILES.filemanager= src/Cleanup.cpp @@ -26,7 +26,7 @@ pre-configure: do-configure: cd ${WRKSRC} && qmake -INSTALLATION_DIRS= bin share/applications share/pixmaps +INSTALLATION_DIRS= bin share/applications share/pixmaps do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/qdirstat ${DESTDIR}${PREFIX}/bin/qdirstat diff --git a/sysutils/radmind/Makefile b/sysutils/radmind/Makefile index 95320977646..3362b04a949 100644 --- a/sysutils/radmind/Makefile +++ b/sysutils/radmind/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2019/05/09 09:37:36 hauke Exp $ +# $NetBSD: Makefile,v 1.42 2019/11/04 21:28:51 rillig Exp $ # DISTNAME= radmind-1.14.1 @@ -17,7 +17,7 @@ CONFIGURE_ARGS+= --with-radminddir=${RADMINDDIR} CONFIGURE_ENV+= diffpath=${TOOLS_DIFF:Q} # XXX configure script checks for path to echo, which pkgsrc does not # provide, so we need to side-step {echopath}. -CONFIGURE_ENV+= ac_cv_path_echopath=${TOOLS_ECHO:Q} +CONFIGURE_ENV+= ac_cv_path_echopath=${TOOLS_ECHO:Q} MAKE_JOBS_SAFE= no diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile index 0678ad95a27..cad0192e47e 100644 --- a/sysutils/rdiff-backup/Makefile +++ b/sysutils/rdiff-backup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2019/09/02 13:20:09 adam Exp $ +# $NetBSD: Makefile,v 1.58 2019/11/04 21:28:51 rillig Exp $ DISTNAME= rdiff-backup-1.2.8 PKGREVISION= 9 @@ -9,7 +9,7 @@ MAINTAINER= snj@NetBSD.org HOMEPAGE= http://www.nongnu.org/rdiff-backup/ COMMENT= Remote incremental backup utility -PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.2.8 +PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.2.8 SUBST_CLASSES+= path SUBST_STAGE.path= pre-configure diff --git a/sysutils/rmtrash/Makefile b/sysutils/rmtrash/Makefile index 041752ca9cc..7aeebb761a3 100644 --- a/sysutils/rmtrash/Makefile +++ b/sysutils/rmtrash/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.3 2015/05/17 12:12:49 mef Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/04 21:28:51 rillig Exp $ DISTNAME= rmtrash-1.11 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GITHUB:=PhrozenByte/} GITHUB_TAG= v${PKGVERSION_NOREV} -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://github.com/PhrozenByte/rmtrash/ -COMMENT= Put files into OS X' trash when deleting them -LICENSE= gnu-gpl-v3 +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= https://github.com/PhrozenByte/rmtrash/ +COMMENT= Put files into OS X' trash when deleting them +LICENSE= gnu-gpl-v3 #' (to pair above single quote for some editors) USE_LANGUAGES= # none USE_TOOLS+= bash:run diff --git a/sysutils/same/Makefile b/sysutils/same/Makefile index 561e131c750..1337b94198b 100644 --- a/sysutils/same/Makefile +++ b/sysutils/same/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2014/10/09 14:06:59 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/04 21:28:52 rillig Exp $ DISTNAME= same-1.8 CATEGORIES= sysutils @@ -8,7 +8,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.bitwizard.nl/ COMMENT= Find identical files and link(2) them to save disk space -AUTO_MKDIRS= yes +AUTO_MKDIRS= yes USE_BSD_MAKEFILE= yes post-extract: diff --git a/sysutils/sarah/Makefile b/sysutils/sarah/Makefile index eb9d7272d70..df5a552df09 100644 --- a/sysutils/sarah/Makefile +++ b/sysutils/sarah/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2019/08/11 13:23:16 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/04 21:28:52 rillig Exp $ DISTNAME= sarah-0.9.1b PKGREVISION= 7 @@ -15,7 +15,7 @@ NO_BUILD= YES INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/sarah \ share/examples/sarah -CONF_FILES+= ${PREFIX}/share/examples/sarah/sarah.conf.sample \ +CONF_FILES+= ${PREFIX}/share/examples/sarah/sarah.conf.sample \ ${PKG_SYSCONFDIR}/sarah.conf post-patch: diff --git a/sysutils/screentest/Makefile b/sysutils/screentest/Makefile index c30b9091e6f..8f695d69245 100644 --- a/sysutils/screentest/Makefile +++ b/sysutils/screentest/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2019/07/21 22:25:46 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2019/11/04 21:28:52 rillig Exp $ DISTNAME= screentest-2.0 PKGREVISION= 29 @@ -9,8 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://screentest.sourceforge.net/ COMMENT= CRT/LCD screen testing utility using GTK+ -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config msgfmt +GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config msgfmt USE_PKGLOCALEDIR= yes INSTALLATION_DIRS+= share/doc/screentest diff --git a/sysutils/shc/Makefile b/sysutils/shc/Makefile index 63e43c63994..a42c1de35a9 100644 --- a/sysutils/shc/Makefile +++ b/sysutils/shc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2015/07/27 16:32:55 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:52 rillig Exp $ # DISTNAME= shc-3.8.9 @@ -9,7 +9,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.datsi.fi.upm.es/~frosal/ COMMENT= Shell script to C compiler -LICENSE= gnu-gpl-v2 +LICENSE= gnu-gpl-v2 MAKE_FILE= makefile MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} diff --git a/sysutils/skill/Makefile b/sysutils/skill/Makefile index cd29eb6fc77..f1090084146 100644 --- a/sysutils/skill/Makefile +++ b/sysutils/skill/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2018/01/14 10:39:30 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2019/11/04 21:28:52 rillig Exp $ DISTNAME= skill-4.1.4 CATEGORIES= sysutils @@ -9,7 +9,7 @@ MAINTAINER= kim@tac.nyc.ny.us HOMEPAGE= http://www.marjum.com/jeffware.html COMMENT= Signal processes given user names, ttys, commands, or pids -BROKEN_ON_PLATFORM+= Interix-*-* # currently no machdep support +BROKEN_ON_PLATFORM+= Interix-*-* # currently no machdep support MAKE_ENV.AIX+= OSTYPE=aix-3 MAKE_ENV.Darwin+= OSTYPE=nbsd-44 diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile index ca45cecd4f3..f69ddede6bc 100644 --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2019/03/15 10:04:00 bouyer Exp $ +# $NetBSD: Makefile,v 1.35 2019/11/04 21:28:52 rillig Exp $ .include "../../sysutils/syslog-ng/Makefile.common" @@ -45,7 +45,7 @@ PKGCONFIG_OVERRIDE= libtest/syslog-ng-test.pc.in \ post-install: ${INSTALL_DATA} ${WRKSRC}/contrib/syslog-ng.conf.doc ${DESTDIR}${DOCDIR} .for f in syslog-ng.conf.HP-UX syslog-ng.conf.RedHat syslog-ng.conf.SunOS - ${INSTALL_DATA} ${WRKSRC}/contrib/${f} ${DESTDIR}${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/contrib/${f} ${DESTDIR}${EGDIR} .endfor ${INSTALL_SCRIPT} ${WRKSRC}/contrib/syslog2ng ${DESTDIR}${PREFIX}/bin diff --git a/sysutils/syslog-ng/Makefile.common b/sysutils/syslog-ng/Makefile.common index dd832124bd6..5c2df47901f 100644 --- a/sysutils/syslog-ng/Makefile.common +++ b/sysutils/syslog-ng/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2019/07/11 11:20:06 sevan Exp $ +# $NetBSD: Makefile.common,v 1.15 2019/11/04 21:28:52 rillig Exp $ # used by sysutils/syslog-ng/Makefile # used by sysutils/syslog-ng/Makefile.module @@ -53,7 +53,7 @@ SUBST_STAGE.unamepath= post-configure SUBST_FILES.unamepath= contrib/syslog2ng SUBST_VARS.unamepath= UNAME -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 REPLACE_AWK+= contrib/syslog2ng REPLACE_PYTHON+= lib/merge-grammar.py diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile index c6be19f65ca..7e2a5dfa007 100644 --- a/sysutils/system-tools-backends/Makefile +++ b/sysutils/system-tools-backends/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2019/08/11 13:23:17 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2019/11/04 21:28:52 rillig Exp $ # DISTNAME= system-tools-backends-2.6.1 @@ -46,7 +46,7 @@ DEPENDS+= p5-URI>=1.37:../../www/p5-URI REPLACE_PERL+= SystemToolsBackends.pl.in REPLACE_PERL+= Utils/*.pm -SUBST_CLASSES+= gettext-package +SUBST_CLASSES+= gettext-package SUBST_STAGE.gettext-package= post-configure SUBST_FILES.gettext-package= po/Makefile SUBST_SED.gettext-package= -e 's|@GETTEXT_PACKAGE@|system-tools-backends|g' diff --git a/sysutils/tarsnap-gui/Makefile b/sysutils/tarsnap-gui/Makefile index 075778cdb34..40c3d283824 100644 --- a/sysutils/tarsnap-gui/Makefile +++ b/sysutils/tarsnap-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2019/09/18 14:17:17 ryoon Exp $ +# $NetBSD: Makefile,v 1.27 2019/11/04 21:28:52 rillig Exp $ DISTNAME= tarsnap-gui-1.0.2 PKGREVISION= 2 @@ -13,8 +13,8 @@ LICENSE= 2-clause-bsd DEPENDS+= tarsnap-[0-9]*:../../sysutils/tarsnap -USE_LIBTOOL= yes -USE_LANGUAGES= c++ +USE_LIBTOOL= yes +USE_LANGUAGES= c++ INSTALLATION_DIRS= bin do-configure: diff --git a/sysutils/tdir/Makefile b/sysutils/tdir/Makefile index e4fc18b0761..1c48dd7a8b4 100644 --- a/sysutils/tdir/Makefile +++ b/sysutils/tdir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2019/04/25 07:33:21 maya Exp $ +# $NetBSD: Makefile,v 1.27 2019/11/04 21:28:53 rillig Exp $ # DISTNAME= tdir-1.71 @@ -11,7 +11,7 @@ COMMENT= Display directories with files ordered by ending "extension" LICENSE= tdir-license USE_TOOLS+= gunzip -REPLACE_PYTHON= tdir +REPLACE_PYTHON= tdir INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/tdir do-install: diff --git a/sysutils/tenshi/Makefile b/sysutils/tenshi/Makefile index b59e120edfa..28094962292 100644 --- a/sysutils/tenshi/Makefile +++ b/sysutils/tenshi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2019/08/11 13:23:17 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/04 21:28:53 rillig Exp $ # DISTNAME= tenshi-0.15 @@ -19,7 +19,7 @@ BUILD_DEFS+= VARBASE DEPENDS+= p5-IO-BufferedSelect>=1.0:../../sysutils/p5-IO-BufferedSelect -SUBST_CLASSES+= tenshi +SUBST_CLASSES+= tenshi SUBST_STAGE.tenshi= pre-build SUBST_FILES.tenshi= tenshi tenshi.conf tenshi.8 SUBST_SED.tenshi= -e 's,/etc/tenshi/tenshi.conf,${PKG_SYSCONFDIR}/tenshi.conf,g' diff --git a/sysutils/tkdesk/Makefile b/sysutils/tkdesk/Makefile index d1ac62b021b..2e18f8688d6 100644 --- a/sysutils/tkdesk/Makefile +++ b/sysutils/tkdesk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2018/03/12 11:17:37 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2019/11/04 21:28:53 rillig Exp $ # DISTNAME= tkdesk-2.0 @@ -11,18 +11,18 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://tkdesk.sourceforge.net/ COMMENT= Graphical file manager -PATCHFILES= ${DISTNAME}p1.patch ${DISTNAME}p2.patch +PATCHFILES= ${DISTNAME}p1.patch ${DISTNAME}p2.patch PATCH_DIST_STRIP= -p1 -PATCH_SITES= http://tkdesk.sourceforge.net/patches/ +PATCH_SITES= http://tkdesk.sourceforge.net/patches/ USE_TOOLS+= pax -GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--with-tcl=${BUILDLINK_PREFIX.tcl}/lib \ - --with-tk=${BUILDLINK_PREFIX.tk}/lib \ - --with-itcl=${BUILDLINK_PREFIX.tcl}/lib/itcl${ITCL_VERSION} \ - --with-blt=${BUILDLINK_PREFIX.blt}/lib -MAKE_ENV+= LIB_RUNTIME_DIR=${BUILDLINK_PREFIX.tcl}/lib/itcl${ITCL_VERSION} +GNU_CONFIGURE= YES +CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib \ + --with-tk=${BUILDLINK_PREFIX.tk}/lib \ + --with-itcl=${BUILDLINK_PREFIX.tcl}/lib/itcl${ITCL_VERSION} \ + --with-blt=${BUILDLINK_PREFIX.blt}/lib +MAKE_ENV+= LIB_RUNTIME_DIR=${BUILDLINK_PREFIX.tcl}/lib/itcl${ITCL_VERSION} CFLAGS+= -DUSE_INTERP_RESULT diff --git a/sysutils/toshutils/Makefile b/sysutils/toshutils/Makefile index b041225d1f2..6ed9a50e581 100644 --- a/sysutils/toshutils/Makefile +++ b/sysutils/toshutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2012/10/23 19:51:27 asau Exp $ +# $NetBSD: Makefile,v 1.19 2019/11/04 21:28:53 rillig Exp $ # DISTNAME= toshutils-991217 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.buzzard.me.uk/toshiba/ COMMENT= NetBSD port of the Toshiba(tm) Linux Utilities LICENSE= gnu-gpl-v2 -ONLY_FOR_PLATFORM= *-*-i386 +ONLY_FOR_PLATFORM= *-*-i386 MAKE_JOBS_SAFE= no diff --git a/sysutils/tpb/Makefile b/sysutils/tpb/Makefile index b9960215c66..7e261358ca5 100644 --- a/sysutils/tpb/Makefile +++ b/sysutils/tpb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2013/06/01 12:18:23 shattered Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/04 21:28:53 rillig Exp $ # DISTNAME= tpb-0.6.4 @@ -10,11 +10,11 @@ MAINTAINER= soren@NetBSD.org HOMEPAGE= http://www.nongnu.org/tpb/ COMMENT= Utility to enable the IBM ThinkPad(tm) special keys -ONLY_FOR_PLATFORM= *-*-i386 +ONLY_FOR_PLATFORM= *-*-i386 USE_PKGLOCALEDIR= yes USE_TOOLS+= msgfmt -GNU_CONFIGURE= YES +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} diff --git a/sysutils/tsm8/Makefile b/sysutils/tsm8/Makefile index 6c41ca32592..1df8b548e28 100644 --- a/sysutils/tsm8/Makefile +++ b/sysutils/tsm8/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2019/05/21 10:55:52 hauke Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/04 21:28:53 rillig Exp $ DISTNAME= tsm-${PKGVER} PKGVER= 8.1.7.0 @@ -28,7 +28,7 @@ BUILD_DEFS+= VARBASE # See the license agreements in {PREFIX}/emul/linux/opt/tivoli/tsm/license/ RESTRICTED= Redistribution of repackaged binaries not permitted NO_SRC_ON_CDROM= ${RESTRICTED} -NO_SRC_ON_FTP= ${RESTRICTED} +NO_SRC_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} @@ -67,10 +67,10 @@ TSMCLIENTSUBDIR= opt/tivoli/tsm/client PRINT_PLIST_AWK+= { gsub(/^.+\.jar$$/, "$${PLIST.java}&"); } PRINT_PLIST_AWK+= { gsub(/^.+\/dsmj$$/, "$${PLIST.java}&"); } -SUBST_CLASSES+= paths -SUBST_MESSAGE.paths= Fixing hardcoded paths. -SUBST_STAGE.paths= pre-install -SUBST_FILES.paths= tsm_daily.sh +SUBST_CLASSES+= paths +SUBST_MESSAGE.paths= Fixing hardcoded paths. +SUBST_STAGE.paths= pre-install +SUBST_FILES.paths= tsm_daily.sh SUBST_SED.paths= -e "s,%PKG_SYSCONFDIR%,${PKG_SYSCONFDIR},g" SUBST_SED.paths+= -e "s,%PREFIX%,${PREFIX},g" SUBST_SED.paths+= -e "s,%VARBASE%,${VARBASE},g" diff --git a/sysutils/u-boot-a10-olinuxino-lime/Makefile b/sysutils/u-boot-a10-olinuxino-lime/Makefile index 3f947de9e41..21627e9f9ef 100644 --- a/sysutils/u-boot-a10-olinuxino-lime/Makefile +++ b/sysutils/u-boot-a10-olinuxino-lime/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:23 thorpej Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:53 rillig Exp $ UBOOT_TARGET= a10-olinuxino-lime UBOOT_CONFIG= A10-OLinuXino-Lime_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-a20-olinuxino-lime2-emmc/Makefile b/sysutils/u-boot-a20-olinuxino-lime2-emmc/Makefile index 076b0762b7c..55b78875489 100644 --- a/sysutils/u-boot-a20-olinuxino-lime2-emmc/Makefile +++ b/sysutils/u-boot-a20-olinuxino-lime2-emmc/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.4 2019/09/19 04:47:02 thorpej Exp $ +# $NetBSD: Makefile,v 1.5 2019/11/04 21:28:53 rillig Exp $ UBOOT_TARGET= a20-olinuxino-lime2-emmc UBOOT_CONFIG= A20-OLinuXino-Lime2-eMMC_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 3 diff --git a/sysutils/u-boot-a20-olinuxino-lime2/Makefile b/sysutils/u-boot-a20-olinuxino-lime2/Makefile index b0b979a6d8e..b8b543b2245 100644 --- a/sysutils/u-boot-a20-olinuxino-lime2/Makefile +++ b/sysutils/u-boot-a20-olinuxino-lime2/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2019/07/18 19:18:33 bouyer Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/04 21:28:53 rillig Exp $ UBOOT_TARGET= a20-olinuxino-lime2 UBOOT_CONFIG= A20-OLinuXino-Lime2_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 1 diff --git a/sysutils/u-boot-bananapi-m2-zero/Makefile b/sysutils/u-boot-bananapi-m2-zero/Makefile index 50bf06aaffa..39dfa41df88 100644 --- a/sysutils/u-boot-bananapi-m2-zero/Makefile +++ b/sysutils/u-boot-bananapi-m2-zero/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2019/06/05 05:43:15 thorpej Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/04 21:28:54 rillig Exp $ UBOOT_TARGET= bananapi-m2-zero UBOOT_CONFIG= bananapi_m2_zero_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist .include "../../sysutils/u-boot/u-boot-arm.mk" diff --git a/sysutils/u-boot-bananapi-m3/Makefile b/sysutils/u-boot-bananapi-m3/Makefile index 293dc7c7dee..a742ea3820a 100644 --- a/sysutils/u-boot-bananapi-m3/Makefile +++ b/sysutils/u-boot-bananapi-m3/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:23 thorpej Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:54 rillig Exp $ UBOOT_TARGET= bananapi-m3 UBOOT_CONFIG= Sinovoip_BPI_M3_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-bananapi-p2-zero/Makefile b/sysutils/u-boot-bananapi-p2-zero/Makefile index 31eb4653391..c6ef8cb3e9c 100644 --- a/sysutils/u-boot-bananapi-p2-zero/Makefile +++ b/sysutils/u-boot-bananapi-p2-zero/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2019/06/05 05:43:15 thorpej Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/04 21:28:54 rillig Exp $ UBOOT_TARGET= bananapi-p2-zero UBOOT_CONFIG= bananapi_p2_zero_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist .include "../../sysutils/u-boot/u-boot-arm.mk" diff --git a/sysutils/u-boot-bananapi-r2/Makefile b/sysutils/u-boot-bananapi-r2/Makefile index 2eaf3b659e6..203b0693906 100644 --- a/sysutils/u-boot-bananapi-r2/Makefile +++ b/sysutils/u-boot-bananapi-r2/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.5 2019/07/26 10:25:15 tnn Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/04 21:28:54 rillig Exp $ UBOOT_TARGET= bananapi-r2 UBOOT_CONFIG= mt7623n_bpir2_defconfig UBOOT_BIN= bpi-r2-sdmmc.img u-boot.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 3 @@ -22,12 +22,12 @@ CHECK_PORTABILITY_SKIP+= tools/imx8m_image.sh SDMMC_BOOT_IMG= BPI-R2-HEAD440-0k.img DISTFILES+= ${SDMMC_BOOT_IMG} UBOOT_BIN+= ${SDMMC_BOOT_IMG} -SITES.${SDMMC_BOOT_IMG}=${MASTER_SITE_GITHUB:=BPI-SINOVOIP/BPI-R2-bsp/raw/v1.2.1/mt-pack/mtk/bpi-r2/bin/} +SITES.${SDMMC_BOOT_IMG}= ${MASTER_SITE_GITHUB:=BPI-SINOVOIP/BPI-R2-bsp/raw/v1.2.1/mt-pack/mtk/bpi-r2/bin/} # BRLYT-signature BRLYT_IMG= BPI-R2-HEAD1-512b.img DISTFILES+= ${BRLYT_IMG} -UBOOT_BIN+= ${BRLYT_IMG} +UBOOT_BIN+= ${BRLYT_IMG} SITES.${BRLYT_IMG}= ${MASTER_SITE_GITHUB:=BPI-SINOVOIP/BPI-R2-bsp/raw/v1.2.1/mt-pack/mtk/bpi-r2/bin/} # Preloader diff --git a/sysutils/u-boot-bananapi/Makefile b/sysutils/u-boot-bananapi/Makefile index b2ce27d9b90..ca0a815b578 100644 --- a/sysutils/u-boot-bananapi/Makefile +++ b/sysutils/u-boot-bananapi/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:23 thorpej Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:54 rillig Exp $ UBOOT_TARGET= bananapi UBOOT_CONFIG= Bananapi_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-bananapro/Makefile b/sysutils/u-boot-bananapro/Makefile index 745e864536d..9a3a8231007 100644 --- a/sysutils/u-boot-bananapro/Makefile +++ b/sysutils/u-boot-bananapro/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2019/05/29 03:24:02 thorpej Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/04 21:28:54 rillig Exp $ UBOOT_TARGET= bananapro UBOOT_CONFIG= Bananapro_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist .include "../../sysutils/u-boot/u-boot-arm.mk" diff --git a/sysutils/u-boot-beagleboard/Makefile b/sysutils/u-boot-beagleboard/Makefile index ae926834a75..dfd768f61cb 100644 --- a/sysutils/u-boot-beagleboard/Makefile +++ b/sysutils/u-boot-beagleboard/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2019/05/08 05:14:19 thorpej Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/04 21:28:54 rillig Exp $ UBOOT_TARGET= beagleboard UBOOT_CONFIG= omap3_beagle_defconfig UBOOT_BIN= u-boot.img -UBOOT_BIN+= MLO +UBOOT_BIN+= MLO -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-beagleboneblack/Makefile b/sysutils/u-boot-beagleboneblack/Makefile index 93afc4f5950..2b6ee0a3ce5 100644 --- a/sysutils/u-boot-beagleboneblack/Makefile +++ b/sysutils/u-boot-beagleboneblack/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.6 2019/05/08 05:14:20 thorpej Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/04 21:28:54 rillig Exp $ UBOOT_TARGET= beagleboneblack UBOOT_CONFIG= am335x_boneblack_defconfig UBOOT_BIN= u-boot.img -UBOOT_BIN+= MLO +UBOOT_BIN+= MLO -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-beaglebonewhite/Makefile b/sysutils/u-boot-beaglebonewhite/Makefile index 307546e92d2..045cfe1cfc2 100644 --- a/sysutils/u-boot-beaglebonewhite/Makefile +++ b/sysutils/u-boot-beaglebonewhite/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2019/05/08 05:14:20 thorpej Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/04 21:28:55 rillig Exp $ UBOOT_TARGET= beaglebonewhite UBOOT_CONFIG= am335x_evm_defconfig UBOOT_BIN= u-boot.img -UBOOT_BIN+= MLO +UBOOT_BIN+= MLO -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-chip-pro/Makefile b/sysutils/u-boot-chip-pro/Makefile index ff0b20e7822..86bbd2ed436 100644 --- a/sysutils/u-boot-chip-pro/Makefile +++ b/sysutils/u-boot-chip-pro/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:23 thorpej Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:55 rillig Exp $ UBOOT_TARGET= chip-pro UBOOT_CONFIG= CHIP_pro_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-chip/Makefile b/sysutils/u-boot-chip/Makefile index fc50a5356d6..a7494a81855 100644 --- a/sysutils/u-boot-chip/Makefile +++ b/sysutils/u-boot-chip/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:23 thorpej Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:55 rillig Exp $ UBOOT_TARGET= chip UBOOT_CONFIG= CHIP_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-cubieboard2/Makefile b/sysutils/u-boot-cubieboard2/Makefile index 2e0ba91b173..292ebdbbe62 100644 --- a/sysutils/u-boot-cubieboard2/Makefile +++ b/sysutils/u-boot-cubieboard2/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:23 thorpej Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:55 rillig Exp $ UBOOT_TARGET= cubieboard2 UBOOT_CONFIG= Cubieboard2_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-cubieboard4/Makefile b/sysutils/u-boot-cubieboard4/Makefile index 53486b133dd..5ae81cf9cc8 100644 --- a/sysutils/u-boot-cubieboard4/Makefile +++ b/sysutils/u-boot-cubieboard4/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:23 thorpej Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:55 rillig Exp $ UBOOT_TARGET= cubieboard4 UBOOT_CONFIG= Cubieboard4_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-cubietruck-plus/Makefile b/sysutils/u-boot-cubietruck-plus/Makefile index 9f2ca45f49f..a4c3d148caf 100644 --- a/sysutils/u-boot-cubietruck-plus/Makefile +++ b/sysutils/u-boot-cubietruck-plus/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2019/05/07 14:06:23 thorpej Exp $ +# $NetBSD: Makefile,v 1.4 2019/11/04 21:28:55 rillig Exp $ UBOOT_TARGET= cubietruck-plus UBOOT_CONFIG= Cubietruck_plus_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 2 diff --git a/sysutils/u-boot-cubietruck/Makefile b/sysutils/u-boot-cubietruck/Makefile index b17b3b701d5..578422c76f9 100644 --- a/sysutils/u-boot-cubietruck/Makefile +++ b/sysutils/u-boot-cubietruck/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:24 thorpej Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:55 rillig Exp $ UBOOT_TARGET= cubietruck UBOOT_CONFIG= Cubietruck_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-hummingbird-a31/Makefile b/sysutils/u-boot-hummingbird-a31/Makefile index a1de5b18fa7..34270307744 100644 --- a/sysutils/u-boot-hummingbird-a31/Makefile +++ b/sysutils/u-boot-hummingbird-a31/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:24 thorpej Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:55 rillig Exp $ UBOOT_TARGET= hummingbird-a31 UBOOT_CONFIG= Hummingbird_A31_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-lamobo-r1/Makefile b/sysutils/u-boot-lamobo-r1/Makefile index 30be0613456..5c5f79c9ec8 100644 --- a/sysutils/u-boot-lamobo-r1/Makefile +++ b/sysutils/u-boot-lamobo-r1/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2019/05/25 01:41:11 thorpej Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/04 21:28:56 rillig Exp $ UBOOT_TARGET= lamobo-r1 UBOOT_CONFIG= Lamobo_R1_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist .include "../../sysutils/u-boot/u-boot-arm.mk" diff --git a/sysutils/u-boot-nanopi-duo2/Makefile b/sysutils/u-boot-nanopi-duo2/Makefile index fb0b6126b04..770ced4dede 100644 --- a/sysutils/u-boot-nanopi-duo2/Makefile +++ b/sysutils/u-boot-nanopi-duo2/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2019/10/08 21:37:28 bad Exp $ +# $NetBSD: Makefile,v 1.2 2019/11/04 21:28:56 rillig Exp $ UBOOT_TARGET= nanopi-duo2 UBOOT_CONFIG= nanopi_duo2_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist .include "../../sysutils/u-boot/u-boot-arm.mk" diff --git a/sysutils/u-boot-nanopi-m1/Makefile b/sysutils/u-boot-nanopi-m1/Makefile index aedc68a50c3..b4173ea3ed1 100644 --- a/sysutils/u-boot-nanopi-m1/Makefile +++ b/sysutils/u-boot-nanopi-m1/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.5 2019/05/07 14:06:24 thorpej Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/04 21:28:56 rillig Exp $ UBOOT_TARGET= nanopi-m1 UBOOT_CONFIG= nanopi_m1_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-nanopi-neo-plus2/Makefile b/sysutils/u-boot-nanopi-neo-plus2/Makefile index 9b552d717dd..79d95b5ec27 100644 --- a/sysutils/u-boot-nanopi-neo-plus2/Makefile +++ b/sysutils/u-boot-nanopi-neo-plus2/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2019/05/07 14:06:24 thorpej Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/04 21:28:56 rillig Exp $ UBOOT_TARGET= nanopi-neo-plus2 UBOOT_CONFIG= nanopi_neo_plus2_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 5 diff --git a/sysutils/u-boot-nanopi-neo/Makefile b/sysutils/u-boot-nanopi-neo/Makefile index 0bec4af0535..7342a0d21f0 100644 --- a/sysutils/u-boot-nanopi-neo/Makefile +++ b/sysutils/u-boot-nanopi-neo/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2019/05/07 14:06:24 thorpej Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/04 21:28:56 rillig Exp $ UBOOT_TARGET= nanopi-neo UBOOT_CONFIG= nanopi_neo_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-nanopi-neo2/Makefile b/sysutils/u-boot-nanopi-neo2/Makefile index 69b2ec1e1d4..ebd037e8dd0 100644 --- a/sysutils/u-boot-nanopi-neo2/Makefile +++ b/sysutils/u-boot-nanopi-neo2/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.9 2019/05/07 14:06:24 thorpej Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/04 21:28:56 rillig Exp $ UBOOT_TARGET= nanopi-neo2 UBOOT_CONFIG= nanopi_neo2_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 5 diff --git a/sysutils/u-boot-nanopi-r1/Makefile b/sysutils/u-boot-nanopi-r1/Makefile index ebc27f643ee..ac0af9f786e 100644 --- a/sysutils/u-boot-nanopi-r1/Makefile +++ b/sysutils/u-boot-nanopi-r1/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2019/10/16 23:40:14 bad Exp $ +# $NetBSD: Makefile,v 1.3 2019/11/04 21:28:56 rillig Exp $ UBOOT_TARGET= nanopi-r1 UBOOT_CONFIG= nanopi_r1_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 1 diff --git a/sysutils/u-boot-odroid-c2/Makefile b/sysutils/u-boot-odroid-c2/Makefile index 0b75609f169..dafe147eb3f 100644 --- a/sysutils/u-boot-odroid-c2/Makefile +++ b/sysutils/u-boot-odroid-c2/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.5 2019/07/26 10:32:32 tnn Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/04 21:28:56 rillig Exp $ UBOOT_TARGET= odroid-c2 UBOOT_CONFIG= odroid-c2_defconfig UBOOT_BIN= u-boot.gxbb -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 3 diff --git a/sysutils/u-boot-orangepi-2/Makefile b/sysutils/u-boot-orangepi-2/Makefile index 3664cbce172..39ba1ca01c3 100644 --- a/sysutils/u-boot-orangepi-2/Makefile +++ b/sysutils/u-boot-orangepi-2/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.9 2019/05/07 14:06:24 thorpej Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/04 21:28:56 rillig Exp $ UBOOT_TARGET= orangepi-2 UBOOT_CONFIG= orangepi_2_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-orangepi-one/Makefile b/sysutils/u-boot-orangepi-one/Makefile index 949f12c549e..f27ef83b15f 100644 --- a/sysutils/u-boot-orangepi-one/Makefile +++ b/sysutils/u-boot-orangepi-one/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:24 thorpej Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:57 rillig Exp $ UBOOT_TARGET= orangepi-one UBOOT_CONFIG= orangepi_one_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-orangepi-plus2e/Makefile b/sysutils/u-boot-orangepi-plus2e/Makefile index 23a7e3c0ecf..dc656a40503 100644 --- a/sysutils/u-boot-orangepi-plus2e/Makefile +++ b/sysutils/u-boot-orangepi-plus2e/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.9 2019/05/07 14:06:24 thorpej Exp $ +# $NetBSD: Makefile,v 1.10 2019/11/04 21:28:57 rillig Exp $ UBOOT_TARGET= orangepi-plus2e UBOOT_CONFIG= orangepi_plus2e_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-orangepi-zero-plus/Makefile b/sysutils/u-boot-orangepi-zero-plus/Makefile index 570788110bc..741147ee7ad 100644 --- a/sysutils/u-boot-orangepi-zero-plus/Makefile +++ b/sysutils/u-boot-orangepi-zero-plus/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.6 2019/05/07 14:06:24 thorpej Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/04 21:28:57 rillig Exp $ UBOOT_TARGET= orangepi-zero-plus UBOOT_CONFIG= orangepi_zero_plus_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 5 # Switch to EL1 before booting kernel (required for 32-bit support) -PKG_DEFAULT_OPTIONS+= el1 +PKG_DEFAULT_OPTIONS+= el1 post-extract: ${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i_a64/bl31.bin ${WRKSRC} diff --git a/sysutils/u-boot-orangepi-zero/Makefile b/sysutils/u-boot-orangepi-zero/Makefile index 5b37c344250..ffcb5d7fbf4 100644 --- a/sysutils/u-boot-orangepi-zero/Makefile +++ b/sysutils/u-boot-orangepi-zero/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.5 2019/05/07 14:06:25 thorpej Exp $ +# $NetBSD: Makefile,v 1.6 2019/11/04 21:28:57 rillig Exp $ UBOOT_TARGET= orangepi-zero UBOOT_CONFIG= orangepi_zero_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-pine-h64/Makefile b/sysutils/u-boot-pine-h64/Makefile index c2089da5317..2f4bf408894 100644 --- a/sysutils/u-boot-pine-h64/Makefile +++ b/sysutils/u-boot-pine-h64/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2019/05/07 14:06:25 thorpej Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:57 rillig Exp $ UBOOT_TARGET= pine-h64 UBOOT_CONFIG= pine_h64_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-pine64/Makefile b/sysutils/u-boot-pine64/Makefile index 57c177900a0..4a8e25d72d9 100644 --- a/sysutils/u-boot-pine64/Makefile +++ b/sysutils/u-boot-pine64/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2019/05/07 14:06:25 thorpej Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/04 21:28:57 rillig Exp $ UBOOT_TARGET= pine64 UBOOT_CONFIG= pine64_plus_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 5 diff --git a/sysutils/u-boot-pinebook/Makefile b/sysutils/u-boot-pinebook/Makefile index 6e4e39986ed..845363d1962 100644 --- a/sysutils/u-boot-pinebook/Makefile +++ b/sysutils/u-boot-pinebook/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.13 2019/05/07 14:06:25 thorpej Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/04 21:28:57 rillig Exp $ UBOOT_VERSION= 2018.11rc3 UBOOT_TARGET= pinebook UBOOT_CONFIG= pinebook_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist # Use anarsoul's fork of mainline U-Boot with Pinebook support patched in MASTER_SITES= ${MASTER_SITE_GITHUB:=anarsoul/} @@ -27,4 +27,4 @@ post-build: .include "../../sysutils/arm-trusted-firmware-sun50i_a64/buildlink3.mk" .include "../../sysutils/u-boot/u-boot-arm64.mk" -CHECK_PORTABILITY_SKIP+=tools/imx_cntr_image.sh +CHECK_PORTABILITY_SKIP+= tools/imx_cntr_image.sh diff --git a/sysutils/u-boot-pocketchip/Makefile b/sysutils/u-boot-pocketchip/Makefile index acc89a849eb..2790c2b5514 100644 --- a/sysutils/u-boot-pocketchip/Makefile +++ b/sysutils/u-boot-pocketchip/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2019/05/07 14:06:25 thorpej Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/04 21:28:57 rillig Exp $ UBOOT_TARGET= pocketchip UBOOT_CONFIG= CHIP_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 4 diff --git a/sysutils/u-boot-sopine-baseboard/Makefile b/sysutils/u-boot-sopine-baseboard/Makefile index d290408427e..d124aa86db0 100644 --- a/sysutils/u-boot-sopine-baseboard/Makefile +++ b/sysutils/u-boot-sopine-baseboard/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.6 2019/05/07 14:06:25 thorpej Exp $ +# $NetBSD: Makefile,v 1.7 2019/11/04 21:28:57 rillig Exp $ UBOOT_TARGET= sopine-baseboard UBOOT_CONFIG= sopine_baseboard_defconfig UBOOT_BIN= u-boot-sunxi-with-spl.bin UBOOT_ENV+= DEVICE_TREE=sun50i-a64-sopine-baseboard -UBOOT_INSTALLBOOT_PLIST=installboot.plist +UBOOT_INSTALLBOOT_PLIST= installboot.plist PKGREVISION= 5 diff --git a/sysutils/vcdimager/Makefile b/sysutils/vcdimager/Makefile index d57e33de59b..68fbcd770ae 100644 --- a/sysutils/vcdimager/Makefile +++ b/sysutils/vcdimager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2018/10/09 15:12:38 abs Exp $ +# $NetBSD: Makefile,v 1.29 2019/11/04 21:28:58 rillig Exp $ # DISTNAME= vcdimager-2.0.1 @@ -10,17 +10,17 @@ HOMEPAGE= http://www.gnu.org/software/vcdimager/ COMMENT= Mastering suite for Video CDs LICENSE= gnu-gpl-v2 -USE_LANGUAGES= c c++ -USE_TOOLS+= gmake pkg-config -GNU_CONFIGURE= YES -USE_LIBTOOL= YES -INFO_FILES= YES -PKGCONFIG_OVERRIDE+= libvcdinfo.pc.in +USE_LANGUAGES= c c++ +USE_TOOLS+= gmake pkg-config +GNU_CONFIGURE= YES +USE_LIBTOOL= YES +INFO_FILES= YES +PKGCONFIG_OVERRIDE+= libvcdinfo.pc.in .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS" -BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=libvcdinfo.la.ver +BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=libvcdinfo.la.ver .endif BUILDLINK_API_DEPENDS.libcdio+= libcdio>=0.72 diff --git a/sysutils/virt-manager/Makefile b/sysutils/virt-manager/Makefile index 63b3fb423cc..a37ef326310 100644 --- a/sysutils/virt-manager/Makefile +++ b/sysutils/virt-manager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2019/09/02 13:20:09 adam Exp $ +# $NetBSD: Makefile,v 1.40 2019/11/04 21:28:58 rillig Exp $ DISTNAME= virt-manager-0.9.4 PKGREVISION= 27 @@ -18,7 +18,7 @@ DEPENDS+= urlgrabber>=3.1.0:../../www/urlgrabber DEPENDS+= ${PYPKGPREFIX}-dbus>=1.1.1:../../sysutils/py-dbus DEPENDS+= gtk-vnc>=0.5.1:../../net/gtk-vnc -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-libvirt-package-names=libvirt USE_TOOLS+= gmake intltool msgfmt diff --git a/sysutils/wbm-cluster-useradmin/Makefile b/sysutils/wbm-cluster-useradmin/Makefile index 7ad532cab4d..9009ea17641 100644 --- a/sysutils/wbm-cluster-useradmin/Makefile +++ b/sysutils/wbm-cluster-useradmin/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2017/02/01 12:54:56 mef Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/04 21:28:58 rillig Exp $ WBM_NAME= cluster-useradmin -WBM_DEPEND_MODULES= useradmin +WBM_DEPEND_MODULES= useradmin COMMENT= Webmin module to manage users & groups within a Webmin cluster diff --git a/sysutils/wbm-virtual-server/Makefile b/sysutils/wbm-virtual-server/Makefile index f85c5235e73..6788f6f3877 100644 --- a/sysutils/wbm-virtual-server/Makefile +++ b/sysutils/wbm-virtual-server/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.8 2017/02/24 14:33:38 mef Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/04 21:28:58 rillig Exp $ PKGNAME= wbm-${WBM_NAME}-${WBM_MOD_REV} DISTNAME= ${WBM_NAME}-${WBM_MOD_REV}.gpl MASTER_SITES= http://download.webmin.com/download/virtualmin/ -WBM_NAME= virtual-server -WBM_STD_MODULE= no -WBM_MOD_REV= 5.05 +WBM_NAME= virtual-server +WBM_STD_MODULE= no +WBM_MOD_REV= 5.05 WBM_DEPEND_MODULES= net quota useradmin sendmail apache mysql COMMENT= Webmin module to allow users to control their own virtual servers diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index 47a5dcba06f..03e3adcfcd0 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2019/08/11 13:23:18 wiz Exp $ +# $NetBSD: Makefile,v 1.48 2019/11/04 21:28:58 rillig Exp $ PKGREVISION= 2 .include "version.mk" @@ -10,7 +10,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=webadmin/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.webmin.com/ COMMENT= Perl web server and CGI for Unix system administration -LICENSE= modified-bsd +LICENSE= modified-bsd DEPENDS+= p5-Net-SSLeay-[0-9]*:../../security/p5-Net-SSLeay diff --git a/sysutils/webmin/wbm.mk b/sysutils/webmin/wbm.mk index 982b8576cb6..b9c7bc8f9cb 100644 --- a/sysutils/webmin/wbm.mk +++ b/sysutils/webmin/wbm.mk @@ -1,4 +1,4 @@ -# $NetBSD: wbm.mk,v 1.13 2017/02/01 13:00:44 mef Exp $ +# $NetBSD: wbm.mk,v 1.14 2019/11/04 21:28:58 rillig Exp $ # # Makefile fragment for Webmin modules # @@ -19,24 +19,24 @@ LICENSE= modified-bsd .include "version.mk" -WBM_STD_MODULE?=YES +WBM_STD_MODULE?= YES .if defined(WBM_MOD_REV) && !empty(WBM_MOD_REV) || !empty(WBM_STD_MODULE:M[Nn][Oo]) -PKGNAME?= wbm-${WBM_NAME}-${WBM_VERSION:S/0$/${WBM_MOD_REV}/} -DISTNAME?= ${WBM_NAME}-${WBM_VERSION}-${WBM_MOD_REV} -MASTER_SITES?= http://www.webmin.com/updates/ -EXTRACT_SUFX?= .wbm.gz -EXTRACT_OPTS+= -f tar -WRKSRC?= ${WRKDIR} -WBMSRC= ${WRKDIR}/${WBM_NAME} +PKGNAME?= wbm-${WBM_NAME}-${WBM_VERSION:S/0$/${WBM_MOD_REV}/} +DISTNAME?= ${WBM_NAME}-${WBM_VERSION}-${WBM_MOD_REV} +MASTER_SITES?= http://www.webmin.com/updates/ +EXTRACT_SUFX?= .wbm.gz +EXTRACT_OPTS+= -f tar +WRKSRC?= ${WRKDIR} +WBMSRC= ${WRKDIR}/${WBM_NAME} .else -PKGNAME= wbm-${WBM_NAME}-${WBM_VERSION} -DISTNAME= webmin-${WBM_VERSION} -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=webadmin/} -WBMSRC= ${WRKSRC}/${WBM_NAME} -EXTRACT_ELEMENTS=${DISTNAME}/${WBM_NAME} +PKGNAME= wbm-${WBM_NAME}-${WBM_VERSION} +DISTNAME= webmin-${WBM_VERSION} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=webadmin/} +WBMSRC= ${WRKSRC}/${WBM_NAME} +EXTRACT_ELEMENTS= ${DISTNAME}/${WBM_NAME} .endif -CATEGORIES+= sysutils www +CATEGORIES+= sysutils www MAINTAINER?= pkgsrc-users@NetBSD.org HOMEPAGE?= http://www.webmin.com/standard.html diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile index 8a68b888573..da1d4c04c42 100644 --- a/sysutils/xbattbar/Makefile +++ b/sysutils/xbattbar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2018/05/06 14:32:06 jmcneill Exp $ +# $NetBSD: Makefile,v 1.37 2019/11/04 21:28:58 rillig Exp $ DISTNAME= xbattbar_1.4.2 PKGNAME= ${DISTNAME:S/_/-/} @@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org #HOMEPAGE= http://iplab.aist-nara.ac.jp/member/suguru/xbattbar.html COMMENT= X11 battery graph for laptops -NOT_FOR_PLATFORM= Darwin-*-* +NOT_FOR_PLATFORM= Darwin-*-* WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} diff --git a/sysutils/xentools411/Makefile b/sysutils/xentools411/Makefile index f3c474f64ad..1477bd611af 100644 --- a/sysutils/xentools411/Makefile +++ b/sysutils/xentools411/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/11/03 10:08:34 maya Exp $ +# $NetBSD: Makefile,v 1.11 2019/11/04 21:28:58 rillig Exp $ # VERSION= 4.11.2 VERSION_IPXE= 356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d @@ -14,8 +14,8 @@ MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/ DISTFILES= ${DISTNAME}.tar.gz XEN_EXTFILES= http://xenbits.xensource.com/xen-extfiles/ -DISTFILES+= ${DIST_IPXE} -SITES.${DIST_IPXE} += ${XEN_EXTFILES} +DISTFILES+= ${DIST_IPXE} +SITES.${DIST_IPXE} += ${XEN_EXTFILES} MAINTAINER= bouyer@NetBSD.org HOMEPAGE= https://xenproject.org/ @@ -119,11 +119,11 @@ SUBST_STAGE.proc= pre-configure SUBST_FILES.proc+= tools/ocaml/xenstored/define.ml SUBST_SED.proc= -e "s|/proc|/kern|g" -SUBST_CLASSES+= getopt -SUBST_STAGE.getopt= pre-configure -SUBST_MESSAGE.getopt= Fixing getopt_long_only -SUBST_FILES.getopt+= tools/fuzz/x86_instruction_emulator/afl-harness.c -SUBST_SED.getopt+= -e 's,getopt_long_only,getopt_long,' +SUBST_CLASSES+= getopt +SUBST_STAGE.getopt= pre-configure +SUBST_MESSAGE.getopt= Fixing getopt_long_only +SUBST_FILES.getopt+= tools/fuzz/x86_instruction_emulator/afl-harness.c +SUBST_SED.getopt+= -e 's,getopt_long_only,getopt_long,' OPSYSVARS+= PROCPATH PROCPATH.NetBSD= /kern diff --git a/sysutils/xentools42/Makefile b/sysutils/xentools42/Makefile index 3ec740da775..34ee0c75104 100644 --- a/sysutils/xentools42/Makefile +++ b/sysutils/xentools42/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2019/08/11 13:23:18 wiz Exp $ +# $NetBSD: Makefile,v 1.75 2019/11/04 21:28:58 rillig Exp $ VERSION= 4.2.5 VERSION_IPXE= 1.0.0 @@ -19,12 +19,12 @@ COMMENT= Userland Tools for Xen 4.2.x LICENSE= gnu-gpl-v2 # XXX add version check: Xen requires dev86 >= 0.16.14 -BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware +BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware #.if !exists(/usr/bin/iasl) # XXX broken with iasl 20171110 -BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils +BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils #.endif -DEPENDS+= ${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses -DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml +DEPENDS+= ${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses +DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml PYTHON_VERSIONS_ACCEPTED= 27 diff --git a/sysutils/xentools45/Makefile b/sysutils/xentools45/Makefile index b4e23c093ce..bf038aeae30 100644 --- a/sysutils/xentools45/Makefile +++ b/sysutils/xentools45/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2019/08/11 13:23:18 wiz Exp $ +# $NetBSD: Makefile,v 1.68 2019/11/04 21:28:59 rillig Exp $ VERSION= 4.5.5 PKGREVISION= 16 @@ -19,11 +19,11 @@ COMMENT= Userland Tools for Xen 4.5.x LICENSE= gnu-gpl-v2 # XXX add version check: Xen requires dev86 >= 0.16.14 -BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware +BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware .if !exists(/usr/bin/iasl) -BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils +BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils .endif -DEPENDS+= ${PYPKGPREFIX}-curses>=0:../../devel/py-curses +DEPENDS+= ${PYPKGPREFIX}-curses>=0:../../devel/py-curses PKG_SYSCONFSUBDIR= xen diff --git a/sysutils/xentools48/Makefile b/sysutils/xentools48/Makefile index 9ba244b246d..c21b7004791 100644 --- a/sysutils/xentools48/Makefile +++ b/sysutils/xentools48/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2019/08/30 13:23:10 bouyer Exp $ +# $NetBSD: Makefile,v 1.30 2019/11/04 21:28:59 rillig Exp $ # VERSION= 4.8.5 VERSION_IPXE= 827dd1bfee67daa683935ce65316f7e0f057fe1c @@ -24,8 +24,8 @@ MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/ DISTFILES= ${DISTNAME}.tar.gz XEN_EXTFILES= http://xenbits.xensource.com/xen-extfiles/ -DISTFILES+= ${DIST_IPXE} -SITES.${DIST_IPXE} += ${XEN_EXTFILES} +DISTFILES+= ${DIST_IPXE} +SITES.${DIST_IPXE} += ${XEN_EXTFILES} DISTFILES+= ${DIST_NEWLIB} SITES.${DIST_NEWLIB} += ${XEN_EXTFILES} diff --git a/sysutils/xfce4-gvfs-mount-plugin/Makefile b/sysutils/xfce4-gvfs-mount-plugin/Makefile index 042841c062a..bcec016cd99 100644 --- a/sysutils/xfce4-gvfs-mount-plugin/Makefile +++ b/sysutils/xfce4-gvfs-mount-plugin/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.13 2019/08/11 13:23:19 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/11/04 21:28:59 rillig Exp $ PKGREVISION= 11 .include "../../meta-pkgs/xfce4/Makefile.common" -DISTNAME= xfce4-gvfs-mount-0.0.4-6d2684b -PKGNAME= xfce4-gvfs-mount-plugin-0.0.4 -CATEGORIES= sysutils +DISTNAME= xfce4-gvfs-mount-0.0.4-6d2684b +PKGNAME= xfce4-gvfs-mount-plugin-0.0.4 +CATEGORIES= sysutils MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-gvfs-mount/0.0/ HOMEPAGE= https://goodies.xfce.org/projects/panel-plugins/xfce4-gvfs-mount diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile index 9f790688b1a..553792091d0 100644 --- a/sysutils/xfce4-power-manager/Makefile +++ b/sysutils/xfce4-power-manager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2019/08/17 19:15:37 gutteridge Exp $ +# $NetBSD: Makefile,v 1.12 2019/11/04 21:28:59 rillig Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -9,7 +9,7 @@ MASTER_SITES= http://archive.xfce.org/src/apps/xfce4-power-manager/1.6/ HOMEPAGE= https://goodies.xfce.org/projects/applications/xfce4-power-manager COMMENT= Xfce power manager -CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} CONF_FILES= share/examples/xfce4/autostart/xfce4-power-manager.desktop \ ${PKG_SYSCONFDIR}/xdg/autostart/xfce4-power-manager.desktop diff --git a/sysutils/xfm/Makefile b/sysutils/xfm/Makefile index 9f837f06452..cdf0f65edad 100644 --- a/sysutils/xfm/Makefile +++ b/sysutils/xfm/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.21 2018/11/26 06:52:55 dholland Exp $ +# $NetBSD: Makefile,v 1.22 2019/11/04 21:28:59 rillig Exp $ DISTNAME= xfm-1.4.3 PKGREVISION= 5 CATEGORIES= sysutils x11 MASTER_SITES= http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/ -PATCHFILES= xfm-jumbo-patch-20181125.gz -PATCH_SITES= http://www.NetBSD.org/~dholland/patchkits/xfm/ -PATCH_DIST_STRIP= -p1 +PATCHFILES= xfm-jumbo-patch-20181125.gz +PATCH_SITES= http://www.NetBSD.org/~dholland/patchkits/xfm/ +PATCH_DIST_STRIP= -p1 MAINTAINER= rxg@NetBSD.org HOMEPAGE= http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/ diff --git a/sysutils/xhfs/Makefile b/sysutils/xhfs/Makefile index 5635470f256..0e69eb62fa5 100644 --- a/sysutils/xhfs/Makefile +++ b/sysutils/xhfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2018/03/12 11:17:39 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2019/11/04 21:28:59 rillig Exp $ # DISTNAME= hfsutils-3.2.6 @@ -11,12 +11,12 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://www.mars.org/home/rob/proj/hfs/ COMMENT= Tk GUI + Tcl Shell for accessing HFS volumes -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}/lib CONFIGURE_ARGS+= --disable-cli -CPPFLAGS+= -I${BUILDLINK_PREFIX.libhfs}/include/libhfs -CPPFLAGS+= -DUSE_INTERP_RESULT +CPPFLAGS+= -I${BUILDLINK_PREFIX.libhfs}/include/libhfs +CPPFLAGS+= -DUSE_INTERP_RESULT INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 diff --git a/sysutils/zabbix/Makefile b/sysutils/zabbix/Makefile index 8aaae1ab64d..64022b6a770 100644 --- a/sysutils/zabbix/Makefile +++ b/sysutils/zabbix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2019/08/22 12:23:49 ryoon Exp $ +# $NetBSD: Makefile,v 1.28 2019/11/04 21:28:59 rillig Exp $ PKGREVISION= 3 .include "Makefile.common" @@ -32,12 +32,12 @@ RCD_SCRIPTS= zabbix_agentd zabbix_proxy zabbix_server INSTALLATION_DIRS+= ${EGDIR} share/zabbix -SUBST_CLASSES+= fix-paths -SUBST_STAGE.fix-paths= pre-configure -SUBST_MESSAGE.fix-paths=Fixing absolute paths. -SUBST_FILES.fix-paths= conf/*.conf -SUBST_FILES.fix-paths+= man/*.man -SUBST_SED.fix-paths= -e 's,/usr/local/etc,${PKG_SYSCONFDIR},g' +SUBST_CLASSES+= fix-paths +SUBST_STAGE.fix-paths= pre-configure +SUBST_MESSAGE.fix-paths= Fixing absolute paths. +SUBST_FILES.fix-paths= conf/*.conf +SUBST_FILES.fix-paths+= man/*.man +SUBST_SED.fix-paths= -e 's,/usr/local/etc,${PKG_SYSCONFDIR},g' .include "../../mk/bsd.prefs.mk" @@ -45,7 +45,7 @@ ZABBIX_GROUP?= zabbix ZABBIX_USER?= zabbix PKG_GROUPS+= ${ZABBIX_GROUP} PKG_USERS+= ${ZABBIX_USER}:${ZABBIX_GROUP} -PKG_GECOS.${ZABBIX_USER}=Zabbix user +PKG_GECOS.${ZABBIX_USER}= Zabbix user FILES_SUBST+= ZABBIX_USER=${ZABBIX_USER} FILES_SUBST+= ZABBIX_GROUP=${ZABBIX_GROUP} |