Thu Oct 9 14:10:41 2014 UTC ()
PKG_INSTALLATION_TYPES cleanup. Ride bump.


(wiz)
diff -r1.65 -r1.66 pkgsrc/pkgtools/pkglint/files/deprecated.map
diff -r1.256 -r1.257 pkgsrc/pkgtools/pkglint/files/makevars.map
cvs diff -r1.65 -r1.66 pkgsrc/pkgtools/pkglint/files/Attic/deprecated.map (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkglint/files/Attic/deprecated.map 2014/10/09 13:54:47 1.65
+++ pkgsrc/pkgtools/pkglint/files/Attic/deprecated.map 2014/10/09 14:10:41 1.66
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: deprecated.map,v 1.65 2014/10/09 13:54:47 wiz Exp $ 1# $NetBSD: deprecated.map,v 1.66 2014/10/09 14:10:41 wiz Exp $
2# 2#
3 3
4# This file contains names of Makefile variables and a short explanation 4# This file contains names of Makefile variables and a short explanation
5# what to do to make the warning disappear. Lines should only be removed 5# what to do to make the warning disappear. Lines should only be removed
6# if the explanation changes, in which case the new explanation should 6# if the explanation changes, in which case the new explanation should
7# be added to the current date. 7# be added to the current date.
8 8
9# December 2003 9# December 2003
10FIX_RPATH It has been removed from pkgsrc in 2003. 10FIX_RPATH It has been removed from pkgsrc in 2003.
11 11
12# February 2005 12# February 2005
13ALL_TARGET Use BUILD_TARGET instead. 13ALL_TARGET Use BUILD_TARGET instead.
14NO_WRKSUBDIR Use WRKSRC=${WRKDIR} instead. 14NO_WRKSUBDIR Use WRKSRC=${WRKDIR} instead.
@@ -153,13 +153,14 @@ INSTALLATION_DIRS_FROM_PLIST Use AUTO_MK @@ -153,13 +153,14 @@ INSTALLATION_DIRS_FROM_PLIST Use AUTO_MK
153NO_PACKAGE It doesn't exist anymore. 153NO_PACKAGE It doesn't exist anymore.
154NO_MTREE You can just remove it. 154NO_MTREE You can just remove it.
155 155
156# July 2012 156# July 2012
157SETGIDGAME Use USE_GAMESGROUP instead. 157SETGIDGAME Use USE_GAMESGROUP instead.
158GAMEGRP Use GAMES_GROUP instead. 158GAMEGRP Use GAMES_GROUP instead.
159GAMEOWN Use GAMES_USER instead. 159GAMEOWN Use GAMES_USER instead.
160 160
161# July 2013 161# July 2013
162USE_GNU_READLINE Include "../../devel/readline/buildlink3.mk" instead. 162USE_GNU_READLINE Include "../../devel/readline/buildlink3.mk" instead.
163 163
164# October 2014 164# October 2014
165SVR4_PKGNAME Just remove it. 165SVR4_PKGNAME Just remove it.
 166PKG_INSTALLATION_TYPES Just remove it.
cvs diff -r1.256 -r1.257 pkgsrc/pkgtools/pkglint/files/Attic/makevars.map (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkglint/files/Attic/makevars.map 2014/10/09 13:44:53 1.256
+++ pkgsrc/pkgtools/pkglint/files/Attic/makevars.map 2014/10/09 14:10:41 1.257
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: makevars.map,v 1.256 2014/10/09 13:44:53 wiz Exp $ 1# $NetBSD: makevars.map,v 1.257 2014/10/09 14:10:41 wiz 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# The type List is used for lists of things. There are two types of lists, 13# The 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
@@ -85,27 +85,26 @@ MOTIFBASE Pathname [$user] @@ -85,27 +85,26 @@ MOTIFBASE Pathname [$user]
85PKGINFODIR Pathname [$user] 85PKGINFODIR Pathname [$user]
86PKGMANDIR Pathname [$user] 86PKGMANDIR Pathname [$user]
87USE_XPKGWEDGE YesNo [$user] 87USE_XPKGWEDGE YesNo [$user]
88BSDSRCDIR Pathname [$user] 88BSDSRCDIR Pathname [$user]
89BSDXSRCDIR Pathname [$user] 89BSDXSRCDIR Pathname [$user]
90DISTDIR Pathname [$user] 90DISTDIR Pathname [$user]
91DIST_PATH Pathlist [$user] 91DIST_PATH Pathlist [$user]
92DEFAULT_VIEW Unchecked [$user] 92DEFAULT_VIEW Unchecked [$user]
93FETCH_CMD ShellCommand [$user] 93FETCH_CMD ShellCommand [$user]
94FETCH_USING { curl custom fetch ftp manual wget } [$user] 94FETCH_USING { curl custom fetch ftp manual wget } [$user]
95FETCH_RESUME_ARGS List of ShellWord [$user] 95FETCH_RESUME_ARGS List of ShellWord [$user]
96FETCH_OUTPUT_ARGS List of ShellWord [$user] 96FETCH_OUTPUT_ARGS List of ShellWord [$user]
97LIBTOOLIZE_PLIST YesNo [$user] 97LIBTOOLIZE_PLIST YesNo [$user]
98PKG_INSTALLATION_PREFS List of { overwrite pkgviews } [$user] 
99PKG_RESUME_TRANSFERS YesNo [$user] 98PKG_RESUME_TRANSFERS YesNo [$user]
100PKG_SYSCONFBASE Pathname [$user] 99PKG_SYSCONFBASE Pathname [$user]
101RCD_SCRIPTS_DIR Pathname [$user] 100RCD_SCRIPTS_DIR Pathname [$user]
102PACKAGES Pathname [$user] 101PACKAGES Pathname [$user]
103PKGVULNDIR Pathname [$user] 102PKGVULNDIR Pathname [$user]
104PASSIVE_FETCH Yes [$user] 103PASSIVE_FETCH Yes [$user]
105PATCH_FUZZ_FACTOR { -F0 -F1 -F2 -F3 } [$user] 104PATCH_FUZZ_FACTOR { -F0 -F1 -F2 -F3 } [$user]
106ACCEPTABLE_LICENSES List of Identifier [$user] 105ACCEPTABLE_LICENSES List of Identifier [$user]
107SPECIFIC_PKGS Yes [$user] 106SPECIFIC_PKGS Yes [$user]
108SITE_SPECIFIC_PKGS List of PkgPath [$user] 107SITE_SPECIFIC_PKGS List of PkgPath [$user]
109HOST_SPECIFIC_PKGS List of PkgPath [$user] 108HOST_SPECIFIC_PKGS List of PkgPath [$user]
110GROUP_SPECIFIC_PKGS List of PkgPath [$user] 109GROUP_SPECIFIC_PKGS List of PkgPath [$user]
111USER_SPECIFIC_PKGS List of PkgPath [$user] 110USER_SPECIFIC_PKGS List of PkgPath [$user]
@@ -571,27 +570,26 @@ PKG_CREATE ShellCommand [$system] @@ -571,27 +570,26 @@ PKG_CREATE ShellCommand [$system]
571PKG_DBDIR Pathname [$system] 570PKG_DBDIR Pathname [$system]
572PKG_DEBUG_LEVEL Integer [$cmdline] 571PKG_DEBUG_LEVEL Integer [$cmdline]
573PKG_DEFAULT_OPTIONS List of Option [$user] 572PKG_DEFAULT_OPTIONS List of Option [$user]
574PKG_DELETE ShellCommand [$system] 573PKG_DELETE ShellCommand [$system]
575PKG_DESTDIR_SUPPORT List of { destdir user-destdir } [m:s,c:s] 574PKG_DESTDIR_SUPPORT List of { destdir user-destdir } [m:s,c:s]
576PKG_FAIL_REASON List of ShellWord [$package_list] 575PKG_FAIL_REASON List of ShellWord [$package_list]
577PKG_GECOS.* Message [m:s] 576PKG_GECOS.* Message [m:s]
578PKG_GID.* Integer [m:s] 577PKG_GID.* Integer [m:s]
579PKG_GROUPS List of ShellWord [m:as] 578PKG_GROUPS List of ShellWord [m:as]
580PKG_GROUPS_VARS List of Varname [$package_list] 579PKG_GROUPS_VARS List of Varname [$package_list]
581PKG_HOME.* Pathname [m:s] 580PKG_HOME.* Pathname [m:s]
582PKG_HACKS List of Identifier [h:a] 581PKG_HACKS List of Identifier [h:a]
583PKG_INFO ShellCommand [$system] 582PKG_INFO ShellCommand [$system]
584PKG_INSTALLATION_TYPES List of { overwrite pkgviews } [m:s,c:s] 
585PKG_JAVA_HOME Pathname [$system] 583PKG_JAVA_HOME Pathname [$system]
586PKG_JVM { \ 584PKG_JVM { \
587 blackdown-jdk13 \ 585 blackdown-jdk13 \
588 jdk jdk14 \ 586 jdk jdk14 \
589 kaffe \ 587 kaffe \
590 sun-jdk13 sun-jdk14 sun-jdk15 sun-jdk6 \ 588 sun-jdk13 sun-jdk14 sun-jdk15 sun-jdk6 \
591 openjdk7 openjdk7-bin sun-jdk7 \ 589 openjdk7 openjdk7-bin sun-jdk7 \
592 } [$system] 590 } [$system]
593PKG_JVMS_ACCEPTED List of { \ 591PKG_JVMS_ACCEPTED List of { \
594 blackdown-jdk13 \ 592 blackdown-jdk13 \
595 jdk jdk14 \ 593 jdk jdk14 \
596 kaffe \ 594 kaffe \
597 sun-jdk13 sun-jdk14 sun-jdk15 sun-jdk6 \ 595 sun-jdk13 sun-jdk14 sun-jdk15 sun-jdk6 \