CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Roland Illig" <rillig%netbsd.org@localhost>
Date: Mon, 4 Nov 2019 17:47:32 +0000

Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon Nov  4 17:47:31 UTC 2019

Modified Files:
        pkgsrc/devel/p5-Devel-BeginLift: Makefile
        pkgsrc/devel/php-pthreads: Makefile
        pkgsrc/games/xbat: Makefile
        pkgsrc/graphics/AfterShotPro: Makefile
        pkgsrc/lang/perl5: options.mk
        pkgsrc/math/py-scipy: Makefile
        pkgsrc/math/py-scipy12: Makefile
        pkgsrc/mk: bsd.pkg.mk
        pkgsrc/security/openvas-libraries: Makefile
        pkgsrc/sysutils/facette: Makefile
        pkgsrc/sysutils/memtestplus: Makefile
        pkgsrc/textproc/aspell-csb: Makefile
        pkgsrc/textproc/aspell-fo: Makefile
        pkgsrc/textproc/aspell-is: Makefile
        pkgsrc/textproc/aspell-nb: Makefile

Log Message:
mk: make BROKEN a list of lines, like PKG_FAIL_REASON

Packages defined the variable BROKEN inconsistently. Some added quotes,
like they are required in PKG_FAIL_REASON, some omitted them.

Now all packages behave the same, and pkglint will flag future mistakes.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/p5-Devel-BeginLift/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/php-pthreads/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/games/xbat/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/AfterShotPro/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/perl5/options.mk
cvs rdiff -u -r1.39 -r1.40 pkgsrc/math/py-scipy/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/py-scipy12/Makefile
cvs rdiff -u -r1.2032 -r1.2033 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/security/openvas-libraries/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/sysutils/facette/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/sysutils/memtestplus/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/aspell-csb/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/aspell-fo/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/aspell-is/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/aspell-nb/Makefile

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

Modified files:

Index: pkgsrc/devel/p5-Devel-BeginLift/Makefile
diff -u pkgsrc/devel/p5-Devel-BeginLift/Makefile:1.15 pkgsrc/devel/p5-Devel-BeginLift/Makefile:1.16
--- pkgsrc/devel/p5-Devel-BeginLift/Makefile:1.15       Sun Aug 11 13:19:14 2019
+++ pkgsrc/devel/p5-Devel-BeginLift/Makefile    Mon Nov  4 17:47:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:19:14 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/04 17:47:29 rillig Exp $
 
 DISTNAME=      Devel-BeginLift-0.001003
 PKGNAME=       p5-${DISTNAME}
@@ -19,8 +19,8 @@ PERL5_MODULE_TYPE=    Module::Install::Bund
 
 MAKE_ENV+=     PERL_USE_UNSAFE_INC=1
 
-BROKEN=                Not compatible with the current version of Perl.
-BROKEN+=       See: https://rt.cpan.org/Public/Bug/Display.html?id=115272
+BROKEN=                "Not compatible with the current version of Perl."
+BROKEN+=       "See: https://rt.cpan.org/Public/Bug/Display.html?id=115272";
 
 BUILDLINK_DEPMETHOD.p5-B-Hooks-OP-Check=       full
 BUILDLINK_API_DEPENDS.p5-B-Hooks-OP-Check+=    p5-B-Hooks-OP-Check>=0.19

Index: pkgsrc/devel/php-pthreads/Makefile
diff -u pkgsrc/devel/php-pthreads/Makefile:1.7 pkgsrc/devel/php-pthreads/Makefile:1.8
--- pkgsrc/devel/php-pthreads/Makefile:1.7      Sat Sep 16 19:26:47 2017
+++ pkgsrc/devel/php-pthreads/Makefile  Mon Nov  4 17:47:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/09/16 19:26:47 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/04 17:47:30 rillig Exp $
 
 MODNAME=       pthreads
 PECL_VERSION=  2.0.10
@@ -22,7 +22,7 @@ USE_LIBTOOL=  yes
 .include "../../lang/php/phpversion.mk"
 
 .if empty(PKG_BUILD_OPTIONS.${PHP_PKG_PREFIX}:Mmaintainer-zts)
