diff options
author | Florent Thoumie <flz@FreeBSD.org> | 2005-11-23 12:10:09 +0000 |
---|---|---|
committer | Florent Thoumie <flz@FreeBSD.org> | 2005-11-23 12:10:09 +0000 |
commit | 0708c8898ba79aa9441e85d34ddafd5dbffad615 (patch) | |
tree | 258566a864ffe8b8a3acf15401a8e0098b151ea4 /mail/sympa5/files | |
parent | 1eae28eaa5328f7f2b35586c7355cd7023eaedd6 (diff) |
Notes
Diffstat (limited to 'mail/sympa5/files')
-rw-r--r-- | mail/sympa5/files/patch-Makefile.in | 26 | ||||
-rw-r--r-- | mail/sympa5/files/patch-check_perl_modules.pl | 19 | ||||
-rw-r--r-- | mail/sympa5/files/patch-src-Language.pm | 45 |
3 files changed, 0 insertions, 90 deletions
diff --git a/mail/sympa5/files/patch-Makefile.in b/mail/sympa5/files/patch-Makefile.in index 569e5aee9cc9..ad8008ad6622 100644 --- a/mail/sympa5/files/patch-Makefile.in +++ b/mail/sympa5/files/patch-Makefile.in @@ -27,32 +27,6 @@ importantchanges: @( PERL=$(PERL); export PERL; \ -@@ -610,7 +612,7 @@ - $(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \ - DIR='${DIR}' LOCALEDIR='${LOCALEDIR}' ETCBINDIR='${ETCBINDIR}' \ - DESTDIR='${DESTDIR}' CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' \ -- LOCALEDIR='${prefix}/locale' SCRIPTDIR='${SCRIPTDIR}' \ -+ SCRIPTDIR='${SCRIPTDIR}' \ - USER='${USER}' GROUP='${GROUP}') || exit 1; - - installlocale: -@@ -618,7 +620,6 @@ - $(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \ - DIR='${DIR}' LOCALEDIR='${LOCALEDIR}' ETCBINDIR='${ETCBINDIR}' \ - DESTDIR='${DESTDIR}' CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' \ -- LOCALEDIR='${prefix}/locale' \ - USER='${USER}' GROUP='${GROUP}' install) || exit 1; - - updatelocale: -@@ -626,7 +627,7 @@ - $(MAKE) SH='${SH}' CC='${CC}' CFLAGS='${CFLAGS}' PERL='${PERL}' \ - DIR='${DIR}' LOCALEDIR='${LOCALEDIR}' ETCBINDIR='${ETCBINDIR}' \ - DESTDIR='${DESTDIR}' CONFIG='${CONFIG}' WWSCONFIG='${WWSCONFIG}' \ -- LOCALEDIR='${prefix}/locale' SCRIPTDIR='${SCRIPTDIR}' \ -+ SCRIPTDIR='${SCRIPTDIR}' \ - USER='${USER}' GROUP='${GROUP}' update-po) || exit 1; - - installsrc: @@ -719,7 +720,7 @@ installdir: diff --git a/mail/sympa5/files/patch-check_perl_modules.pl b/mail/sympa5/files/patch-check_perl_modules.pl deleted file mode 100644 index eeb460c248e4..000000000000 --- a/mail/sympa5/files/patch-check_perl_modules.pl +++ /dev/null @@ -1,19 +0,0 @@ ---- check_perl_modules.pl 2003/11/28 18:16:39 -+++ check_perl_modules.pl 2004/05/04 21:05:38 -@@ -158,6 +158,8 @@ - sub install_module { - my ($module, $default) = @_; - -+ return if $ENV{'PERL_EXTUTILS_AUTOINSTALL'} =~ /--skip|--default/; -+ - unless ($ENV{'FTP_PASSIVE'} eq 1) { - $ENV{'FTP_PASSIVE'} = 1; - print "Setting FTP Passive mode\n"; -@@ -178,7 +180,7 @@ - print "Install module $module ? [$default]"; - my $answer = <STDIN>; chomp $answer; - $answer ||= $default; -- next unless ($answer =~ /^y$/i); -+ return unless ($answer =~ /^y$/i); - CPAN::Shell->conf('inactivity_timeout', 4); - CPAN::Shell->install($module); diff --git a/mail/sympa5/files/patch-src-Language.pm b/mail/sympa5/files/patch-src-Language.pm deleted file mode 100644 index dff55c17eef5..000000000000 --- a/mail/sympa5/files/patch-src-Language.pm +++ /dev/null @@ -1,45 +0,0 @@ ---- src/Language.pm.orig Thu Aug 11 14:49:48 2005 -+++ src/Language.pm Mon Oct 3 10:05:04 2005 -@@ -1,5 +1,5 @@ - # Language.pm - This module does just the initial setup for the international messages --# RCS Identication ; $Revision: 1.40.2.4 $ ; $Date: 2005/08/11 12:49:48 $ -+# RCS Identication ; $Revision: 1.40.2.5 $ ; $Date: 2005/09/23 15:39:34 $ - # - # Sympa - SYsteme de Multi-Postage Automatique - # Copyright (c) 1997, 1998, 1999, 2000, 2001 Comite Reseau des Universites -@@ -126,7 +126,7 @@ - } - - &Locale::Messages::textdomain("sympa"); -- &Locale::Messages::bindtextdomain('sympa','--DIR--/locale'); -+ &Locale::Messages::bindtextdomain('sympa','--DIR--/share/locale'); - &Locale::Messages::bind_textdomain_codeset('sympa',$recode) if $recode; - #bind_textdomain_codeset sympa => 'iso-8859-1'; - -@@ -134,16 +134,20 @@ - unless (setlocale(&POSIX::LC_ALL, $locale)) { - unless (setlocale(&POSIX::LC_ALL, $lang)) { - unless (setlocale(&POSIX::LC_ALL, $locale.'.'.$locale2charset{$locale})) { -- &do_log('err','Failed to setlocale(%s) ; you either have a problem with the catalogue .mo files or you should extend available locales in your /etc/locale.gen (or /etc/sysconfig/i18n) file', $locale.'.'.$locale2charset{$locale}); -- return undef; -+ unless (setlocale(&POSIX::LC_ALL, $locale.'.'.uc($locale2charset{$locale}))) { ## UpperCase required for FreeBSD -+ &do_log('err','Failed to setlocale(%s) ; you either have a problem with the catalogue .mo files or you should extend available locales in your /etc/locale.gen (or /etc/sysconfig/i18n) file', $locale.'.'.uc($locale2charset{$locale})); -+ return undef; -+ } - } - } - } - -- unless (setlocale(&POSIX::LC_TIME, $locale)) { -- &do_log('err','Failed to setlocale(LC_TIME,%s)', $locale.'.'.$locale2charset{$locale}); -- return undef; -- } -+## Problem with this, isn't LC_ALL suffiscient ? -+# -+# unless (setlocale(&POSIX::LC_TIME, $locale)) { -+# &do_log('err','Failed to setlocale(LC_TIME,%s)', $locale); -+# return undef; -+# } - - $current_lang = $lang; - $current_locale = $locale; |