pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc mk: make BROKEN a list of lines, like PKG_FAIL_REASON
details: https://anonhg.NetBSD.org/pkgsrc/rev/5907aa64cdda
branches: trunk
changeset: 404002:5907aa64cdda
user: rillig <rillig%pkgsrc.org@localhost>
date: Mon Nov 04 17:47:29 2019 +0000
description:
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.
diffstat:
devel/p5-Devel-BeginLift/Makefile | 6 +++---
devel/php-pthreads/Makefile | 4 ++--
games/xbat/Makefile | 4 ++--
graphics/AfterShotPro/Makefile | 4 ++--
lang/perl5/options.mk | 6 +++---
math/py-scipy/Makefile | 4 ++--
math/py-scipy12/Makefile | 4 ++--
mk/bsd.pkg.mk | 7 ++++---
security/openvas-libraries/Makefile | 4 ++--
sysutils/facette/Makefile | 4 ++--
sysutils/memtestplus/Makefile | 4 ++--
textproc/aspell-csb/Makefile | 4 ++--
textproc/aspell-fo/Makefile | 4 ++--
textproc/aspell-is/Makefile | 4 ++--
textproc/aspell-nb/Makefile | 4 ++--
15 files changed, 34 insertions(+), 33 deletions(-)
diffs (276 lines):
diff -r 5adfe98f2f7d -r 5907aa64cdda devel/p5-Devel-BeginLift/Makefile
--- a/devel/p5-Devel-BeginLift/Makefile Mon Nov 04 17:33:34 2019 +0000
+++ b/devel/p5-Devel-BeginLift/Makefile Mon Nov 04 17:47:29 2019 +0000
@@ -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 @@
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
diff -r 5adfe98f2f7d -r 5907aa64cdda devel/php-pthreads/Makefile
--- a/devel/php-pthreads/Makefile Mon Nov 04 17:33:34 2019 +0000
+++ b/devel/php-pthreads/Makefile Mon Nov 04 17:47:29 2019 +0000
@@ -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 @@
.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"
diff -r 5adfe98f2f7d -r 5907aa64cdda games/xbat/Makefile
--- a/games/xbat/Makefile Mon Nov 04 17:33:34 2019 +0000
+++ b/games/xbat/Makefile Mon Nov 04 17:47:29 2019 +0000
@@ -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 @@
.elif ${MACHINE_ENDIAN} == "little"
MAKE_FLAGS+= UNION=1
.else
-BROKEN= Unknown endianness
+BROKEN= "Unknown endianness"
.endif
post-install:
diff -r 5adfe98f2f7d -r 5907aa64cdda graphics/AfterShotPro/Makefile
--- a/graphics/AfterShotPro/Makefile Mon Nov 04 17:33:34 2019 +0000
+++ b/graphics/AfterShotPro/Makefile Mon Nov 04 17:47:29 2019 +0000
@@ -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 @@
#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}
diff -r 5adfe98f2f7d -r 5907aa64cdda lang/perl5/options.mk
--- a/lang/perl5/options.mk Mon Nov 04 17:33:34 2019 +0000
+++ b/lang/perl5/options.mk Mon Nov 04 17:47:29 2019 +0000
@@ -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+= -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
diff -r 5adfe98f2f7d -r 5907aa64cdda math/py-scipy/Makefile
--- a/math/py-scipy/Makefile Mon Nov 04 17:33:34 2019 +0000
+++ b/math/py-scipy/Makefile Mon Nov 04 17:47:29 2019 +0000
@@ -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=gnu95
LDFLAGS.Darwin+= -undefined dynamic_lookup
.else
-BROKEN= Requires fortran 95
+BROKEN= "Requires fortran 95"
.endif
CPPFLAGS+= -D__STDC_FORMAT_MACROS
diff -r 5adfe98f2f7d -r 5907aa64cdda math/py-scipy12/Makefile
--- a/math/py-scipy12/Makefile Mon Nov 04 17:33:34 2019 +0000
+++ b/math/py-scipy12/Makefile Mon Nov 04 17:47:29 2019 +0000
@@ -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=gnu95
LDFLAGS.Darwin+= -undefined dynamic_lookup
.else
-BROKEN= Requires fortran 95
+BROKEN= "Requires fortran 95"
.endif
CPPFLAGS+= -D__STDC_FORMAT_MACROS
diff -r 5adfe98f2f7d -r 5907aa64cdda mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Mon Nov 04 17:33:34 2019 +0000
+++ b/mk/bsd.pkg.mk Mon Nov 04 17:47:29 2019 +0000
@@ -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 @@
. 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"
diff -r 5adfe98f2f7d -r 5907aa64cdda security/openvas-libraries/Makefile
--- a/security/openvas-libraries/Makefile Mon Nov 04 17:33:34 2019 +0000
+++ b/security/openvas-libraries/Makefile Mon Nov 04 17:47:29 2019 +0000
@@ -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 @@
# 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"
diff -r 5adfe98f2f7d -r 5907aa64cdda sysutils/facette/Makefile
--- a/sysutils/facette/Makefile Mon Nov 04 17:33:34 2019 +0000
+++ b/sysutils/facette/Makefile Mon Nov 04 17:47:29 2019 +0000
@@ -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 @@
EXTRACT_USING= bsdtar
-BROKEN= Tries to install uglify-js during build.
+BROKEN= "Tries to install uglify-js during build."
.include "../../lang/go/version.mk"
diff -r 5adfe98f2f7d -r 5907aa64cdda sysutils/memtestplus/Makefile
--- a/sysutils/memtestplus/Makefile Mon Nov 04 17:33:34 2019 +0000
+++ b/sysutils/memtestplus/Makefile Mon Nov 04 17:47:29 2019 +0000
@@ -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 @@
.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:
diff -r 5adfe98f2f7d -r 5907aa64cdda textproc/aspell-csb/Makefile
--- a/textproc/aspell-csb/Makefile Mon Nov 04 17:33:34 2019 +0000
+++ b/textproc/aspell-csb/Makefile Mon Nov 04 17:47:29 2019 +0000
@@ -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 @@
.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"
diff -r 5adfe98f2f7d -r 5907aa64cdda textproc/aspell-fo/Makefile
--- a/textproc/aspell-fo/Makefile Mon Nov 04 17:33:34 2019 +0000
+++ b/textproc/aspell-fo/Makefile Mon Nov 04 17:47:29 2019 +0000
@@ -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 @@
.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"
diff -r 5adfe98f2f7d -r 5907aa64cdda textproc/aspell-is/Makefile
--- a/textproc/aspell-is/Makefile Mon Nov 04 17:33:34 2019 +0000
+++ b/textproc/aspell-is/Makefile Mon Nov 04 17:47:29 2019 +0000
@@ -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 @@
.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"
diff -r 5adfe98f2f7d -r 5907aa64cdda textproc/aspell-nb/Makefile
--- a/textproc/aspell-nb/Makefile Mon Nov 04 17:33:34 2019 +0000
+++ b/textproc/aspell-nb/Makefile Mon Nov 04 17:47:29 2019 +0000
@@ -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 @@
.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"
Home |
Main Index |
Thread Index |
Old Index