-BROKEN=                Requires the maintainer-zts option enabled in PHP.
+BROKEN=                "Requires the maintainer-zts option enabled in PHP."
 .endif
 
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/games/xbat/Makefile
diff -u pkgsrc/games/xbat/Makefile:1.18 pkgsrc/games/xbat/Makefile:1.19
--- pkgsrc/games/xbat/Makefile:1.18     Sun Jan 14 17:34:02 2018
+++ pkgsrc/games/xbat/Makefile  Mon Nov  4 17:47:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/01/14 17:34:02 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/04 17:47:30 rillig Exp $
 
 DISTNAME=      xev111
 PKGNAME=       xbat-1.11
@@ -47,7 +47,7 @@ MAKE_FLAGS+=  UNION=0
 .elif ${MACHINE_ENDIAN} == "little"
 MAKE_FLAGS+=   UNION=1
 .else
-BROKEN=                Unknown endianness
+BROKEN=                "Unknown endianness"
 .endif
 
 post-install:

Index: pkgsrc/graphics/AfterShotPro/Makefile
diff -u pkgsrc/graphics/AfterShotPro/Makefile:1.6 pkgsrc/graphics/AfterShotPro/Makefile:1.7
--- pkgsrc/graphics/AfterShotPro/Makefile:1.6   Sat Nov  2 22:37:52 2019
+++ pkgsrc/graphics/AfterShotPro/Makefile       Mon Nov  4 17:47:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/11/02 22:37:52 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/04 17:47:30 rillig Exp $
 
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.corel.com/akdlm/6763/downloads/AfterShotPro/1/PF/
@@ -45,7 +45,7 @@ PKGNAME=      ${DISTNAME:S/_i386/-1.1.0.30/}
 #DISTNAME=     AfterShotPro_amd64
 #PKGNAME=      ${DISTNAME:S/_amd64/-1.1.0.30/}
 .else
-BROKEN=                Not supported for this emulation
+BROKEN=                "Not supported for this emulation"
 .endif
 
 do-extract: ${WRKDIR}

Index: pkgsrc/lang/perl5/options.mk
diff -u pkgsrc/lang/perl5/options.mk:1.13 pkgsrc/lang/perl5/options.mk:1.14
--- pkgsrc/lang/perl5/options.mk:1.13   Sun Nov  3 19:04:05 2019
+++ pkgsrc/lang/perl5/options.mk        Mon Nov  4 17:47:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2019/11/03 19:04:05 rillig Exp $
+# $NetBSD: options.mk,v 1.14 2019/11/04 17:47:30 rillig Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.perl
 PKG_OPTIONS_REQUIRED_GROUPS=   perlbits
@@ -89,7 +89,7 @@ CONFIGURE_ARGS+=      -Duse64bitall
 CONFIGURE_ARGS+=       -Uuse64bitall -Uusemorebits -Uuse64bitint
 .else
 .  if ${OBJECT_FMT} == "XCOFF"
-BROKEN=                        XCOFF targets need the path specified where libperl.a resides.\
-                       Please choose on of 64bitint 64bitmore 64bitall or 64bitnone to allow this.
+BROKEN=                        "XCOFF targets need the path specified where libperl.a resides."
+BROKEN+=               "Please choose on of 64bitint 64bitmore 64bitall or 64bitnone to allow this."
 .  endif
 .endif

Index: pkgsrc/math/py-scipy/Makefile
diff -u pkgsrc/math/py-scipy/Makefile:1.39 pkgsrc/math/py-scipy/Makefile:1.40
--- pkgsrc/math/py-scipy/Makefile:1.39  Sat Nov  2 16:16:22 2019
+++ pkgsrc/math/py-scipy/Makefile       Mon Nov  4 17:47:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/11/02 16:16:22 rillig Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/04 17:47:30 rillig Exp $
 
 DISTNAME=      scipy-1.3.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -22,7 +22,7 @@ PYSETUPBUILDARGS+=    --fcompiler=g95
 PYSETUPBUILDARGS+=     --fcompiler=gnu95
 LDFLAGS.Darwin+=       -undefined dynamic_lookup
 .else
-BROKEN=                        Requires fortran 95
+BROKEN=                        "Requires fortran 95"
 .endif
 
 CPPFLAGS+=     -D__STDC_FORMAT_MACROS

Index: pkgsrc/math/py-scipy12/Makefile
diff -u pkgsrc/math/py-scipy12/Makefile:1.2 pkgsrc/math/py-scipy12/Makefile:1.3
--- pkgsrc/math/py-scipy12/Makefile:1.2 Sat Nov  2 16:16:22 2019
+++ pkgsrc/math/py-scipy12/Makefile     Mon Nov  4 17:47:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/11/02 16:16:22 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/04 17:47:30 rillig Exp $
 
 DISTNAME=      scipy-1.2.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -22,7 +22,7 @@ PYSETUPBUILDARGS+=    --fcompiler=g95
 PYSETUPBUILDARGS+=     --fcompiler=gnu95
 LDFLAGS.Darwin+=       -undefined dynamic_lookup
 .else
