Locale-Country: Drop package.

All used functions from this module now is done by libloc, so
this package safely can be dropped.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/Locale-Country b/config/rootfiles/common/Locale-Country
deleted file mode 100644 (file)
index 941c181..0000000
--- a/config/rootfiles/common/Locale-Country
+++ /dev/null
@@ -1,60 +0,0 @@
-#usr/lib/perl5/site_perl/5.30.0/Locale
-#usr/lib/perl5/site_perl/5.30.0/Locale/Codes
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes.pm
-#usr/lib/perl5/site_perl/5.30.0/Locale/Codes.pod
-#usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Changes.pod
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Constants.pm
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Country.pm
-#usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Country.pod
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Country_Codes.pm
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Country_Retired.pm
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Currency.pm
-#usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Currency.pod
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Currency_Codes.pm
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Currency_Retired.pm
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangExt.pm
-#usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangExt.pod
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangExt_Codes.pm
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangExt_Retired.pm
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangFam.pm
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangFam.pod
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangFam_Codes.pm
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangFam_Retired.pm
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangVar.pm
-#usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangVar.pod
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangVar_Codes.pm
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangVar_Retired.pm
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Language.pm
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Language.pod
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Language_Codes.pm
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Language_Retired.pm
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Script.pm
-#usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Script.pod
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Script_Codes.pm
-usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Script_Retired.pm
-#usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Types.pod
-usr/lib/perl5/site_perl/5.30.0/Locale/Country.pm
-#usr/lib/perl5/site_perl/5.30.0/Locale/Country.pod
-usr/lib/perl5/site_perl/5.30.0/Locale/Currency.pm
-#usr/lib/perl5/site_perl/5.30.0/Locale/Currency.pod
-usr/lib/perl5/site_perl/5.30.0/Locale/Language.pm
-#usr/lib/perl5/site_perl/5.30.0/Locale/Language.pod
-usr/lib/perl5/site_perl/5.30.0/Locale/Script.pm
-#usr/lib/perl5/site_perl/5.30.0/Locale/Script.pod
-#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Locale
-#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Locale/Codes
-#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Locale/Codes/.packlist
-#usr/share/man/man3/Locale::Codes.3
-#usr/share/man/man3/Locale::Codes::Changes.3
-#usr/share/man/man3/Locale::Codes::Country.3
-#usr/share/man/man3/Locale::Codes::Currency.3
-#usr/share/man/man3/Locale::Codes::LangExt.3
-#usr/share/man/man3/Locale::Codes::LangFam.3
-#usr/share/man/man3/Locale::Codes::LangVar.3
-#usr/share/man/man3/Locale::Codes::Language.3
-#usr/share/man/man3/Locale::Codes::Script.3
-#usr/share/man/man3/Locale::Codes::Types.3
-#usr/share/man/man3/Locale::Country.3
-#usr/share/man/man3/Locale::Currency.3
-#usr/share/man/man3/Locale::Language.3
-#usr/share/man/man3/Locale::Script.3

diff --git a/lfs/Locale-Country b/lfs/Locale-Country
deleted file mode 100644 (file)
index 1f9323e..0000000
--- a/lfs/Locale-Country
+++ /dev/null
@@ -1,77 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 3.62
-
-THISAPP    = Locale-Codes-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = d4ee6fb8b5483c54abde1aa2b94e555a
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && perl Makefile.PL
-       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-       cd $(DIR_APP) && make install
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 217f4db6153358c36931dc373d0a552758a3c934..7b4ffc1f7dbf4c3fb1f77d515b516548d86e8ea6 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1337,7 +1337,6 @@ buildipfire() {
   lfsmake2 Archive-Tar
   lfsmake2 Archive-Zip
   lfsmake2 Text-Tabs+Wrap
-  lfsmake2 Locale-Country
   lfsmake2 XML-Parser
   lfsmake2 Crypt-PasswdMD5
   lfsmake2 Net-Telnet