Date: Mon, 18 Mar 2002 12:55:20 +0100 (CET) From: Udo Schweigert <udo.schweigert@siemens.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/36045: Maintainer-update of mail/mutt-devel Message-ID: <200203181155.g2IBtKXa031553@reims.mchp.siemens.de>
next in thread | raw e-mail | index | archive | help
>Number: 36045
>Category: ports
>Synopsis: Maintainer-update of mail/mutt-devel
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 18 04:00:12 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Udo Schweigert
>Release: FreeBSD 4.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD alaska.cert.siemens.de 4.5-STABLE FreeBSD 4.5-STABLE #54: Sun Mar 17 17:52:21 CET 2002 ust@alaska.cert.siemens.de:/usr/obj/work/src/RELENG_4/sys/alaska i386
>Description:
Update of mail/mutt-devel:
- Delete/fix some patches to reflect the new libiconv which makes
life much easier for us.
- Fix the names of some patches.
Committer: Files to delete:
files/patch-06
files/patch-07
files/patch-09
files/patch-10
files/patch-11
files/patch-12
files/patch-13
>How-To-Repeat:
>Fix:
diff -ruN --exclude=CVS /usr/ports/mail/mutt-devel/Makefile mutt-devel/Makefile
--- /usr/ports/mail/mutt-devel/Makefile Mon Mar 18 11:27:53 2002
+++ mutt-devel/Makefile Mon Mar 18 12:51:24 2002
@@ -173,19 +173,19 @@
PATCH_DIST_STRIP= -p1
.if defined(WITH_MUTT_COMPRESSED_FOLDERS)
-PATCHFILES+= mutt-${PATCH_VERSION}.rr.compressed.gz
+PATCHFILES+= patch-${PATCH_VERSION}.rr.compressed.gz
CONFIGURE_ARGS+= --enable-compressed
.if !defined(WITHOUT_MUTT_SGMLFORMAT)
SGML_USED= yes
.endif
.endif
.if defined(WITH_MUTT_NNTP)
-PATCHFILES+= mutt-${PATCH_VERSION}.vvv.nntp.gz
+PATCHFILES+= patch-${PATCH_VERSION}.vvv.nntp.gz
CONFIGURE_ARGS+= --enable-nntp
.endif
.if defined(WITH_MUTT_QUOTE_PATCH)
-PATCHFILES+= mutt-${PATCH_VERSION}.vvv.initials.gz \
- mutt-${PATCH_VERSION}.vvv.quote.gz
+PATCHFILES+= patch-${PATCH_VERSION}.vvv.initials.gz \
+ patch-${PATCH_VERSION}.vvv.quote.gz
.endif
WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
diff -ruN --exclude=CVS /usr/ports/mail/mutt-devel/distinfo mutt-devel/distinfo
--- /usr/ports/mail/mutt-devel/distinfo Wed Mar 13 21:57:29 2002
+++ mutt-devel/distinfo Mon Mar 18 11:37:24 2002
@@ -1,5 +1,5 @@
MD5 (mutt/mutt-1.3.28i.tar.gz) = eba9bd09853ff7e441712e2d10d8632b
-MD5 (mutt/mutt-1.3.28.rr.compressed.gz) = 68a8eb3e60bae472af4c258693b4f079
-MD5 (mutt/mutt-1.3.28.vvv.nntp.gz) = 52dc8d4c6d1908c52aa898843b26308b
-MD5 (mutt/mutt-1.3.28.vvv.initials.gz) = 5eb42631d43dd93072e595d12575afeb
-MD5 (mutt/mutt-1.3.28.vvv.quote.gz) = c351c5cfd66396dd3c53fc6bbd361f15
+MD5 (mutt/patch-1.3.28.rr.compressed.gz) = 68a8eb3e60bae472af4c258693b4f079
+MD5 (mutt/patch-1.3.28.vvv.nntp.gz) = 52dc8d4c6d1908c52aa898843b26308b
+MD5 (mutt/patch-1.3.28.vvv.initials.gz) = 5eb42631d43dd93072e595d12575afeb
+MD5 (mutt/patch-1.3.28.vvv.quote.gz) = c351c5cfd66396dd3c53fc6bbd361f15
diff -ruN --exclude=CVS /usr/ports/mail/mutt-devel/files/patch-01 mutt-devel/files/patch-01
--- /usr/ports/mail/mutt-devel/files/patch-01 Sun Dec 2 20:37:15 2001
+++ mutt-devel/files/patch-01 Mon Mar 18 11:27:16 2002
@@ -8,22 +8,3 @@
+ CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl"
LDFLAGS="$LDFLAGS -L$with_sasl/lib"
fi
-
-@@ -674,7 +674,7 @@
- mutt_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBICONV"
- AC_TRY_RUN([
--#include <iconv.h>
-+#include <giconv.h>
- int main()
- {
- iconv_t cd;
-@@ -705,7 +705,7 @@
- mutt_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBICONV"
- AC_TRY_RUN([
--#include <iconv.h>
-+#include <giconv.h>
- #include <string.h>
- int main()
- {
diff -ruN --exclude=CVS /usr/ports/mail/mutt-devel/files/patch-06 mutt-devel/files/patch-06
--- /usr/ports/mail/mutt-devel/files/patch-06 Sat Jun 9 03:53:19 2001
+++ mutt-devel/files/patch-06 Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- charset.c.orig Thu Feb 15 17:09:02 2001
-+++ charset.c Thu Mar 1 02:27:30 2001
-@@ -31,7 +31,7 @@
- #include <unistd.h>
- #include <errno.h>
-
--#include <iconv.h>
-+#include <giconv.h>
-
- #include "mutt.h"
- #include "charset.h"
diff -ruN --exclude=CVS /usr/ports/mail/mutt-devel/files/patch-07 mutt-devel/files/patch-07
--- /usr/ports/mail/mutt-devel/files/patch-07 Sat Jun 9 03:53:19 2001
+++ mutt-devel/files/patch-07 Thu Jan 1 01:00:00 1970
@@ -1,29 +0,0 @@
---- aclocal.m4.orig Thu Jun 7 22:10:27 2001
-+++ aclocal.m4 Fri Jun 8 12:38:06 2001
-@@ -1302,7 +1302,7 @@
- am_cv_func_iconv="no, consider installing GNU libiconv"
- am_cv_lib_iconv=no
- AC_TRY_LINK([#include <stdlib.h>
--#include <iconv.h>],
-+#include <giconv.h>],
- [iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);],
-@@ -1311,7 +1311,7 @@
- am_save_LIBS="$LIBS"
- LIBS="$LIBS -liconv"
- AC_TRY_LINK([#include <stdlib.h>
--#include <iconv.h>],
-+#include <giconv.h>],
- [iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);],
-@@ -1326,7 +1326,7 @@
- AC_CACHE_VAL(am_cv_proto_iconv, [
- AC_TRY_COMPILE([
- #include <stdlib.h>
--#include <iconv.h>
-+#include <giconv.h>
- extern
- #ifdef __cplusplus
- "C"
diff -ruN --exclude=CVS /usr/ports/mail/mutt-devel/files/patch-09 mutt-devel/files/patch-09
--- /usr/ports/mail/mutt-devel/files/patch-09 Thu Jul 26 09:29:14 2001
+++ mutt-devel/files/patch-09 Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- gnupgparse.c.orig Tue Jan 9 07:21:51 2001
-+++ gnupgparse.c Sun Feb 4 21:07:30 2001
-@@ -44,7 +44,7 @@
- #include "mutt.h"
- #include "pgp.h"
- #include "charset.h"
--#include "iconv.h"
-+#include <giconv.h>
-
- /* for hexval */
- #include "mime.h"
diff -ruN --exclude=CVS /usr/ports/mail/mutt-devel/files/patch-10 mutt-devel/files/patch-10
--- /usr/ports/mail/mutt-devel/files/patch-10 Sat Jun 9 03:42:57 2001
+++ mutt-devel/files/patch-10 Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- rfc2047.c.orig Sun Feb 4 21:04:05 2001
-+++ rfc2047.c Sun Feb 4 21:08:22 2001
-@@ -24,7 +24,7 @@
-
- #include <ctype.h>
- #include <errno.h>
--#include <iconv.h>
-+#include <giconv.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff -ruN --exclude=CVS /usr/ports/mail/mutt-devel/files/patch-11 mutt-devel/files/patch-11
--- /usr/ports/mail/mutt-devel/files/patch-11 Sat Jun 9 03:42:58 2001
+++ mutt-devel/files/patch-11 Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- charset.h.orig Tue Mar 6 00:03:04 2001
-+++ charset.h Tue Mar 6 00:04:22 2001
-@@ -19,7 +19,7 @@
- #ifndef _CHARSET_H
- #define _CHARSET_H
-
--#include <iconv.h>
-+#include <giconv.h>
-
- int mutt_convert_string (char **, const char *, const char *, int);
- void mutt_sanitize_ja_chars (char *, size_t, int);
diff -ruN --exclude=CVS /usr/ports/mail/mutt-devel/files/patch-12 mutt-devel/files/patch-12
--- /usr/ports/mail/mutt-devel/files/patch-12 Sat Jun 9 03:42:58 2001
+++ mutt-devel/files/patch-12 Thu Jan 1 01:00:00 1970
@@ -1,40 +0,0 @@
---- m4/iconv.m4.orig Thu Jun 7 22:00:05 2001
-+++ m4/iconv.m4 Fri Jun 8 12:45:23 2001
-@@ -19,16 +19,16 @@
- am_cv_func_iconv="no, consider installing GNU libiconv"
- am_cv_lib_iconv=no
- AC_TRY_LINK([#include <stdlib.h>
--#include <iconv.h>],
-+#include <giconv.h>],
- [iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);],
- am_cv_func_iconv=yes)
- if test "$am_cv_func_iconv" != yes; then
- am_save_LIBS="$LIBS"
-- LIBS="$LIBS -liconv"
-+ LIBS="$LIBS -lgiconv"
- AC_TRY_LINK([#include <stdlib.h>
--#include <iconv.h>],
-+#include <giconv.h>],
- [iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);],
-@@ -43,7 +43,7 @@
- AC_CACHE_VAL(am_cv_proto_iconv, [
- AC_TRY_COMPILE([
- #include <stdlib.h>
--#include <iconv.h>
-+#include <giconv.h>
- extern
- #ifdef __cplusplus
- "C"
-@@ -63,7 +63,7 @@
- fi
- LIBICONV=
- if test "$am_cv_lib_iconv" = yes; then
-- LIBICONV="-liconv"
-+ LIBICONV="-lgiconv"
- fi
- AC_SUBST(LIBICONV)
- ])
diff -ruN --exclude=CVS /usr/ports/mail/mutt-devel/files/patch-13 mutt-devel/files/patch-13
--- /usr/ports/mail/mutt-devel/files/patch-13 Thu Jul 26 09:29:14 2001
+++ mutt-devel/files/patch-13 Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- intl/gettextP.h.orig Thu Jun 7 22:00:05 2001
-+++ intl/gettextP.h Wed Jul 25 08:06:39 2001
-@@ -25,7 +25,7 @@
- # include "../iconv/gconv_int.h"
- #else
- # if HAVE_ICONV
--# include <iconv.h>
-+# include <giconv.h>
- # endif
- #endif
-
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203181155.g2IBtKXa031553>