Tue Jun 10 15:13:44 2014 UTC ()
pkglint-4.142: Remove apache13 and apache2 values.


(joerg)
diff -r1.446 -r1.447 pkgsrc/pkgtools/pkglint/Makefile
diff -r1.250 -r1.251 pkgsrc/pkgtools/pkglint/files/makevars.map
cvs diff -r1.446 -r1.447 pkgsrc/pkgtools/pkglint/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkglint/Makefile 2014/06/10 13:55:07 1.446
+++ pkgsrc/pkgtools/pkglint/Makefile 2014/06/10 15:13:44 1.447
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.446 2014/06/10 13:55:07 joerg Exp $ 1# $NetBSD: Makefile,v 1.447 2014/06/10 15:13:44 joerg Exp $
2 2
3# Note: if you update the version number, please have a look at the 3# Note: if you update the version number, please have a look at the
4# changes between the CVS tag "pkglint_current" and HEAD. 4# changes between the CVS tag "pkglint_current" and HEAD.
5# After updating, please re-set the CVS tag to HEAD. 5# After updating, please re-set the CVS tag to HEAD.
6PKGNAME= pkglint-4.141 6PKGNAME= pkglint-4.142
7CATEGORIES= pkgtools 7CATEGORIES= pkgtools
8 8
9OWNER= wiz@NetBSD.org 9OWNER= wiz@NetBSD.org
10HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/ 10HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/
11COMMENT= Verifier for NetBSD packages 11COMMENT= Verifier for NetBSD packages
12LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
13 13
14DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1 14DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
15DEPENDS+= p5-enum>=1.016:../../devel/p5-enum 15DEPENDS+= p5-enum>=1.016:../../devel/p5-enum
16DEPENDS+= p5-pkgsrc-Dewey>=1.0:../../pkgtools/p5-pkgsrc-Dewey 16DEPENDS+= p5-pkgsrc-Dewey>=1.0:../../pkgtools/p5-pkgsrc-Dewey
17 17
18BUILD_DEPENDS+= p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep 18BUILD_DEPENDS+= p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
19BUILD_DEPENDS+= p5-Test-Trap-[0-9]*:../../devel/p5-Test-Trap 19BUILD_DEPENDS+= p5-Test-Trap-[0-9]*:../../devel/p5-Test-Trap
cvs diff -r1.250 -r1.251 pkgsrc/pkgtools/pkglint/files/Attic/makevars.map (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkglint/files/Attic/makevars.map 2014/06/10 13:55:07 1.250
+++ pkgsrc/pkgtools/pkglint/files/Attic/makevars.map 2014/06/10 15:13:44 1.251
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: makevars.map,v 1.250 2014/06/10 13:55:07 joerg Exp $ 1# $NetBSD: makevars.map,v 1.251 2014/06/10 15:13:44 joerg Exp $
2# 2#
3 3
4# This file contains the guessed type of some variables, according to 4# This file contains the guessed type of some variables, according to
5# their current use in pkgsrc. 5# their current use in pkgsrc.
6# 6#
7# The type YesNo is used for variables that are checked using 7# The type YesNo is used for variables that are checked using
8# .if defined(VAR) && !empty(VAR:M[Yy][Ee][Ss]) 8# .if defined(VAR) && !empty(VAR:M[Yy][Ee][Ss])
9# 9#
10# The type Yes is used for variables that are checked using 10# The type Yes is used for variables that are checked using
11# .if defined(VAR) 11# .if defined(VAR)
12# 12#
13# Type type List is used for lists of things. There are two types of lists, 13# Type type List is used for lists of things. There are two types of lists,
14# InternalList and List, which are described in the pkgsrc guide, chapter 14# InternalList and List, which are described in the pkgsrc guide, chapter
@@ -546,29 +546,29 @@ PKGDIR RelativePkgDir [$package] @@ -546,29 +546,29 @@ PKGDIR RelativePkgDir [$package]
546PKGDIRMODE FileMode [$system] 546PKGDIRMODE FileMode [$system]
547PKGLOCALEDIR Pathname [$system] 547PKGLOCALEDIR Pathname [$system]
548PKGNAME PkgName [$package] 548PKGNAME PkgName [$package]
549PKGNAME_NOREV PkgName [$system] 549PKGNAME_NOREV PkgName [$system]
550PKGPATH Pathname [$system] 550PKGPATH Pathname [$system]
551PKGREPOSITORY Unchecked [] 551PKGREPOSITORY Unchecked []
552PKGREVISION PkgRevision [m:s] 552PKGREVISION PkgRevision [m:s]
553PKGSRCDIR Pathname [$system] 553PKGSRCDIR Pathname [$system]
554PKGSRCTOP Yes [m:s] 554PKGSRCTOP Yes [m:s]
555PKGTOOLS_ENV List of ShellWord 555PKGTOOLS_ENV List of ShellWord
556PKGVERSION Version [$system] 556PKGVERSION Version [$system]
557PKGWILDCARD Filemask [$system] 557PKGWILDCARD Filemask [$system]
558PKG_ADMIN ShellCommand [$system] 558PKG_ADMIN ShellCommand [$system]
559PKG_APACHE { apache13 apache2 apache22 apache24 } [$system] 559PKG_APACHE { apache22 apache24 } [$system]
560PKG_APACHE_ACCEPTED List of { apache13 apache2 apache22 apache24 } [$package] 560PKG_APACHE_ACCEPTED List of { apache22 apache24 } [$package]
561PKG_APACHE_DEFAULT { apache13 apache2 apache22 apache24 } [$user] 561PKG_APACHE_DEFAULT { apache22 apache24 } [$user]
562PKG_CONFIG Yes [$user] 562PKG_CONFIG Yes [$user]
563# ^^ No, this is not the popular command from GNOME, but the setting 563# ^^ No, this is not the popular command from GNOME, but the setting
564# whether the pkgsrc user wants configuration files automatically 564# whether the pkgsrc user wants configuration files automatically
565# installed or not. 565# installed or not.
566PKG_CREATE ShellCommand [$system] 566PKG_CREATE ShellCommand [$system]
567PKG_DBDIR Pathname [$system] 567PKG_DBDIR Pathname [$system]
568PKG_DEBUG_LEVEL Integer [$cmdline] 568PKG_DEBUG_LEVEL Integer [$cmdline]
569PKG_DEFAULT_OPTIONS List of Option [$user] 569PKG_DEFAULT_OPTIONS List of Option [$user]
570PKG_DELETE ShellCommand [$system] 570PKG_DELETE ShellCommand [$system]
571PKG_DESTDIR_SUPPORT List of { destdir user-destdir } [m:s,c:s] 571PKG_DESTDIR_SUPPORT List of { destdir user-destdir } [m:s,c:s]
572PKG_FAIL_REASON List of ShellWord [$package_list] 572PKG_FAIL_REASON List of ShellWord [$package_list]
573PKG_GECOS.* Message [m:s] 573PKG_GECOS.* Message [m:s]
574PKG_GID.* Integer [m:s] 574PKG_GID.* Integer [m:s]