-BROKEN=                        Requires fortran 95
+BROKEN=                        "Requires fortran 95"
 .endif
 
 CPPFLAGS+=     -D__STDC_FORMAT_MACROS

Index: pkgsrc/mk/bsd.pkg.mk
diff -u pkgsrc/mk/bsd.pkg.mk:1.2032 pkgsrc/mk/bsd.pkg.mk:1.2033
--- pkgsrc/mk/bsd.pkg.mk:1.2032 Sun Aug 18 21:58:51 2019
+++ pkgsrc/mk/bsd.pkg.mk        Mon Nov  4 17:47:30 2019
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.2032 2019/08/18 21:58:51 rillig Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.2033 2019/11/04 17:47:30 rillig Exp $
 #
 # This file is in the public domain.
 #
@@ -480,8 +480,9 @@ PKG_SKIP_REASON+= "${PKGNAME} is restric
 .  if defined(USE_X11) && (${X11_TYPE} == "native") && !exists(${X11BASE})
 PKG_FAIL_REASON+= "${PKGNAME} uses X11, but ${X11BASE} not found"
 .  endif
-.  if defined(BROKEN)
-PKG_FAIL_REASON+= "${PKGNAME} is marked as broken:" ${BROKEN:Q}
+.  if ${BROKEN:U:M*}
+PKG_FAIL_REASON+=      "${PKGNAME} is marked as broken:"
+PKG_FAIL_REASON+=      ${BROKEN}
 .  endif
 
 .include "license.mk"

