diff --git a/news/pan/Makefile b/news/pan/Makefile index 62fea758e280..10a328dd4ae4 100644 --- a/news/pan/Makefile +++ b/news/pan/Makefile @@ -6,7 +6,7 @@ # PORTNAME= pan -PORTVERSION= 0.10.0 +PORTVERSION= 0.10.0.90 CATEGORIES= news gnome MASTER_SITES= http://pan.rebelbase.com/download/${PORTVERSION}/ diff --git a/news/pan/distinfo b/news/pan/distinfo index c85fe083065a..c6974b912967 100644 --- a/news/pan/distinfo +++ b/news/pan/distinfo @@ -1 +1 @@ -MD5 (pan-0.10.0.tar.bz2) = 157889e9cd9a4e3b619076adf84b53e1 +MD5 (pan-0.10.0.90.tar.bz2) = f00c070de046a1bdb7ccbb381afb641e diff --git a/news/pan/files/patch-gmime::gmime-utils.c b/news/pan/files/patch-gmime::gmime-utils.c deleted file mode 100644 index 95e92d4731f6..000000000000 --- a/news/pan/files/patch-gmime::gmime-utils.c +++ /dev/null @@ -1,31 +0,0 @@ - -$FreeBSD$ - ---- gmime/gmime-utils.c 2001/08/22 18:22:18 1.1 -+++ gmime/gmime-utils.c 2001/08/22 18:35:26 -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - - #define d(x) - -@@ -128,11 +128,12 @@ - get_codeset (void) - { - const gchar * codeset; -+ gchar *s; - -- codeset = nl_langinfo (CODESET); -- if (!codeset || !*codeset) -- codeset = DEFAULT_CODESET; -- -+ codeset = DEFAULT_CODESET; -+ if ((s = setlocale(LC_CTYPE, NULL)) != NULL) -+ if ((s = strchr(s, '.')) != NULL) -+ codeset = s + 1; - return codeset; - } - diff --git a/news/pan/files/patch-pan::message-send.c b/news/pan/files/patch-pan::message-send.c deleted file mode 100644 index 05816edf0e70..000000000000 --- a/news/pan/files/patch-pan::message-send.c +++ /dev/null @@ -1,36 +0,0 @@ - -$FreeBSD$ - ---- pan/message-send.c 2001/08/22 18:36:41 1.1 -+++ pan/message-send.c 2001/08/22 18:36:50 -@@ -25,7 +25,7 @@ - #include - #include - --#include -+#include - - #include - -@@ -75,6 +75,7 @@ - gboolean force_new_message_id) - { - gchar * tmp; -+ gchar * s; - const gchar * pch; - debug_enter ("build_nntp_header"); - -@@ -153,9 +154,10 @@ - - /* Add mime header, charset type, encoding type */ - g_string_append (postme, "Mime-Version: 1.0\r\n"); -- pch = nl_langinfo (CODESET); -- if (!is_nonempty_string (pch)) -- pch = "ISO-8859-1"; -+ pch = "ISO-8859-1"; -+ if ((s = setlocale(LC_CTYPE, NULL)) != NULL) -+ if ((s = strchr(s, '.')) != NULL) -+ pch = s + 1; - g_string_sprintfa (postme, "Content-Type: text/plain; charset=%s\r\n", pch); - g_string_append (postme, "Content-Transfer-Encoding: 8bit\r\n"); - diff --git a/news/pan/files/patch-po::Makefile.in.in b/news/pan/files/patch-po::Makefile.in.in new file mode 100644 index 000000000000..216e106f2297 --- /dev/null +++ b/news/pan/files/patch-po::Makefile.in.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- po/Makefile.in.in 2001/09/11 16:16:39 1.1 ++++ po/Makefile.in.in 2001/09/11 16:16:49 +@@ -106,7 +106,7 @@ + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed 's/\.mo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then \ diff --git a/news/pan2/Makefile b/news/pan2/Makefile index 62fea758e280..10a328dd4ae4 100644 --- a/news/pan2/Makefile +++ b/news/pan2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= pan -PORTVERSION= 0.10.0 +PORTVERSION= 0.10.0.90 CATEGORIES= news gnome MASTER_SITES= http://pan.rebelbase.com/download/${PORTVERSION}/ diff --git a/news/pan2/distinfo b/news/pan2/distinfo index c85fe083065a..c6974b912967 100644 --- a/news/pan2/distinfo +++ b/news/pan2/distinfo @@ -1 +1 @@ -MD5 (pan-0.10.0.tar.bz2) = 157889e9cd9a4e3b619076adf84b53e1 +MD5 (pan-0.10.0.90.tar.bz2) = f00c070de046a1bdb7ccbb381afb641e diff --git a/news/pan2/files/patch-gmime::gmime-utils.c b/news/pan2/files/patch-gmime::gmime-utils.c deleted file mode 100644 index 95e92d4731f6..000000000000 --- a/news/pan2/files/patch-gmime::gmime-utils.c +++ /dev/null @@ -1,31 +0,0 @@ - -$FreeBSD$ - ---- gmime/gmime-utils.c 2001/08/22 18:22:18 1.1 -+++ gmime/gmime-utils.c 2001/08/22 18:35:26 -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - - #define d(x) - -@@ -128,11 +128,12 @@ - get_codeset (void) - { - const gchar * codeset; -+ gchar *s; - -- codeset = nl_langinfo (CODESET); -- if (!codeset || !*codeset) -- codeset = DEFAULT_CODESET; -- -+ codeset = DEFAULT_CODESET; -+ if ((s = setlocale(LC_CTYPE, NULL)) != NULL) -+ if ((s = strchr(s, '.')) != NULL) -+ codeset = s + 1; - return codeset; - } - diff --git a/news/pan2/files/patch-pan::message-send.c b/news/pan2/files/patch-pan::message-send.c deleted file mode 100644 index 05816edf0e70..000000000000 --- a/news/pan2/files/patch-pan::message-send.c +++ /dev/null @@ -1,36 +0,0 @@ - -$FreeBSD$ - ---- pan/message-send.c 2001/08/22 18:36:41 1.1 -+++ pan/message-send.c 2001/08/22 18:36:50 -@@ -25,7 +25,7 @@ - #include - #include - --#include -+#include - - #include - -@@ -75,6 +75,7 @@ - gboolean force_new_message_id) - { - gchar * tmp; -+ gchar * s; - const gchar * pch; - debug_enter ("build_nntp_header"); - -@@ -153,9 +154,10 @@ - - /* Add mime header, charset type, encoding type */ - g_string_append (postme, "Mime-Version: 1.0\r\n"); -- pch = nl_langinfo (CODESET); -- if (!is_nonempty_string (pch)) -- pch = "ISO-8859-1"; -+ pch = "ISO-8859-1"; -+ if ((s = setlocale(LC_CTYPE, NULL)) != NULL) -+ if ((s = strchr(s, '.')) != NULL) -+ pch = s + 1; - g_string_sprintfa (postme, "Content-Type: text/plain; charset=%s\r\n", pch); - g_string_append (postme, "Content-Transfer-Encoding: 8bit\r\n"); - diff --git a/news/pan2/files/patch-po::Makefile.in.in b/news/pan2/files/patch-po::Makefile.in.in new file mode 100644 index 000000000000..216e106f2297 --- /dev/null +++ b/news/pan2/files/patch-po::Makefile.in.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- po/Makefile.in.in 2001/09/11 16:16:39 1.1 ++++ po/Makefile.in.in 2001/09/11 16:16:49 +@@ -106,7 +106,7 @@ + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ +- lang=`echo $$cat | sed 's/\.gmo$$//'`; \ ++ lang=`echo $$cat | sed 's/\.mo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then \