|
|
@@ -813,13 +813,6 @@ sub checkplist {
|
|
|
$found_so++;
|
|
|
}
|
|
|
|
|
|
- if ($_ =~ m|^share/icons/.*/| &&
|
|
|
- $makevar{INSTALLS_ICONS} eq '' &&
|
|
|
- needs_installs_icons()) {
|
|
|
- &perror("WARN", $file, $., "installing icons, ".
|
|
|
- "please define INSTALLS_ICONS as appropriate");
|
|
|
- }
|
|
|
-
|
|
|
if ($_ =~ m|\.omf$| && $makevar{INSTALLS_OMF} eq '') {
|
|
|
&perror("WARN", $file, $., "installing OMF files, ".
|
|
|
"please define INSTALLS_OMF (see the FreeBSD GNOME ".
|
|
|
@@ -1572,12 +1565,6 @@ sub checkmakefile {
|
|
|
"daily_clean_disks_enable=\"YES\" in /etc/periodic.conf. ".
|
|
|
"If possible, install this file with a different name.");
|
|
|
}
|
|
|
- if ($plist_file =~ m|^share/icons/.*/| &&
|
|
|
- $makevar{INSTALLS_ICONS} eq '' &&
|
|
|
- needs_installs_icons()) {
|
|
|
- &perror("WARN", "", -1, "PLIST_FILES: installing icons, ".
|
|
|
- "please define INSTALLS_ICONS as appropriate");
|
|
|
- }
|
|
|
if ($plist_file =~ /%%[\w_\d]+%%/) {
|
|
|
&perror("FATAL", "", -1, "PLIST_FILES: files cannot contain ".
|
|
|
"%%FOO%% variables. Use make variables and logic instead");
|
|
|
@@ -2005,9 +1992,8 @@ sub checkmakefile {
|
|
|
#
|
|
|
# whole file: using INSTALLS_ICONS when it is not wanted
|
|
|
#
|
|
|
- if (!($makevar{INSTALLS_ICONS} eq '') &&
|
|
|
- !needs_installs_icons()) {
|
|
|
- &perror("WARN", $file, -1, "INSTALLS_ICONS is set, but should not be.");
|
|
|
+ if (!($makevar{INSTALLS_ICONS} eq '')) {
|
|
|
+ &perror("WARN", $file, -1, "INSTALLS_ICONS is now deprecated. It should be removed.");
|
|
|
}
|
|
|
|
|
|
#
|
|
|
@@ -3953,10 +3939,6 @@ sub urlcheck {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-sub needs_installs_icons {
|
|
|
- return $makevar{USES} =~ /gnome/
|
|
|
-}
|
|
|
-
|
|
|
sub TRUE {1;}
|
|
|
|
|
|
# Local variables:
|