Index: pkgsrc/security/openvas-libraries/Makefile
diff -u pkgsrc/security/openvas-libraries/Makefile:1.21 pkgsrc/security/openvas-libraries/Makefile:1.22
--- pkgsrc/security/openvas-libraries/Makefile:1.21     Sat Jul 20 22:46:49 2019
+++ pkgsrc/security/openvas-libraries/Makefile  Mon Nov  4 17:47:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/07/20 22:46:49 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/04 17:47:30 rillig Exp $
 
 DISTNAME=      openvas-libraries-2.0.0
 PKGREVISION=   13
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=      --localstatedir=${VARBA
 # DragonFly-2.8.2 has dn_expand(3) in libc, and not have libresolv.
 BUILDLINK_TRANSFORM.DragonFly+=        rm:-lresolv
 
-BROKEN=                Does not build with gnutls-3.5 -- newer versions available.
+BROKEN=                "Does not build with gnutls-3.5 -- newer versions available."
 
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"

Index: pkgsrc/sysutils/facette/Makefile
diff -u pkgsrc/sysutils/facette/Makefile:1.20 pkgsrc/sysutils/facette/Makefile:1.21
--- pkgsrc/sysutils/facette/Makefile:1.20       Wed Nov 14 22:22:23 2018
+++ pkgsrc/sysutils/facette/Makefile    Mon Nov  4 17:47:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/11/14 22:22:23 kleink Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/04 17:47:31 rillig Exp $
 
 DISTNAME=      facette-0.4.0dev
 PKGREVISION=   18
@@ -15,7 +15,7 @@ GITHUB_TAG=   d77e77680d52d232305d0f12af6e
 
 EXTRACT_USING= bsdtar
 
-BROKEN=                Tries to install uglify-js during build.
+BROKEN=                "Tries to install uglify-js during build."
 
 .include "../../lang/go/version.mk"
 

Index: pkgsrc/sysutils/memtestplus/Makefile
diff -u pkgsrc/sysutils/memtestplus/Makefile:1.27 pkgsrc/sysutils/memtestplus/Makefile:1.28
--- pkgsrc/sysutils/memtestplus/Makefile:1.27   Sat Feb  9 09:13:24 2019
+++ pkgsrc/sysutils/memtestplus/Makefile        Mon Nov  4 17:47:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/02/09 09:13:24 maya Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/04 17:47:31 rillig Exp $
 #
 
 # Note -- version number also in the do-install rule
@@ -35,7 +35,7 @@ SUBST_SED.delcr=      -e 's/.$$//g'
 .include "../../mk/compiler.mk"
 
 .if !empty(PKGSRC_COMPILER:Mclang)
-BROKEN+=       ${PKGNAME} does not produce a working binary with clang
+BROKEN+=       "Does not produce a working binary with clang."
 .endif
 
 pre-configure:

Index: pkgsrc/textproc/aspell-csb/Makefile
diff -u pkgsrc/textproc/aspell-csb/Makefile:1.4 pkgsrc/textproc/aspell-csb/Makefile:1.5
--- pkgsrc/textproc/aspell-csb/Makefile:1.4     Sat Jul  6 19:12:47 2019
+++ pkgsrc/textproc/aspell-csb/Makefile Mon Nov  4 17:47:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/07/06 19:12:47 nia Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/04 17:47:31 rillig Exp $
 #
 
 DISTNAME=      aspell6-csb-0.02-0
@@ -17,7 +17,7 @@ USE_LANGUAGES=        # none
 
 .include "../../mk/bsd.prefs.mk"
 .if ${PKG_FORMAT} == "pkg" && ${OPSYS} == "Linux"
-BROKEN=        Non-ASCII PLIST and thus problem with libarchive on glibc systems.
+BROKEN=        "Non-ASCII PLIST and thus problem with libarchive on glibc systems."
 .endif
 
 .include "../../textproc/aspell/buildlink3.mk"

Index: pkgsrc/textproc/aspell-fo/Makefile
diff -u pkgsrc/textproc/aspell-fo/Makefile:1.10 pkgsrc/textproc/aspell-fo/Makefile:1.11
--- pkgsrc/textproc/aspell-fo/Makefile:1.10     Sun Aug 11 13:23:22 2019
+++ pkgsrc/textproc/aspell-fo/Makefile  Mon Nov  4 17:47:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/08/11 13:23:22 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/04 17:47:31 rillig Exp $
 
 DISTNAME=      aspell-fo-0.4.2
 PKGREVISION=   6
@@ -18,7 +18,7 @@ INSTALLATION_DIRS+=   lib/aspell share/asp
 
 .include "../../mk/bsd.prefs.mk"
 .if ${PKG_FORMAT} == "pkg" && ${OPSYS} == "Linux"
-BROKEN=        Can not be packaged on Linux
+BROKEN=        "Non-ASCII PLIST and thus problem with libarchive on glibc systems."
 .endif
 
 .include "../../textproc/aspell/buildlink3.mk"

Index: pkgsrc/textproc/aspell-is/Makefile
diff -u pkgsrc/textproc/aspell-is/Makefile:1.4 pkgsrc/textproc/aspell-is/Makefile:1.5
--- pkgsrc/textproc/aspell-is/Makefile:1.4      Sat Sep 16 19:27:12 2017
+++ pkgsrc/textproc/aspell-is/Makefile  Mon Nov  4 17:47:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:12 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/04 17:47:31 rillig Exp $
 #
 
 DISTNAME=      aspell-is-0.51.1-0
@@ -17,7 +17,7 @@ USE_LANGUAGES=        # none
 
 .include "../../mk/bsd.prefs.mk"
 .if ${PKG_FORMAT} == "pkg" && ${OPSYS} == "Linux"
-BROKEN=        Non-ASCII PLIST and thus problem with libarchive on glibc systems.
+BROKEN=        "Non-ASCII PLIST and thus problem with libarchive on glibc systems."
 .endif
 
 .include "../../textproc/aspell/buildlink3.mk"

Index: pkgsrc/textproc/aspell-nb/Makefile
diff -u pkgsrc/textproc/aspell-nb/Makefile:1.2 pkgsrc/textproc/aspell-nb/Makefile:1.3
--- pkgsrc/textproc/aspell-nb/Makefile:1.2      Wed Apr 24 11:15:43 2013
+++ pkgsrc/textproc/aspell-nb/Makefile  Mon Nov  4 17:47:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:43 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/04 17:47:31 rillig Exp $
 #
 
 DISTNAME=      aspell-nb-0.50.1-0
@@ -16,7 +16,7 @@ HAS_CONFIGURE=        yes
 
 .include "../../mk/bsd.prefs.mk"
 .if ${PKG_FORMAT} == "pkg" && ${OPSYS} == "Linux"
-BROKEN=        Can not be packaged on Linux
+BROKEN=        "Non-ASCII PLIST and thus problem with libarchive on glibc systems."
 .endif
 
 .include "../../textproc/aspell/buildlink3.mk"

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

Home | Main Index | Thread Index | Old Index