Date: Fri, 25 May 2001 14:55:25 GMT From: Udo Schweigert <ust@cert.siemens.de> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/27640: maintainer-update of port mail/mutt-devel Message-ID: <200105251455.f4PEtPC02121@alaska.cert.siemens.de>
next in thread | raw e-mail | index | archive | help
>Number: 27640 >Category: ports >Synopsis: maintainer-update of port 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: Fri May 25 08:00:13 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Udo Schweigert >Release: FreeBSD 4.3-STABLE i386 >Organization: >Environment: FreeBSD 4.3-STABLE FreeBSD 4.3-STABLE #12: Wed May 23 09:12:57 CEST 2001 FreeBSD 5.0-CURRENT FreeBSD 5.0-CURRENT #32: Wed May 23 18:41:08 CEST 2001 >Description: This updates mail/mutt-devel to 1.3.18. Also this fixes some problems with libiconv and now is compatible with the japanese/mutt-devel port. >How-To-Repeat: >Fix: diff -ruN mutt-devel.orig/Makefile mutt-devel/Makefile --- mutt-devel.orig/Makefile Fri Mar 30 18:30:59 2001 +++ mutt-devel/Makefile Fri May 25 16:53:47 2001 @@ -7,7 +7,7 @@ # PORTNAME= mutt-devel -PORTVERSION= 1.3.17 +PORTVERSION= 1.3.18 CATEGORIES= mail MASTER_SITES= ftp://ftp.guug.de/pub/mutt/devel/ \ ftp://ftp.uib.no/pub/mutt/devel/ \ @@ -21,11 +21,14 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER?= ust@cert.siemens.de +MAINTAINER= ust@cert.siemens.de + +USE_GMAKE= yes +USE_AUTOMAKE= yes .if defined(PACKAGE_BUILDING) WITH_SLANG= yes -BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell +BUILD_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell \ RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell \ urlview:${PORTSDIR}/textproc/urlview .if ${MACHINE_ARCH} != "alpha" @@ -35,7 +38,7 @@ .endif LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \ - iconv.2:${PORTSDIR}/converters/libiconv + giconv.2:${PORTSDIR}/converters/libiconv .if defined(WITH_SLANG) LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang @@ -50,6 +53,7 @@ BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat .endif + DIST_SUBDIR= mutt GNU_CONFIGURE= yes CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL} @@ -57,8 +61,10 @@ CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \ --with-sharedir=${PREFIX}/share/mutt \ --with-docdir=${PREFIX}/share/doc/mutt \ + --sysconfdir=${PREFIX}/etc \ --with-iconv=${PREFIX} \ --enable-compressed + .if defined(WITH_LOCALES_FIX) CONFIGURE_ARGS+= --enable-locales-fix .endif @@ -73,6 +79,9 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} MAN1= flea.1 mutt.1 mutt_dotlock.1 muttbug.1 MAN5= muttrc.5 mbox.5 + +pre-configure: + (cd ${WRKSRC}; aclocal -I m4) .if !defined(NOPORTDOCS) post-build: diff -ruN mutt-devel.orig/distinfo mutt-devel/distinfo --- mutt-devel.orig/distinfo Fri May 25 16:49:05 2001 +++ mutt-devel/distinfo Fri May 25 15:01:36 2001 @@ -1,2 +1 @@ -MD5 (mutt/mutt-1.3.17i.tar.gz) = 3cfdc92612b87260c1dfb2a530a2020b -MD5 (mutt/charmaps-0.0.tar.gz) = e79b9f57da1f6a4d0a63ff60a4ef7da8 +MD5 (mutt/mutt-1.3.18i.tar.gz) = 5ebcd0923748dcd21b4d2af3612408b9 diff -ruN mutt-devel.orig/files/patch-01 mutt-devel/files/patch-01 --- mutt-devel.orig/files/patch-01 Thu Jan 1 01:00:00 1970 +++ mutt-devel/files/patch-01 Fri May 25 14:55:31 2001 @@ -0,0 +1,47 @@ +--- configure.in.orig Thu May 3 10:31:09 2001 ++++ configure.in Thu May 3 10:34:15 2001 +@@ -417,14 +417,14 @@ + [ mutt_cv_func_iconv=no + mutt_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);], + mutt_cv_func_iconv=yes) + if test "$mutt_cv_func_iconv" = no; then + mutt_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);], + mutt_cv_lib_iconv=yes + mutt_cv_func_iconv=yes) +@@ -435,7 +435,7 @@ + AC_MSG_ERROR(Unable to find iconv library) + fi + if test "$mutt_cv_lib_iconv" = yes; then +- LIBICONV="-liconv" ++ LIBICONV="-lgiconv" + fi + AC_DEFINE(HAVE_ICONV) + +@@ -448,7 +448,7 @@ + mutt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + AC_TRY_RUN([ +-#include <iconv.h> ++#include <giconv.h> + int main() + { + iconv_t cd; +@@ -479,7 +479,7 @@ + mutt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + AC_TRY_RUN([ +-#include <iconv.h> ++#include <giconv.h> + #include <string.h> + int main() + { diff -ruN mutt-devel.orig/files/patch-06 mutt-devel/files/patch-06 --- mutt-devel.orig/files/patch-06 Thu Jan 1 01:00:00 1970 +++ mutt-devel/files/patch-06 Fri May 25 14:56:17 2001 @@ -0,0 +1,11 @@ +--- 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 mutt-devel.orig/files/patch-07 mutt-devel/files/patch-07 --- mutt-devel.orig/files/patch-07 Thu Jan 1 01:00:00 1970 +++ mutt-devel/files/patch-07 Fri May 25 14:56:45 2001 @@ -0,0 +1,11 @@ +--- gettext.c.orig Thu Jan 4 14:38:55 2001 ++++ gettext.c Sun Feb 4 21:06:06 2001 +@@ -5,7 +5,7 @@ + + #include "hash.h" + +-#include "iconv.h" ++#include "giconv.h" + #include "lib.h" + #include "charset.h" + diff -ruN mutt-devel.orig/files/patch-09 mutt-devel/files/patch-09 --- mutt-devel.orig/files/patch-09 Thu Jan 1 01:00:00 1970 +++ mutt-devel/files/patch-09 Fri May 25 14:57:14 2001 @@ -0,0 +1,11 @@ +--- 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 mutt-devel.orig/files/patch-10 mutt-devel/files/patch-10 --- mutt-devel.orig/files/patch-10 Thu Jan 1 01:00:00 1970 +++ mutt-devel/files/patch-10 Fri May 25 14:57:39 2001 @@ -0,0 +1,11 @@ +--- 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 mutt-devel.orig/files/patch-11 mutt-devel/files/patch-11 --- mutt-devel.orig/files/patch-11 Thu Jan 1 01:00:00 1970 +++ mutt-devel/files/patch-11 Fri May 25 14:58:00 2001 @@ -0,0 +1,11 @@ +--- 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 mutt-devel.orig/pkg-plist.htmlfiles mutt-devel/pkg-plist.htmlfiles --- mutt-devel.orig/pkg-plist.htmlfiles Thu Mar 29 12:41:37 2001 +++ mutt-devel/pkg-plist.htmlfiles Fri May 25 15:42:37 2001 @@ -242,6 +242,12 @@ share/doc/mutt/html/manual308.html share/doc/mutt/html/manual309.html share/doc/mutt/html/manual310.html +share/doc/mutt/html/manual311.html +share/doc/mutt/html/manual312.html +share/doc/mutt/html/manual313.html +share/doc/mutt/html/manual314.html +share/doc/mutt/html/manual315.html +share/doc/mutt/html/manual316.html share/doc/mutt/html/manual31.html share/doc/mutt/html/manual32.html share/doc/mutt/html/manual33.html >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?200105251455.f4PEtPC02121>